From d1da05e79742768f240d7e9f731397ab9ce85783 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 3 Apr 2024 17:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/request.js | 1 + config/site.config.js | 2 +- manifest.json | 12 ++++++--- pages.json | 4 +-- pages/indexEntry/enroll/enroll.vue | 4 ++- pages/indexEntry/enroll/payment/payment.vue | 36 +++++++++++++++++++++---- pages/mineEntry/myAppointment/myAppointment.vue | 5 ++-- pages/mineEntry/myOrder/myOrder.vue | 5 +++- pages/mineEntry/myOrder/voucher/voucher.vue | 6 +++++ pages/tabbar/index/index.vue | 4 +-- pages/tabbar/mine/index.vue | 11 +++++++- store/modules/user.js | 18 ++++++------- 12 files changed, 81 insertions(+), 27 deletions(-) diff --git a/config/request.js b/config/request.js index 62abddf..e1bdf58 100644 --- a/config/request.js +++ b/config/request.js @@ -29,6 +29,7 @@ module.exports = (vm) => { // console.log('--------------') // console.log(config) let token = vm.$store.state.user.vuex_loginInfo.accessToken + console.log(token) if(token) { config.header.Authorization = 'Bearer ' + token } diff --git a/config/site.config.js b/config/site.config.js index 2613f4f..62ca0c3 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,7 @@ 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.37:8318/',//非代理地址 + // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.38:8318/',//非代理地址 WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',//非代理地址 website: 'http://192.168.1.37', diff --git a/manifest.json b/manifest.json index c21fbaa..40148ee 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,8 @@ "Maps" : {}, "Barcode" : {}, "Geolocation" : {}, - "VideoPlayer" : {} + "VideoPlayer" : {}, + "Share" : {} }, /* 应用发布信息 */ "distribute" : { @@ -66,7 +67,12 @@ }, /* SDK配置 */ "sdkConfigs" : { - "share" : {}, + "share" : { + "weixin" : { + "appid" : "", + "UniversalLinks" : "" + } + }, "ad" : {}, "maps" : { "amap" : { @@ -164,7 +170,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.43:8318/", + "target" : "http://192.168.1.38:8318/", // "target" : "http://192.168.1.36:48080/", "changeOrigin" : true, "secure" : true, diff --git a/pages.json b/pages.json index 2c1fb37..fdfbd04 100644 --- a/pages.json +++ b/pages.json @@ -422,8 +422,8 @@ { "path": "myOrder/voucher/voucher", "style": { - "navigationBarTitleText": "我的订单", - "navigationStyle": "custom", + "navigationBarTitleText": "培训缴费电子凭证", + // "navigationStyle": "custom", "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index 1e37a70..0bdb0e6 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -238,7 +238,9 @@ uni.hideLoading() },6000) }else if(response.code==2006) { - this.$u.toast('认证失败！请确定是本人后再重试') + _this.$u.toast('认证失败！请确定是本人后再重试') + }else { + _this.$u.toast('认证失败！') } }); }, diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue index 2b15c2b..ee25b33 100644 --- a/pages/indexEntry/enroll/payment/payment.vue +++ b/pages/indexEntry/enroll/payment/payment.vue @@ -21,15 +21,15 @@ - + - - + + @@ -37,7 +37,7 @@ 微信 - + @@ -63,8 +63,34 @@ this.trainingApplyId = options.trainingApplyId } this.getStudentByPayment() + this.initWx() }, methods: { + initWx() { + // #ifdef APP-PLUS + plus.share.getServices((s) => { + var shares = {}; + for (var i = 0; i < s.length; i++) { + var t = s[i]; + console.log("...........", t); + shares[t.id] = t; + } + var sweixin = shares['weixin']; + this.sweixin = sweixin + }, function(e) { + console.log("获取分享服务列表失败：" + e.message); + }); + // #endif + }, + wxPay() { + // #ifdef APP-PLUS + this.sweixin ? this.sweixin.launchMiniProgram({ + path: '/pages/payment/payment?tokenCode=' + this.payInfo.tokenCode, //跳转小程序页面路径 pages/index/index + type: 0, //可取值： 0-正式版； 1-测试版； 2-体验版。 默认值为0。 + id: 'gh_012fd4bda1c2' //小程序的原始id + }) : plus.nativeUI.alert('当前环境不支持微信操作!'); + // #endif + }, async getStudentByPayment() { const {data: res} = await getStudentByPayment({trainingApplyId: this.trainingApplyId}) this.$store.dispatch('getUserInfo') diff --git a/pages/mineEntry/myAppointment/myAppointment.vue b/pages/mineEntry/myAppointment/myAppointment.vue index ef6e990..60f3a87 100644 --- a/pages/mineEntry/myAppointment/myAppointment.vue +++ b/pages/mineEntry/myAppointment/myAppointment.vue @@ -42,8 +42,8 @@ ], // 0：未签到，1：已签到，2：已签退，3：旷课，9：已取消 currentTab: 2, - currentNav: 0, - params: { "pageNo": 1, "pageSize": 10, "keyWord": "", "status": '0',studentId: '', keyWord: ''}, + currentNav: -1, + params: { "pageNo": 1, "pageSize": 10, "keyWord": "", "status": '',studentId: '', keyWord: ''}, list: [{id: 1}], total: 20, status: 'loading' @@ -72,6 +72,7 @@ }, changeNav(item) { + if(this.currentNav == item.id) return this.currentNav = item.id this.list = [] this.params.pageNo = 1 diff --git a/pages/mineEntry/myOrder/myOrder.vue b/pages/mineEntry/myOrder/myOrder.vue index bc1e961..6ba1e2d 100644 --- a/pages/mineEntry/myOrder/myOrder.vue +++ b/pages/mineEntry/myOrder/myOrder.vue @@ -105,7 +105,10 @@