From a28963aa7e04322572a5a2628a855fe7799f45d3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 19 六月 2024 20:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader

---
 src/views/readerPages/webHome.vue |  122 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue
index 8009c57..8678935 100644
--- a/src/views/readerPages/webHome.vue
+++ b/src/views/readerPages/webHome.vue
@@ -119,7 +119,11 @@
             </div>
           </div>
           <div v-if="activeMenu == '棰樺簱'" class="resourceTab">
-            <div class="tabItem hover" @click="selectExercisesType('exercises')" v-if="bookConfig.textbookComponents.indexOf('3D3B4F55') > -1">
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('exercises')"
+              v-if="bookConfig.textbookComponents.indexOf('3D3B4F55') > -1"
+            >
               <div>涔犻</div>
               <div :class="exercisesType == 'exercises' ? 'text' : 'line'"></div>
             </div>
@@ -1182,9 +1186,15 @@
       <newWord :resourceUrl="resourceUrl" />
     </div>
   </el-dialog>
-  <el-dialog title="閿欓鏈�" align-center v-model="wrongQuestionVisble" width="800" class="myDialogs">
+  <el-dialog
+    title="閿欓鏈�"
+    align-center
+    v-model="wrongQuestionVisble"
+    width="800"
+    class="myDialogs"
+  >
     <div class="wendabox">
-      <wrongQuestion  />
+      <wrongQuestion />
     </div>
   </el-dialog>
   <!-- 绛旈鍣� -->
@@ -1962,7 +1972,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2087,7 +2103,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2516,7 +2538,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2755,7 +2783,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2795,7 +2829,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2869,7 +2909,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2974,7 +3020,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3175,7 +3227,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {
         showToolBox.value = false
@@ -3275,7 +3333,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3359,7 +3423,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3440,7 +3510,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3720,11 +3796,25 @@
 const layoutBtn = () => {
   localStorage.removeItem('token')
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
 }
 const goLogin = () => {
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
 }
 </script>
 

--
Gitblit v1.9.1