HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
wangsongsole 2022-09-30 16:23:16 +08:00
parent 5b99fe656a 4fef6f3c09
commit 2d73e4b078
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/exchangepage/edittemplate/main.js
View File

@ -334,8 +334,10 @@ export default class edittemplate extends React.Component {
this.setState({ activeNavStatus: 1 }) this.setState({ activeNavStatus: 1 })
return return
} }
let iptImg=true;
if (!this.state.model.middle_image) { 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.clear()
Notify.error('请上传落地页输入框') Notify.error('请上传落地页输入框')
this.setState({ activeNavStatus: 1 }) this.setState({ activeNavStatus: 1 })

6
src/pages/plan/key/edit.js
View File

@ -346,7 +346,7 @@ export default class acclist extends React.Component {
let data = {}; let data = {};
data.style = this.state.model.style; data.style = this.state.model.style;
data.quantity = this.state.model.quantity; 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_repetition = this.state.model.allow_repetition;
data.allow_loss = this.state.model.allow_loss; data.allow_loss = this.state.model.allow_loss;
data.stock = this.state.model.stock; data.stock = this.state.model.stock;
@ -882,7 +882,7 @@ export default class acclist extends React.Component {
batch_name: this.state.model.batch_name, batch_name: this.state.model.batch_name,
style: this.state.model.style, style: this.state.model.style,
quantity: this.state.model.quantity, quantity: this.state.model.quantity,
bind_object: this.state.keyType, bind_object: [this.state.keyType],
allow_repetition: this.state.model.allow_repetition, allow_repetition: this.state.model.allow_repetition,
allow_loss: this.state.model.allow_loss, allow_loss: this.state.model.allow_loss,
merge_stock: this.state.model.merge_stock, 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, batch_name: this.state.model.batch_name,
style: this.state.model.style, style: this.state.model.style,
quantity: this.state.model.quantity, quantity: this.state.model.quantity,
bind_object: this.state.keyType, bind_object: [this.state.keyType],
allow_repetition: this.state.model.allow_repetition, allow_repetition: this.state.model.allow_repetition,
allow_loss: this.state.model.allow_loss, allow_loss: this.state.model.allow_loss,
merge_stock: this.state.model.merge_stock, merge_stock: this.state.model.merge_stock,