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

src/components/subnav/main.js

@@ -40,9 +40,10 @@ export default class topNav extends React.Component{
     //返回
     backFn(items){
         this.setState({'pathname2':items[0].path});
-       sessionStorage.setItem('showflag',true)
+        sessionStorage.setItem('showflag',true)
-       sessionStorage.setItem('pathname2',items[0].path) 
+        sessionStorage.setItem('pathname2',items[0].path) 
-      window.history.go(-1)
+        window.history.go(-1)
+        
     }
     breakFn(item){
       sessionStorage.setItem('pathname2',item)
@@ -60,9 +61,11 @@ export default class topNav extends React.Component{
     let breakflag=pathnamestr.includes('add')||pathnamestr.includes('key-list');
     let sedcbreakflag=pathnamestr.includes('plan-create'); 
 	let planbreakflag = pathnamestr.includes('mytempMould')
-	let editbreakflag = pathnamestr.includes('edittemplate')
+  let editbreakflag = pathnamestr.includes('edittemplate')
-	
+  let breakchange = pathnamestr.includes('exchangecode-add')
-	
+  if(breakchange){
+    breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))
+  }
     return(
       <div className="topheader">
         <div className='nava'>
@@ -117,7 +120,7 @@ export default class topNav extends React.Component{
             
                         <div className="dflexa" key={key2}>
                          {key2!=0?<span>></span>:null} 
-                          <font  className={key2==breaknav.length?'nomenuactive':''}> {item2.name}</font>
+                          <font  className={key2+1==breaknav[0].items.length?'nomenuactive':''}> {item2.name}</font>
                          
                         </div>
                       )

src/pages/exchangecode/add/add.less

@@ -15,4 +15,9 @@
 		text-align: center;
 		line-height: 36px;
 		background-color: rgb(249, 250, 252);
+	}
+	#addkey  .zent-radio-button--disabled[data-zv="9.11.0"].zent-radio-button--checked{
+		color: #8a96aa;
+		background: #dfe8fc!important;
+		border: 1px solid #8a96aa!important;
 	}

src/pages/exchangecode/edit/edit.js

@@ -36,7 +36,8 @@ export default class exchangedit extends React.Component{
 	    describe:'',
 	  	date_time:"",
 	  	range:""
-	  },
+		},
+		isload:false,
 	  tempdata:[],
 	  cur_product:null,
 	  productOption:[],
@@ -67,6 +68,7 @@ export default class exchangedit extends React.Component{
 			}
 			
 			this.setState({codeInfo:codeInfo})
+			this.setState({isload:true});
 			console.log("当前的商品信息66")
 			
 			
@@ -408,29 +410,31 @@ export default class exchangedit extends React.Component{
 		     width:'auto',
 		   },
 		 ];
-
     return(
       <div id="editcode">
 	  <div>
 		<Card style={{ width:'90%',"margin":"10px auto"}} title={'基本信息'}>
 		      <p className="addcode">
 						   			<Form  model={this.state.codeInfo} rules={codeInfo} ref="code_info" className="addform">
-						   				   <FormItem labelname="兑换码名称" prop="code_name" id="code_name">
+						   				  {
-						   						 <Ipt  onChange={(e)=>{
+													 this.state.isload?  <FormItem labelname="兑换码名称" prop="code_name" id="code_name">
-						   							 let model = this.state.codeInfo;
+													 <Ipt  onChange={(e)=>{
-						   							 model.code_name = e;
+														 let model = this.state.codeInfo;
-						   							 this.setState({codeInfo:model}) 
+														 model.code_name = e;
-						   						 }}    
+														 this.setState({codeInfo:model}) 
-						   						  
+													 }}    
-						   						  onClearItem={(e)=>{
+														
-						   							  let model = this.state.codeInfo;
+														onClearItem={(e)=>{
-						   							  model.code_name = "";
+															let model = this.state.codeInfo;
-						   							  this.setState({codeInfo:model}) 
+															model.code_name = "";
-						   						  }}
+															this.setState({codeInfo:model}) 
-						   						  
+														}}
-						   						  
+														
-						   						  value={this.state.codeInfo.code_name}   placeholder={"请输入兑换码名称"}  labelWidth={'0px'}  maxLength={10} height={'36px'} width={'520px'}   alignment={'left'}/>
+														
-						   				    </FormItem>
+														value={this.state.codeInfo.code_name}   placeholder={"请输入兑换码名称"}  labelWidth={'0px'}  maxLength={10} height={'36px'} width={'520px'}   alignment={'left'}/>
+													</FormItem>:null
+												 }
+												
 						   			   <FormItem labelname="发放总量" prop="issued" id="issued">
 						   						 <Ipt  onChange={(e)=>{
 						   							 let model= this.state.codeInfo;

src/pages/exchangepage/mytemplate/main.js

@@ -64,6 +64,7 @@ export default class acclist extends React.Component{
     this.state={
       distdata:[],
       total:0,
+      combinedValue:[],
       page:1,
       limit:10,
       tabList:[{title:"我的模板列表"}],
@@ -120,6 +121,10 @@ componentWillMount(){
 	  page:this.state.page,
 	  limit:this.state.limit
   }
+  if(this.state.combinedValue&&this.state.combinedValue[0]){
+    data.begin_time=this.state.combinedValue[0];
+    data.end_time=this.state.combinedValue[1];
+  }
   this.getTableList(data);
 }
 pageChange(e){
@@ -165,20 +170,11 @@ delFn(e,row){
 	});
 }
   render(){
-    const date = <CombinedDateRangePicker
+
-    showTime={{
-      format: 'HH:mm:ss',
-      defaultTime: ['00:00:00', '23:59:59'],
-    }}
-    format="YYYY-MM-DD HH:mm:ss"
-    className="zent-datepicker-demo"
-   value={this.state.combinedValue}
-   onChange={(e)=>{this.onChangeCombinedDate(e)}}
- />
     const { current, pageSize } = this.state;
     return(
       <div id="exchangecodelist">
-         <TabPage slot={date} tabs={this.state.tabList}>
+         <TabPage   tabs={this.state.tabList}>
         <p className="codetable dflexj">
 			<
 			Button type = "primary"

src/pages/plan/key/list.js

@@ -257,14 +257,17 @@ onEditRow(status,row){
 	let activerou=[{pagetitle:'编辑',items:[
 	  {
 	    "path": "/home/exchangecode-list",
-	    "name": "key列表管理"
+	    "name": row.plan_title+"key列表管理"
-	  },
+	  },{
+      "path": "/home/exchangecode-lists",
+	    "name": "key-批次ID:"+row.id 
+    },
 	  {
 	    "path": "/home/exchangecode-add",
 	    "name": "编辑key"
 	  }
 	]}]
-	sessionStorage.setItem('breaknav',JSON.stringify(activerou));
+	sessionStorage.setItem('breakchangenav',JSON.stringify(activerou));
 	sessionStorage.setItem("keybatch_id",row.id)
 }