From c55ab210d9f4435c93fd013063b5f132f72fd08e Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Mon, 4 Dec 2023 15:21:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E8=B7=B3=E8=BD=AC=E3=80=81=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 1a6a78c9..f870faba 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -106,7 +106,7 @@ export default {
           for(var i = keys.length; i--;)
             document.cookie = keys[i] + '=0;expires=' + new Date(0).toUTCString()
         }
-        this.$router.push({name:'index'})
+        this.$router.push({ path: "/index" });
       });
     },
     getInfo(){
@@ -120,7 +120,10 @@ export default {
           this.activitiStatus = response.data.activitiStatus;
           this.instanceId = response.data.instanceId;
           this.memberType = response.data.memberType;
-          this.getHistoryList()
+          if(this.instanceId !== "" && this.instanceId != null){
+            this.getHistoryList()
+          }
+
         });
       });
     },

From d03a7ad9c85ddb26fe401427577e6b0406890f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 5 Dec 2023 14:24:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js     | 15 +++++++++------
 src/views/user/index.vue |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 66e70a6b..46d67c65 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -60,7 +60,7 @@ if(requestInterceptor === undefined){
 
 // 响应拦截器
 let  responseInterceptor;
-let gqnum = 0;
+// let gqnum = 0;
 if(responseInterceptor === undefined){
   responseInterceptor = service.interceptors.response.use(res => {
       Toast.clear();
@@ -68,9 +68,9 @@ if(responseInterceptor === undefined){
       const code = res.data.code || 200;
       // 获取错误信息
       const msg = errorCode[code] || res.data.msg || errorCode['default']
-      console.info(gqnum);
-      if (code === 401 && gqnum === 0) {
-        gqnum++;
+      // console.info(gqnum); && gqnum === 0
+      if (code === 401) {
+        // gqnum++;
         Dialog.confirm({
           title: '系统提示',
           message: '登录状态已过期，请重新登录',
@@ -79,6 +79,7 @@ if(responseInterceptor === undefined){
         })
           .then(() => {
             store.dispatch('LogOut').then(() => {
+              console.log('退出')
               try {
                 let loginUrl = Cookies.get("_Login_url");
                 if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) {
@@ -120,11 +121,13 @@ if(responseInterceptor === undefined){
                 window.location.href = '/contracted/login';
                 return;
               }else{
-                if(!window.location.href.indexOf('/Login') && !window.location.href.indexOf('/login')){
+                console.log('退出login')
+                console.log(window.location.href.indexOf('/Login') < 0)
+                console.log(window.location.href.indexOf('/login') < 0)
+                if(window.location.href.indexOf('/Login') < 0 && window.location.href.indexOf('/login') < 0){
                   // 产权交易
                   window.location.href = '/login';
                 }
-
               }
 
             })
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 1a6a78c9..6f716ae7 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -106,7 +106,7 @@ export default {
           for(var i = keys.length; i--;)
             document.cookie = keys[i] + '=0;expires=' + new Date(0).toUTCString()
         }
-        this.$router.push({name:'index'})
+        this.$router.push({name:'indexCJ'})
       });
     },
     getInfo(){