Browse Source

更新

master
unknown 11 months ago
parent
commit
483974d41f
  1. 1
      config/request.js
  2. 2
      manifest.json
  3. 2
      pages/indexEntry/enroll/enroll.vue
  4. 2
      pages/indexEntry/enroll/realName/realName.vue
  5. 3
      pages/indexEntry/enroll/signContract/signContract.vue
  6. 7
      store/modules/user.js

1
config/request.js

@ -17,7 +17,6 @@ module.exports = (vm) => {
console.log(config.baseURL) console.log(config.baseURL)
// config.header['content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8' // config.header['content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
config.header['tenant-id'] = '1' config.header['tenant-id'] = '1'
return config return config
}) })

2
manifest.json

@ -94,7 +94,7 @@
"proxy" : { "proxy" : {
"/api" : { "/api" : {
// "target" : "http://192.168.1.26:48080/", // "target" : "http://192.168.1.26:48080/",
"target" : "http://192.168.1.36:48080/",
"target" : "http://192.168.1.39:48080/",
"changeOrigin" : true, "changeOrigin" : true,
"secure" : true, "secure" : true,
"pathRewrite" : { "pathRewrite" : {

2
pages/indexEntry/enroll/enroll.vue

@ -94,7 +94,7 @@
this.showType = false this.showType = false
}, },
async getpersonfaceFn() { 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) let obj = JSON.parse(res)
this.link = obj.Url this.link = obj.Url
this.$store.commit('updateBizToken', obj.BizToken) this.$store.commit('updateBizToken', obj.BizToken)

2
pages/indexEntry/enroll/realName/realName.vue

@ -21,7 +21,7 @@
}) })
let obj = { let obj = {
ruleId: 1, 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, bizToken: this.$store.state.school.BizToken,
userId: this.userId userId: this.userId
} }

3
pages/indexEntry/enroll/signContract/signContract.vue

@ -63,8 +63,9 @@
if (res.flowStatus == 2) { if (res.flowStatus == 2) {
clearInterval(this.timer) clearInterval(this.timer)
this.timer = null this.timer = null
alert('签约成功')
uni.navigateTo({ uni.navigateTo({
url: '/pages/indexEntry/enroll/registInfo/registInfo'
url: '/pages/indexEntry/enroll/payment/payment'
}) })
if (res.flowStatus > 2) { if (res.flowStatus > 2) {
clearInterval(this.timer) clearInterval(this.timer)

7
store/modules/user.js

@ -73,7 +73,12 @@ const user = {
const http = uni.$u.http const http = uni.$u.http
let config = { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} } 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')
// 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) commit('update_vuex_userInfo',res.data)
}, },
// 刷新token // 刷新token

Loading…
Cancel
Save