From 36247576300b0d0f64643079da8bc47019322f4b Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 2 Dec 2021 17:13:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index a0bd2c74..0aa7c089 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -46,12 +46,13 @@ export default class topNav extends React.Component{
     }
     //返回
     backFn(items){
-        
         this.setState({'pathname2':items.router});
         sessionStorage.setItem('showflag',true)
         sessionStorage.setItem('pathname2',items.router) 
         window.history.go(-1)
-        
+        if(items.length>1){
+          sessionStorage.setItem('pathname2',items[0].path) 
+        }
     }
     componentWillMount(){
     

From d5f147477262a20731285c49e7b8c221cf14a812 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 2 Dec 2021 17:14:10 +0800
Subject: [PATCH 2/3] update

---
 src/components/subnav/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index 0aa7c089..2352896c 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -55,7 +55,6 @@ export default class topNav extends React.Component{
         }
     }
     componentWillMount(){
-    
   }
   render(){
     let history0= window.history.length<=1;

From 16b37da89afaa76236a33b0c3f8f0511289ad9ea Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 2 Dec 2021 17:20:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=93=8D=E4=BD=9C=E8=B7=AF=E7=94=B1=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/account/add/adduserinfo/adduserinfo.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js
index 3e78ae7d..17710a1f 100644
--- a/src/pages/system/account/add/adduserinfo/adduserinfo.js
+++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js
@@ -328,6 +328,7 @@ export default class adduserinfo extends React.Component{
 		content: <p>是否取消本次操作？</p>,
 		onConfirm:()=>{
 			window.history.back()
+			sessionStorage.setItem('pathname2','/home/system/account-list')
 		},
 		onCancel: this.onCancel,
 		className:'questModal',