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

27
combining.html
View File

@ -410,19 +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: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status, status: self.statusSort(el.order_voucher)[0],
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num, num: self.statusSort(el.order_voucher)[1],
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, send_num: el.order_voucher.length,
} }
}; };
product_all.push(obj); product_all.push(obj);
}
} }
}); });

27
packkey/combining.html
View File

@ -412,19 +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: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status, status: self.statusSort(el.order_voucher)[0],
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num, num: self.statusSort(el.order_voucher)[1],
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, send_num: el.order_voucher.length,
} }
}; };
product_all.push(obj); product_all.push(obj);
}
} }
}); });