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 18:16:50 +08:00
parent 7edd2592cc
commit 9a2af6e202
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
combining.html
View File

@ -410,21 +410,20 @@
all_err.push(row.receive_error); all_err.push(row.receive_error);
} }
}); });
if(el.order_voucher.length) {
let obj = { let obj = {
id: item.id, id: item.id,
type: item.type, type: item.type,
voucher: { voucher: {
denomination: item.voucher.denomination, denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount, reduce_amount: item.voucher.reduce_amount,
status: self.statusSort(el.order_voucher)[0], status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1,
num: self.statusSort(el.order_voucher)[1], num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length, send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
} }
}; };
product_all.push(obj); product_all.push(obj);
} }
}
}); });
// 第二步：更新商品数据 // 第二步：更新商品数据

9
packkey/combining.html
View File

@ -412,21 +412,20 @@
all_err.push(row.receive_error); all_err.push(row.receive_error);
} }
}); });
if(el.order_voucher.length){
let obj = { let obj = {
id: item.id, id: item.id,
type: item.type, type: item.type,
voucher: { voucher: {
denomination: item.voucher.denomination, denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount, reduce_amount: item.voucher.reduce_amount,
status: self.statusSort(el.order_voucher)[0], status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1,
num: self.statusSort(el.order_voucher)[1], num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length, send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
} }
}; };
product_all.push(obj); product_all.push(obj);
} }
}
}); });
// 第二步：更新商品数据 // 第二步：更新商品数据