From 64a145c11a1e6924c9efb984411866e2439e0ad6 Mon Sep 17 00:00:00 2001 From: zhangguoping Date: Tue, 29 Oct 2024 16:24:48 +0800 Subject: [PATCH] bug476 --- combining.html | 6 +++--- packkey/combining.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/combining.html b/combining.html index 8f110cb..d53410e 100644 --- a/combining.html +++ b/combining.html @@ -417,9 +417,9 @@ voucher: { denomination: item.voucher.denomination, reduce_amount: item.voucher.reduce_amount, - status: self.statusSort(el.order_voucher)[0], - num: self.statusSort(el.order_voucher)[1], - send_num: el.order_voucher.length + 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, + send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, } }; product_all.push(obj); diff --git a/packkey/combining.html b/packkey/combining.html index 9615a05..08e032f 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -419,9 +419,9 @@ voucher: { denomination: item.voucher.denomination, reduce_amount: item.voucher.reduce_amount, - status: self.statusSort(el.order_voucher)[0], - num: self.statusSort(el.order_voucher)[1], - send_num: el.order_voucher.length + 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, + send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num, } }; product_all.push(obj);