Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/components/subnav/main.js

@@ -46,15 +46,15 @@ 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(){
-    
   }
   render(){
     let history0= window.history.length<=1;

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',