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

src/App.css

@@ -178,7 +178,7 @@ resize: none;
 
 .zent-btn-primary.zent-btn-disabled.zent-btn
 {
-	background-color: #B8BCC2 !important;
+	background-color: #f1f2f3 !important;
 }
 
 .modal{
@@ -189,5 +189,5 @@ resize: none;
 	top: 0;
 	background-color: rgba(0,0,0,0.5);
 	z-index: 9999;
-	
+
 }

src/assets/api.js

@@ -115,10 +115,11 @@ const req = (method, url, params, responseType) => {
 }
 
 export const handelResponse = (res, cb, errCb) => {
-	if (res.code == 200) {
+	console.log(118,res);
+	if (res&&res.code == 200) {
 		cb(res.data, res.message)
 	} else {
-		if (typeof errCb == 'function') {
+		if (res&&typeof errCb == 'function') {
 			errCb(res.message)
 		}
 	}
@@ -587,7 +588,7 @@ export const getSystemTemplate= (data) => {
 
 //退出登录接口
 export const postLogOut = (data) => {
-	return req('post', baseurl + "/auth/logout", data)
+	return req('get', baseurl + "/auth/logout", data)
 }
 
 export {

src/components/subnav/main.js

@@ -39,6 +39,7 @@ export default class topNav extends React.Component{
     }
     //返回
     backFn(items){
+        
         this.setState({'pathname2':items[0].path});
         sessionStorage.setItem('showflag',true)
         sessionStorage.setItem('pathname2',items[0].path) 
@@ -53,16 +54,17 @@ export default class topNav extends React.Component{
     
   }
   render(){
+    let history0= window.history.length<=1;
     let routeflag=sessionStorage.getItem('showflag')
     let breaknav=JSON.parse(sessionStorage.getItem('breaknav'))
     let pathnameBreak=sessionStorage.getItem('pathname2')
     const pathname=window.location.href.lastIndexOf('\/');
     const pathnamestr=window.location.href.substr(pathname);
-    let breakflag=pathnamestr.includes('add')||pathnamestr.includes('key-list')||pathnamestr.includes('key-edit')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit');
+    let breakflag=pathnamestr.includes('add')||pathnamestr.includes('key-list')||pathnamestr.includes('key-edit')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit')||pathnamestr.includes('product-edit');
     let sedcbreakflag=pathnamestr.includes('plan-create');   
 	let planbreakflag = pathnamestr.includes('mytempMould')
   let editbreakflag = pathnamestr.includes('edittemplate')
-  let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit');
+  let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit')||pathnamestr.includes('product-edit')||pathnamestr.includes('plan-edit');
   if(breakchange){
     breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))
   }
@@ -109,9 +111,12 @@ export default class topNav extends React.Component{
              breaknav.map((item,key)=>{
                 return(
                   <div className="nolinkmenu-row" key={key}>
-                   <Pop trigger="hover"  position="bottom-center" content="返回">
-                   <img  onClick={()=>this.backFn(item.items)}  src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/Marketing/back.svg" alt=""/>
-    </Pop>
+                  {
+                    !history0? <Pop trigger="hover"  position="bottom-center" content="返回">
+                    <img  onClick={()=>this.backFn(item.items)}  src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/Marketing/back.svg" alt=""/>
+     </Pop>:null
+                  }
+                  
                
                   <div className="nonav">
                   {

src/pages/distributor/list/list.less

@@ -2,7 +2,7 @@
   width: 98%;
   margin: 0 auto;
   .distable{
-    padding:24px 24px 12px;
+    padding:24px;
     box-sizing: border-box;
   }
   .tabpage {

src/pages/exchangecode/commodity/commodity.js

@@ -210,15 +210,15 @@ export default class commoditylist extends React.Component{
     let activerou=[{pagetitle:'编辑',items:[
       {
         "path": "/home/exchangecode-list",
-        "name": "商品管理"
+        "name": "商品范围列表"
       },
       {
         "path": "/home/product-edit",
-        "name": "编辑商品"
+        "name": "编辑[ "+rowData.product_name+" ]商品"
       }
     ]}]
 	sessionStorage.setItem("dataInfo",rowData.product_id)
-    sessionStorage.setItem('breaknav',JSON.stringify(activerou));
+    sessionStorage.setItem('breakchangenav',JSON.stringify(activerou));
   }
    //敲回车查询
    sureFn(){

src/pages/home/home.js

@@ -175,13 +175,13 @@ export default class App extends Component {
       onConfirm:()=>{ 
         postLogOut().then(res=>{
           console.log(res.code);
-          if(res.code==1002){
+          if(res.code==200){
             setTimeout(()=>{
               self.props.history.push('/login');
               Notify.clear();
               Notify.success('退出成功！');
               sessionStorage.clear();
-            },100);
+            },1000);
            
           }
         }).catch(err=>{

src/pages/order/list/list.less

@@ -8,3 +8,7 @@
   margin-top: -8px;
   margin-right:-20px;
 }
+
+.orderList .distable{
+  margin-bottom: 10px;
+}

src/pages/plan/edit/edit.js

@@ -197,7 +197,7 @@ export default class add extends React.Component{
 			
 			
 	}
-	
+
   render(){
     return(
       <div id="plan-add">
@@ -232,7 +232,7 @@ export default class add extends React.Component{
 		 <div className="action-panel">
 		
 		<div id="step1" className="step1">
-		<div className="plan-title">营销计划</div>
+		<div className="plan-title">营销计划111</div>
 		 <Card style={{ width:'100%' }} title={this.state.step1_pagetitle}>
 		<Step1 ref="step1"/>
 		</Card>