Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0

src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js

@@ -206,13 +206,13 @@ export default class edittemplate extends React.Component {
                         let model2 = this.state.navlist;
                         model2[index].text = e;
                         this.setState({ navlist: model2 })
-                        Bus.emit('titleBarConfig', {attr:'navlist',value:model2})
+                        Bus.emit('bottomBarConfig', {attr:'navlist',value:model2})
                       }}
                         onClearItem={(e) => {
                           let model2 = this.state.navlist;
                           model2[index].text = '';
                           this.setState({ navlist: model2 })
-                          Bus.emit('titleBarConfig', {attr:'navlist',value:model2})
+                          Bus.emit('bottomBarConfig', {attr:'navlist',value:model2})
                         }}
                         value={this.state.navlist[index].text} placeholder={item.category} labelWidth={'0px'} maxLength={5} height={'36px'} width={'300px'} alignment={'left'} />
                     </FormItem>

src/pages/exchangepage/edittemplate/main.js

@@ -350,7 +350,10 @@ export default class edittemplate extends React.Component {
       //系统模板
       this.setState({ activeNavStatus: 1 })
       if (this.state.showType != 3) {
-         this.onmodelChange({ target: { value: 3 } })
+          Notify.clear();
+          Notify.error('请切换至兑换码保存')
+          self.setState({ loading_visible: false })
+          return 
       }
     }
     this.canvasImg.style.display = 'block'

src/pages/exchangepage/template/main.js

@@ -221,6 +221,7 @@ export default class mytemplate extends React.Component {
 			copyThemecustom(row.id).then(res => {
 				handelResponse(res, (req) => {
 					row.id = req.id;
+					sessionStorage.setItem("pageInfo", JSON.stringify(row))
 					sessionStorage.setItem("isSort", 0)
 					sessionStorage.setItem('pageChange', 0);
 				}, () => {
@@ -228,9 +229,10 @@ export default class mytemplate extends React.Component {
 			}).catch(() => {
 			});
 		}else {
+			sessionStorage.setItem("pageInfo", JSON.stringify(row))
 			sessionStorage.setItem('pageChange', 1);
 		}
-		sessionStorage.setItem("pageInfo", JSON.stringify(row))
+		
 		sessionStorage.setItem('mouldType', 1);
 		if (type) {
 			window.location.href = "/#/edittemplate?type=" + type;

src/pages/order/list/list.js

@@ -125,6 +125,13 @@ const Column = [
     type: "slot",
     width: "80px"
   },
+  {
+    title: "操作",
+    prop: "opearo",
+    name: "opearo",
+    type: "slot",
+    width: "140px"
+  },
   {
     title: "平台批次号",
     name: "channel_activity_id",
@@ -180,13 +187,6 @@ const Column = [
     prop: "key",
     width: "140px",
     type: "normal"
-  },
-  {
-    title: "操作",
-    prop: "opearo",
-    name: "opearo",
-    type: "slot",
-    width: "140px"
   }
 ]
 
@@ -879,16 +879,14 @@ export default class orderlist extends React.Component {
                         详情
                       </span>
                       {rowData.status == 1 ||
-                      (rowData.status == 0 && rowData.type == 1) ? (
+                      (rowData.status == 0 && rowData.type == 1) ||
+                      rowData.status == 6 ? (
                         <span
                           className='grid-link'
                           onClick={(e) => this.deleteFn(e, rowData)}>
                           作废
                         </span>
                       ) : null}
-                      {
-                        //  rowData.status==3? <span  className="grid-link"  onClick={(e)=>this.againinvestFn(e,rowData)}>再次充值</span>:null
-                      }
                       {rowData.status == 1 ? (
                         <span
                           className='grid-link'