From 50879e3708de3e5ea6ef4e58bd96c9035278bc8e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 4 Dec 2024 18:08:38 +0800
Subject: [PATCH] fix

---
 src/api/api.js                   | 4 ++--
 src/pages/counter/list/index.vue | 5 ++++-
 src/pages/manage/index/index.vue | 9 ++++++++-
 src/setting.js                   | 1 -
 src/store/modules/user.js        | 4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index ceef618..4412c0e 100644
--- a/src/api/api.js
+++ b/src/api/api.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实例
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index d4b95c1..cc989eb 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -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()
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index 8089033..d55b9a7 100644
--- a/src/pages/manage/index/index.vue
+++ b/src/pages/manage/index/index.vue
@@ -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: {
diff --git a/src/setting.js b/src/setting.js
index f8e0f62..1583f92 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -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,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c492fa7..c97bedd 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -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