diff --git a/config/request.js b/config/request.js index 69af3c0..95b5198 100644 --- a/config/request.js +++ b/config/request.js @@ -17,7 +17,6 @@ module.exports = (vm) => { console.log(config.baseURL) // config.header['content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8' config.header['tenant-id'] = '1' - return config }) diff --git a/manifest.json b/manifest.json index e015b22..14a763a 100644 --- a/manifest.json +++ b/manifest.json @@ -94,7 +94,7 @@ "proxy" : { "/api" : { // "target" : "http://192.168.1.26:48080/", - "target" : "http://192.168.1.36:48080/", + "target" : "http://192.168.1.39:48080/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index e3e1660..7e82210 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -94,7 +94,7 @@ this.showType = false }, async getpersonfaceFn() { - const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8002/h5/#/pages/indexEntry/enroll/realName/realName'}) + const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/realName/realName'}) let obj = JSON.parse(res) this.link = obj.Url this.$store.commit('updateBizToken', obj.BizToken) diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue index 7c64866..584d2b7 100644 --- a/pages/indexEntry/enroll/realName/realName.vue +++ b/pages/indexEntry/enroll/realName/realName.vue @@ -21,7 +21,7 @@ }) let obj = { ruleId: 1, - redirectUrl: 'http://192.168.1.44:8002/h5/#/pages/indexEntry/enroll/registInfo/registInfo', + redirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/registInfo/registInfo', bizToken: this.$store.state.school.BizToken, userId: this.userId } diff --git a/pages/indexEntry/enroll/signContract/signContract.vue b/pages/indexEntry/enroll/signContract/signContract.vue index 136e323..0d7ac3d 100644 --- a/pages/indexEntry/enroll/signContract/signContract.vue +++ b/pages/indexEntry/enroll/signContract/signContract.vue @@ -63,8 +63,9 @@ if (res.flowStatus == 2) { clearInterval(this.timer) this.timer = null + alert('签约成功') uni.navigateTo({ - url: '/pages/indexEntry/enroll/registInfo/registInfo' + url: '/pages/indexEntry/enroll/payment/payment' }) if (res.flowStatus > 2) { clearInterval(this.timer) diff --git a/store/modules/user.js b/store/modules/user.js index 0cdd306..2ace136 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -73,7 +73,12 @@ const user = { const http = uni.$u.http let config = { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} } const res = await http.get('app/student-record/get') - // const res = await http.get('app/student-record/get?id='+state.vuex_loginInfo.userId,config) + if(res.tenantId) { + uni.$u.http.setConfig((config) => { + config.header['tenant-id'] = res.tenantId + return config + }) + } commit('update_vuex_userInfo',res.data) }, // 刷新token