From 8a1e7703421fd8148b7223133a895972dd80d136 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Sun, 28 Nov 2021 21:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3B=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.css                                   | 2 +-
 src/assets/api.js                             | 7 ++++---
 src/components/subnav/main.js                 | 4 ++--
 src/pages/distributor/list/list.less          | 2 +-
 src/pages/exchangecode/commodity/commodity.js | 6 +++---
 src/pages/home/home.js                        | 4 ++--
 src/pages/order/list/list.less                | 4 ++++
 src/pages/plan/edit/edit.js                   | 4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/App.css b/src/App.css
index dffe6588..ccb7b83f 100644
--- a/src/App.css
+++ b/src/App.css
@@ -178,5 +178,5 @@ resize: none;
 
 .zent-btn-primary.zent-btn-disabled.zent-btn
 {
-	background-color: #B8BCC2 !important;
+	background-color: #f1f2f3 !important;
 }
\ No newline at end of file
diff --git a/src/assets/api.js b/src/assets/api.js
index 19002c25..35f84402 100644
--- a/src/assets/api.js
+++ b/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 {
diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index 4b86fb01..5b855f68 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -58,11 +58,11 @@ export default class topNav extends React.Component{
     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');
   if(breakchange){
     breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))
   }
diff --git a/src/pages/distributor/list/list.less b/src/pages/distributor/list/list.less
index 1440d9b5..139c866d 100644
--- a/src/pages/distributor/list/list.less
+++ b/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 {
diff --git a/src/pages/exchangecode/commodity/commodity.js b/src/pages/exchangecode/commodity/commodity.js
index de714480..88e47601 100644
--- a/src/pages/exchangecode/commodity/commodity.js
+++ b/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(){
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index 7c171325..d87c387a 100644
--- a/src/pages/home/home.js
+++ b/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=>{
diff --git a/src/pages/order/list/list.less b/src/pages/order/list/list.less
index 433d9837..2674291c 100644
--- a/src/pages/order/list/list.less
+++ b/src/pages/order/list/list.less
@@ -8,3 +8,7 @@
   margin-top: -8px;
   margin-right:-20px;
 }
+
+.orderList .distable{
+  margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/src/pages/plan/edit/edit.js b/src/pages/plan/edit/edit.js
index bfe70c01..5dacd890 100644
--- a/src/pages/plan/edit/edit.js
+++ b/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>