diff --git a/src/App.css b/src/App.css index e32277dd..23ac7a11 100644 --- a/src/App.css +++ b/src/App.css @@ -191,6 +191,3 @@ resize: none; z-index: 6; } -.zent-image-upload-list{ - width: 300px !important; -} \ No newline at end of file diff --git a/src/assets/enum.js b/src/assets/enum.js index b52e9ca3..f239951d 100644 --- a/src/assets/enum.js +++ b/src/assets/enum.js @@ -95,20 +95,20 @@ const menu={ } }, //落地页 - pageTypeStatus(params) { - switch(params){ - case 3:return '兑换码';break; - case 1:return '白名单';break; - case 2:return '立减金';break; - } - }, - pageTypeStatusBg(params) { - switch(params){ - case 1:return '#ffaa00';break; - case 2:return '#e64c00';break; - case 3:return '#55aaff';break; - } - }, + pageTypeStatus(params) { + switch(params){ + case 3:return '兑换码';break; + case 1:return '白名单';break; + case 2:return '立减金';break; + } + }, + pageTypeStatusBg(params) { + switch(params){ + case 1:return '#ffaa00';break; + case 2:return '#e64c00';break; + case 3:return '#55aaff';break; + } + }, keysStatus(params) { switch(params){ case 1:return '创建中';break; diff --git a/src/pages/exchangecode/commodity/goodedit.js b/src/pages/exchangecode/commodity/goodedit.js index 303981b9..a0799e77 100644 --- a/src/pages/exchangecode/commodity/goodedit.js +++ b/src/pages/exchangecode/commodity/goodedit.js @@ -532,6 +532,9 @@ componentDidMount() { } } + + + render(){ @@ -662,7 +665,7 @@ componentDidMount() { { this.state.loadshow? { handelResponse(res,(req,msg)=>{ if(req.status == 7) @@ -102,8 +99,6 @@ export default class acclist extends React.Component{ this.setState({isCancel:true}) } - console.log("key的状态",req.status) - if(req.status == 1) { this.setState({isEdit:false}) @@ -138,6 +133,8 @@ export default class acclist extends React.Component{ getApprovalsInfo(approval_id).then((res)=>{ handelResponse(res,(req,msg)=>{ + console.log("审批数据666",req) + for(let i = 0;i < req.code_batch.length;i++) { @@ -301,24 +298,15 @@ export default class acclist extends React.Component{ this.setState({productData:null}) } async productSubmit(){ - - - let visible = await this.refs.product.submit() if(visible) { Notify.success("保存成功") this.setState({drawerVisible2:false}) - setTimeout(()=>{ let data = JSON.parse(sessionStorage.getItem("productData")); - - let temp = _.map(data,(item)=>{ - let index = this.state.tempdata.findIndex((o)=>{return o.product_id == item.product_id}) - - if(index > -1) { item.checked = this.state.tempdata[index].checked @@ -326,9 +314,6 @@ export default class acclist extends React.Component{ return item }) - - - this.setState({tempdata:temp }) let arr = []; @@ -342,8 +327,6 @@ export default class acclist extends React.Component{ this.setState({rankoptions:arr}) },500) } - - } onChangeCombinedDate(e){ diff --git a/src/pages/plan/key/product/add.js b/src/pages/plan/key/product/add.js index 337e3d73..a965d048 100644 --- a/src/pages/plan/key/product/add.js +++ b/src/pages/plan/key/product/add.js @@ -324,7 +324,7 @@ export default class adduserinfo extends React.Component{