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

组合立即领取

This commit is contained in:
zhangguoping 2024-10-29 19:11:14 +08:00
parent 9a2af6e202
commit 58263a3524
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
combining.html
View File

@ -417,7 +417,7 @@
voucher: { voucher: {
denomination: item.voucher.denomination, denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount, reduce_amount: item.voucher.reduce_amount,
status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1, status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num, num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
} }
@ -470,9 +470,11 @@
// 领取失败数，小于全部数量 -> send_status 4 部分失败 // 领取失败数，小于全部数量 -> send_status 4 部分失败
// 错误去重 // 错误去重
self.goods.err_msg = [...new Set(all_err)]; self.goods.err_msg = [...new Set(all_err)];
if(self.goods.period_type != 2 && self.goods.period_type != 3) {
self.isOKLength = product_all.length - errLength.length; self.isOKLength = product_all.length - errLength.length;
self.isErrLength = errLength.length; self.isErrLength = errLength.length;
self.goods.send_status = 4; self.goods.send_status = 4;
}
self.popMsg = true; self.popMsg = true;
return; return;

4
packkey/combining.html
View File

@ -419,7 +419,7 @@
voucher: { voucher: {
denomination: item.voucher.denomination, denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount, reduce_amount: item.voucher.reduce_amount,
status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1, status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num, num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
} }
@ -472,9 +472,11 @@
// 领取失败数，小于全部数量 -> send_status 4 部分失败 // 领取失败数，小于全部数量 -> send_status 4 部分失败
// 错误去重 // 错误去重
self.goods.err_msg = [...new Set(all_err)]; self.goods.err_msg = [...new Set(all_err)];
if(self.goods.period_type != 2 && self.goods.period_type != 3) {
self.isOKLength = product_all.length - errLength.length; self.isOKLength = product_all.length - errLength.length;
self.isErrLength = errLength.length; self.isErrLength = errLength.length;
self.goods.send_status = 4; self.goods.send_status = 4;
}
self.popMsg = true; self.popMsg = true;
return; return;