From cb50884a65ed9a12d0cd577536963285df65b6d1 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Fri, 24 Dec 2021 16:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=92=E8=89=B2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=9B=9E=E9=80=80bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js      | 2 +-
 src/pages/system/role/list/list.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index a19394bd..0a64a9f2 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -70,7 +70,7 @@ export default class topNav extends React.Component{
     let sedcbreakflag=pathnamestr.includes('plan-create');   
 	let planbreakflag = pathnamestr.includes('mytempMould')
   let editbreakflag = pathnamestr.includes('edittemplate')
-  let backshow=pathnamestr.includes('account-add')||pathnamestr.includes('subaccount-add')||pathnamestr.includes('distributor-add')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit')||pathnamestr.includes('key-list')||pathnamestr.includes('exchange-addcommodity');
+  let backshow=pathnamestr.includes('account-add')||pathnamestr.includes('role-add')||pathnamestr.includes('subaccount-add')||pathnamestr.includes('distributor-add')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit')||pathnamestr.includes('key-list')||pathnamestr.includes('exchange-addcommodity');
   let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit')||pathnamestr.includes('key-detail')||pathnamestr.includes('product-edit')||pathnamestr.includes('plan-edit');
   if(breakchange){
     breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))
diff --git a/src/pages/system/role/list/list.js b/src/pages/system/role/list/list.js
index 26cae117..d191b2e2 100644
--- a/src/pages/system/role/list/list.js
+++ b/src/pages/system/role/list/list.js
@@ -77,7 +77,7 @@ export default class acclist extends React.Component{
     this.getRoleFn();
   }
   clickFn(){
-    this.props.history.push('/home/system/role-add');
+    // this.props.history.push('/home/system/role-add');
     sessionStorage.setItem('pathname2','/home/system/role-add')
     let activerou=[{pagetitle:'新建',items:[
       {
@@ -90,6 +90,7 @@ export default class acclist extends React.Component{
       }
     ]}]
     sessionStorage.setItem('breaknav',JSON.stringify(activerou));
+    window.open('#/home/system/role-add');
   }
   onChange = options => {
     this.setState(options);