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

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(

src/components/tabPage/main.css

@@ -39,6 +39,7 @@ max-width: 180px;
 background: #F5F6F7;
 border-radius: 10px 5px 0 0;
 position: relative;
+cursor: pointer;
 
 
 }

src/pages/home/home.js

@@ -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> */}

src/pages/home/home.less

@@ -116,3 +116,11 @@
   align-items: center;
   font-weight: bold;
 }
+.help{
+  font-size: 12px;
+    color: #296bef;
+    padding-right: 10px;
+    cursor: pointer;
+    margin-right: 15px;
+    font-weight: bold;
+}

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,

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');

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>