From 6185b022cd59cb356e7b9c7004aef70e682000d5 Mon Sep 17 00:00:00 2001 From: zhangds Date: Fri, 30 Sep 2022 15:34:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dkey=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E7=BC=96=E8=BE=91=E7=BB=91=E5=AE=9A=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/edit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js index 30a89abe..af9beefe 100644 --- a/src/pages/plan/key/edit.js +++ b/src/pages/plan/key/edit.js @@ -346,7 +346,7 @@ export default class acclist extends React.Component { let data = {}; data.style = this.state.model.style; data.quantity = this.state.model.quantity; - data.bind_object = this.state.model.bind_object; + data.bind_object = [this.state.model.bind_object]; data.allow_repetition = this.state.model.allow_repetition; data.allow_loss = this.state.model.allow_loss; data.stock = this.state.model.stock; @@ -882,7 +882,7 @@ export default class acclist extends React.Component { batch_name: this.state.model.batch_name, style: this.state.model.style, quantity: this.state.model.quantity, - bind_object: this.state.keyType, + bind_object: [this.state.keyType], allow_repetition: this.state.model.allow_repetition, allow_loss: this.state.model.allow_loss, merge_stock: this.state.model.merge_stock, @@ -930,7 +930,7 @@ export default class acclist extends React.Component { batch_name: this.state.model.batch_name, style: this.state.model.style, quantity: this.state.model.quantity, - bind_object: this.state.keyType, + bind_object: [this.state.keyType], allow_repetition: this.state.model.allow_repetition, allow_loss: this.state.model.allow_loss, merge_stock: this.state.model.merge_stock, From 4fef6f3c09f6cec639067ee9b1003b6a74eb7dc7 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Fri, 30 Sep 2022 15:41:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E6=A8=A1=E6=9D=BF):?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=98=E6=83=A0=E5=88=B8=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=B7=B2=E7=BB=8F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E5=85=A5=E6=A1=86=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E4=BB=8D=E6=8F=90=E7=A4=BA=E3=80=90=E8=AF=B7=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index f3a8e16e..e1f7d21e 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -334,8 +334,10 @@ export default class edittemplate extends React.Component { this.setState({ activeNavStatus: 1 }) return } - - if (!this.state.model.middle_image) { + let iptImg=true; + if(this.state.showType==8) if(!this.state.model.white_image) iptImg=false; + if(this.state.showType!=8) if(!this.state.model.middle_image) iptImg=false; + if(!iptImg){ Notify.clear() Notify.error('请上传落地页输入框') this.setState({ activeNavStatus: 1 })