From 08e851f34013c13723acf095d7d6e80d1ca9b7ea Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Tue, 30 Apr 2024 18:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A9=BE=E6=A0=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/site.config.js | 4 ++-- manifest.json | 14 +++++++------- nativePlugins/md.md | 2 ++ pages/indexEntry/enroll/enroll.vue | 2 +- pages/indexEntry/enroll/payment/payh5.vue | 3 ++- .../enroll/registInfo/comp/searchSchool.vue | 20 ++++++++++++++++---- pages/mineEntry/myForecastName/myForecastName.vue | 20 ++++++++++++-------- pages/mineEntry/personaInfo/personaInfo.vue | 6 +++--- pages/tabbar/learnCar/comp/topInfo.vue | 4 ++-- pages/tabbar/mine/index.vue | 10 +++++----- 10 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 nativePlugins/md.md diff --git a/config/site.config.js b/config/site.config.js index c6807e2..752a555 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,8 +2,8 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.43:8318/',//非代理地址 - // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',// http://192.168.1.43:8318/ http://123.6.232.54:8099/非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.35:8318',//非代理地址 + // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',// http://192.168.1.43:8318/ http://123.6.232.1:8099//非代理地址 website: 'http://192.168.1.37', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' diff --git a/manifest.json b/manifest.json index b95707c..6f41d7f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.1.9", - "versionCode" : 119, + "versionName" : "1.2.1", + "versionCode" : 121, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -82,8 +82,8 @@ "sdkConfigs" : { "share" : { "weixin" : { - "appid" : "wxdfeef42d2a053912", - "UniversalLinks" : "https://payconfig.jaxc.cn/" + "appid" : "wx6cf612192cd6927c", + "UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/" } }, "ad" : {}, @@ -108,8 +108,8 @@ "payment" : { "weixin" : { "__platform__" : [ "ios", "android" ], - "appid" : "wxdfeef42d2a053912", - "UniversalLinks" : "https://payconfig.jaxc.cn/" + "appid" : "wx6cf612192cd6927c", + "UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/" } } } @@ -190,7 +190,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.43:8318/", + "target" : "http://192.168.1.35:8318/", // "target" : "http://192.168.1.36:48080/", "changeOrigin" : true, "secure" : true, diff --git a/nativePlugins/md.md b/nativePlugins/md.md new file mode 100644 index 0000000..0ca0a59 --- /dev/null +++ b/nativePlugins/md.md @@ -0,0 +1,2 @@ + +有一条理解，允许接纳的路，通向个体内在，只有内求才是无限的道路 \ No newline at end of file diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index 0bdb0e6..660176d 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -188,7 +188,7 @@ // this.$goPage('/pages/indexEntry/enroll/uploadAvatar/uploadAvatar') }, async getInitFaceVerifyFn() { - const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); + const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); var metaInfo = verifyPlugin.getMetaInfo() let p = uni.getSystemInfoSync().platform; if (p === "ios") { diff --git a/pages/indexEntry/enroll/payment/payh5.vue b/pages/indexEntry/enroll/payment/payh5.vue index 26f9742..2a9d54b 100644 --- a/pages/indexEntry/enroll/payment/payh5.vue +++ b/pages/indexEntry/enroll/payment/payh5.vue @@ -39,12 +39,13 @@ console.log('监听到的发送事件') console.log(item) if(item.action=='lyxc-wxPay') { - this.$u.toast('用户点击了微信支付') + // this.$u.toast('用户点击了微信支付') this.iswxPay = true this.wxPay(item) }else if(item.action=='lyxc-paySuccess') { this.$u.toast('支付成功') this.iswxPay = false + this.$store.dispatch('getUserInfo') setTimeout(()=>{ uni.switchTab({ url: '/pages/tabbar/learnCar/index' diff --git a/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue index 151f82d..310463c 100644 --- a/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue +++ b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue @@ -6,10 +6,10 @@ 选择驾校 - + - + @@ -42,7 +42,8 @@ pageSize: 20, lat: 30.27419537786047, lng: 120.20633397715788, - sercheType: '1' + sercheType: '1', + } } }, @@ -52,7 +53,7 @@ this.params.lng = this.vuex_cityInfo.lng } this.schoolPageFn() - + this.params.name = '' }, methods: { // 选择驾校 @@ -67,6 +68,17 @@ this.total = res.total if(this.listData.length>=this.total) this.status = 'nomore' console.log(res) + }, + searchSchool() { + this.params.pageNo = 1 + this.params.name = this.keyword + this.listData = [] + this.schoolPageFn() + }, + loadMoreFn() { + if(this.listData.length { + const res = await trainingApplyDelete({id}) + if(res.code==0) { + this.$u.toast('删除成功') + } + this.trainingApplyListFn() + console.log(res) + } + }) }, itemClickFn(item) { console.log(item) - // return this.$goPage('/pages/indexEntry/enroll/payment/payment?trainingApplyId='+ item.trainingApplyId) if(item.applyStep==3) { this.$goPage('/pages/indexEntry/enroll/signContract/signContract?schoolId='+item.trainingSchoolId+'&trainingApplyId='+ item.trainingApplyId) }else if(item.applyStep==4||item.applyStep==5) { diff --git a/pages/mineEntry/personaInfo/personaInfo.vue b/pages/mineEntry/personaInfo/personaInfo.vue index 789ca4a..84b3339 100644 --- a/pages/mineEntry/personaInfo/personaInfo.vue +++ b/pages/mineEntry/personaInfo/personaInfo.vue @@ -54,14 +54,14 @@ - + - 删除测试账号（开发用的） + diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue index f79b5b9..2cb7235 100644 --- a/pages/tabbar/learnCar/comp/topInfo.vue +++ b/pages/tabbar/learnCar/comp/topInfo.vue @@ -2,8 +2,8 @@ - - + + diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 6842687..e85f200 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -4,8 +4,8 @@ - - + + @@ -94,9 +94,9 @@ if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') } - // if(this.vuex_userInfo.applyStep!=6) { - // return this.$u.toast('您还未报名驾校') - // } + if(this.vuex_userInfo.applyStep!=6) { + return this.$u.toast('您还未报名驾校') + } if(item.name=='同城转校') { uni.showModal({ content: '请在原驾校退学后至新驾校报名!',