HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edit_openPage'

This commit is contained in:
red-deng-deng 2021-12-24 16:34:22 +08:00
parent 2a14ccf9e8 cb50884a65
commit e1399c6d29
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/subnav/main.js
View File

@ -70,7 +70,7 @@ export default class topNav extends React.Component{
let sedcbreakflag=pathnamestr.includes('plan-create'); let sedcbreakflag=pathnamestr.includes('plan-create');
let planbreakflag = pathnamestr.includes('mytempMould') let planbreakflag = pathnamestr.includes('mytempMould')
let editbreakflag = pathnamestr.includes('edittemplate') 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'); let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit')||pathnamestr.includes('key-detail')||pathnamestr.includes('product-edit')||pathnamestr.includes('plan-edit');
if(breakchange){ if(breakchange){
breaknav=JSON.parse(sessionStorage.getItem('breakchangenav')) breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))

3
src/pages/system/role/list/list.js
View File

@ -77,7 +77,7 @@ export default class acclist extends React.Component{
this.getRoleFn(); this.getRoleFn();
} }
clickFn(){ clickFn(){
this.props.history.push('/home/system/role-add'); // this.props.history.push('/home/system/role-add');
sessionStorage.setItem('pathname2','/home/system/role-add') sessionStorage.setItem('pathname2','/home/system/role-add')
let activerou=[{pagetitle:'新建',items:[ let activerou=[{pagetitle:'新建',items:[
{ {
@ -90,6 +90,7 @@ export default class acclist extends React.Component{
} }
]}] ]}]
sessionStorage.setItem('breaknav',JSON.stringify(activerou)); sessionStorage.setItem('breaknav',JSON.stringify(activerou));
window.open('#/home/system/role-add');
} }
onChange = options => { onChange = options => {
this.setState(options); this.setState(options);