diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js index 910a31fb..87216886 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);