From a4d42d282507ded8e7283a4db947b102070f7de7 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Mon, 29 Nov 2021 11:25:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js | 2 +-
 src/pages/home/home.js        | 4 +++-
 src/pages/home/home.less      | 8 ++++++++
 src/pages/plan/add/edit.js    | 2 +-
 src/pages/plan/key/list.js    | 2 +-
 src/pages/plan/list/list.js   | 7 +++++++
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index 1d7f9a37..511d2d5c 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -118,7 +118,7 @@ export default class topNav extends React.Component{
                   }
                   
                
-                  <div className="nonav">
+                  <div className="nonav" style={{borderLeft:!history0?'1px solid #d1cfcf':'none'}}>
                   {
                     item.items.map((item2,key2)=>{
                       return(
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index d87c387a..85d2b2cf 100644
--- a/src/pages/home/home.js
+++ b/src/pages/home/home.js
@@ -7,7 +7,7 @@ import {
 	HashRouter as Router,
 	Route,
   Link,
-
+  
 	Redirect
 } from "react-router-dom";
 import "./home.less"
@@ -247,6 +247,8 @@ export default class App extends Component {
                  <Link to="/extension"  className={this.state.pathname=='/extension'?'active':''} onClick={()=>this.setState({pathname:'/extension'})}>推广</Link> */}
                 <Subnav listnav={this.state.navlist}  time={window.time}/>
                  </div>
+                 <div> <Icon type="help-circle" />   <a href="https://www.baidu.com/" target="_blank" className="help">帮助中心</a></div>
+              
                  {/* 用户头像信息 */}
                  <div className="userImg dflexa">
                  {/* <Link to="https://youzan.com" target="_blank" className="mr15 helpcenter">帮助中心</Link> */}
diff --git a/src/pages/home/home.less b/src/pages/home/home.less
index ba083f17..456dde36 100644
--- a/src/pages/home/home.less
+++ b/src/pages/home/home.less
@@ -115,4 +115,12 @@
   display: flex;
   align-items: center;
   font-weight: bold;
+}
+.help{
+  font-size: 12px;
+    color: #296bef;
+    padding-right: 10px;
+    cursor: pointer;
+    margin-right: 15px;
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 626f4cd9..3e006562 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -14,7 +14,7 @@ export default class add extends React.Component{
     super(props)
     this.state={
 		keys:["step2-0"],
-		step1_pagetitle:"新建计划",
+		step1_pagetitle:"修改计划",
 		step2_pagetitle:"生成key",
 		step3_pagetitle:"绑定卡券",
 		curstep:1,
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 35d50e0a..afa6b6b8 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -202,7 +202,7 @@ export default class acclist extends React.Component{
     ]}]
 	sessionStorage.setItem("keybatch_id","")
 	
-    sessionStorage.setItem('breaknav',JSON.stringify(activerou));
+    sessionStorage.setItem('breakchangenav',JSON.stringify(activerou));
   }
   aboutFn(e,row){
     this.props.history.push('/home/addkeyorder');
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index 0969aa72..caba76ea 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -501,8 +501,14 @@ export default class acclist extends React.Component{
 	
 	onEdit(e,row){
 		console.log("计划任务ID")
+		sessionStorage.setItem('showflag',true);
+		 let editarr=[{pagetitle:'编辑',items:[{path:'/home/key-list',name:'营销计划管理'},
+	  	{path:'/home/key-list',name:'编辑:'+row.title}
+		]}]
+		sessionStorage.setItem('breakchangenav',JSON.stringify(editarr));
 		if(row.status == 2 || row.status == 6)
 		{
+			Notify.clear();
 			Notify.error("不可编辑")
 			return;
 		}
@@ -738,6 +744,7 @@ export default class acclist extends React.Component{
 						 <Dropdown position={DropdownPosition.RightTop  }>
 						    <DropdownClickTrigger>
 						    <div className="linkmore" onClick={(e)=>{
+									Notify.clear();
 								 Notify.error("该状态下的数据不允许编辑")
 								 return
 							}}> 更多  <Icon type={"down"} /> </div>

From 04e5560342c862ff2004560961db4f41e84e0ffa Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Mon, 29 Nov 2021 11:29:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tabPage/main.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/tabPage/main.css b/src/components/tabPage/main.css
index cbe38837..7ca2772c 100644
--- a/src/components/tabPage/main.css
+++ b/src/components/tabPage/main.css
@@ -39,6 +39,7 @@ max-width: 180px;
 background: #F5F6F7;
 border-radius: 10px 5px 0 0;
 position: relative;
+cursor: pointer;
 
 
 }