yujialong 3 months ago
parent 333c7c9ebb
commit 50879e3708
  1. 4
      src/api/api.js
  2. 5
      src/pages/counter/list/index.vue
  3. 9
      src/pages/manage/index/index.vue
  4. 1
      src/setting.js
  5. 4
      src/store/modules/user.js

@ -8,11 +8,11 @@ const dev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/`
if (dev) {
// 本地
host = 'http://121.37.12.51/' // 中台测试服
host = 'http://118.31.167.228/' // 中台测试服
// host = 'https://www.occupationlab.com/' // 正式服
// host = 'http://192.168.31.51:9000/'
const ip = localStorage.getItem('localIp')
const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://118.31.167.228/']
host = ips[+ip]
}
// 创建axios实例

@ -1552,6 +1552,9 @@ export default {
this.replaceThings({ name: this.myMap, idArr: [...this.boxStart] })
this.replaceThingsGoods([...this.boxStart2])
}
sessionStorage.getItem(this.isCredit ? 'creditPath' : 'computerPath') && this.showManage()
} else {
sessionStorage.getItem(this.isCredit ? 'creditPath' : 'computerPath') && this.showManage()
}
// v-drag
@ -2183,7 +2186,7 @@ export default {
this.nbm !== 5 && this.$store.commit('system/changePop', { show: false, text: '' }) //
}
// }
debugger
if (this.nbm !== 5) {
//
this.closePop()

@ -56,7 +56,14 @@ export default {
}
},
beforeDestroy () {
sessionStorage.setItem(this.curRoute.includes('Loans') ? 'creditPath' : 'computerPath', this.curRoute)
// sessionStorage.setItem(this.curRoute.includes('Loans') ? 'creditPath' : 'computerPath', this.curRoute) //
const route = this.curRoute
if (route.includes('Loans')) {
if (route !== '/counter/list/manage/personalLoans-detail' && route !== '/counter/list/manage/corporateLoans-apply') sessionStorage.removeItem('creditPath')
} else {
sessionStorage.setItem('computerPath', this.curRoute)
}
sessionStorage.getItem('submited') || this.$router.push('/counter/list/')
},
methods: {

@ -15,7 +15,6 @@ const Setting = {
// 页面切换时,是否显示模拟的进度条
showProgressBar: true,
// 接口请求地址
// apiBaseURL: env === 'development' ? 'http://192.168.31.125:8888' : 'http://121.37.12.51:8000',
apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : location.origin,
// 接口请求返回错误时,弹窗的持续时间,单位:秒
modalDuration: 3,

@ -27,8 +27,8 @@ export default {
let href = process.env.NODE_ENV === 'development' ?
`http://${location.hostname}:8082/#/` :
`${location.origin}${isAdmin ? '/admin' : ''}/#/`
if (location.origin === 'http://121.37.12.51') {
href = `http://121.37.12.51/${isAdmin ? 'admin' : 'student'}/#/`
if (location.origin === 'http://118.31.167.228') {
href = `http://118.31.167.228/${isAdmin ? 'admin' : 'student'}/#/`
}
const { query } = router.app._route
let assessmentId = sessionStorage.getItem('assessmentId') || query.assessmentId

Loading…
Cancel
Save