From 35cb00916d6c61f4036da61bb57db8d95830cfc7 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Tue, 21 Jun 2022 18:39:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055820=20=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=8A=82=E7=82=B9=E8=BE=93=E5=85=A5=E5=9B=9E=E6=89=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8E=20=E9=A9=B3=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A4=B1=E6=95=88=20=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbfz/step5.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index c0a755785..58919b48d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -239,9 +239,9 @@
       :saveLoading="saveLoading"
       :isSubmitBack="isSubmit"
       :approval="true"
-      @over2="beforeBack"
       @transfer="handleTransfer"
       @submit="handleSubmit"
+      @back="beforeBack"
     >
     </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->

From ee1b234b26d8c647de7d9fae27a4e06b00e27ed5 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 22 Jun 2022 10:34:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20w?=
 =?UTF-8?q?elink=20=E7=A6=8F=E7=94=B0=E4=B8=9A=E5=8A=A1=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E8=B7=AF=E7=94=B1=20=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                          | 22 +++++++++++++++++++++-
 src/pages/loginVerifyPhone/index.vue |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index 52edb3920..f0e245ea8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -145,7 +145,16 @@ router.beforeEach(function (to, from, next) {
   /** 判断是不是在手机端操作 */
   if (isMobile()) {
     if(toName === 'phoneHome' && (token === undefined || token === null || token === '')){
+      localStorage.removeItem('token')
+      token = localStorage.getItem("token")
+      window.sessionStorage.clear()
+      localStorage.setItem("routerName","phoneHome")
       next('/loginVerifyPhone')
+    }else if(toName === 'phoneHome' && token != null && (fromName === undefined || fromName === null)){
+      localStorage.removeItem('token')
+      token = localStorage.getItem("token")
+      window.sessionStorage.clear()
+      next()
     }else if(toName === 'phoneHome' && token != null){
       next()
     } else if(toName === 'processCenter'){
@@ -169,7 +178,14 @@ router.beforeEach(function (to, from, next) {
         if(toName !== 'phoneIndex'){
           if(toName === 'phoneHome'){
             // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
+            localStorage.removeItem('token')
+            token = localStorage.getItem("token")
             window.sessionStorage.clear()
+            localStorage.setItem("routerName","phoneHome")
+            next('/loginVerifyPhone')
+          }else if(toName === 'databaseSearch' || toName === 'standDynamics' ||
+              toName === 'domesticStand' || toName === 'domesticDetails'){
+            localStorage.setItem("routerName",toName)
             next('/loginVerifyPhone')
           }else {
             if(fromName === 'phoneHome'){
@@ -184,13 +200,17 @@ router.beforeEach(function (to, from, next) {
           // 区分手机端首页 单独逻辑处理 token 为空 跳回验证页面重新验证
           if(fromName === 'databaseSearch' || fromName === 'standDynamics' ||
              fromName === 'domesticStand' || fromName === 'domesticDetails'){
+            localStorage.setItem("routerName",toName)
             next('/loginVerifyPhone')
           }else {
             next()
           }
         }
       } else {
-        if (toName.slice(0,5) !== 'phone') {
+        if(toName === 'databaseSearch' || toName === 'standDynamics' ||
+            toName === 'domesticStand' || toName === 'domesticDetails'){
+          next()
+        }else if (toName.slice(0,5) !== 'phone') {
           if(toName === 'LoginVerify'){
             next('/blankPage')
           }else {
diff --git a/src/pages/loginVerifyPhone/index.vue b/src/pages/loginVerifyPhone/index.vue
index f7c9d1cdb..0e17cc13d 100644
--- a/src/pages/loginVerifyPhone/index.vue
+++ b/src/pages/loginVerifyPhone/index.vue
@@ -89,7 +89,8 @@
                     window.sessionStorage.setItem('menuList', menuList); // del
                     if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
-                            this.$router.push("/phoneHome")
+                            let routerName = localStorage.getItem("routerName")
+                            this.$router.push('/'+routerName)
                         }, e => {
                             console.log("解析遍历权限列表出现异常")
                             this.logout()