From 7edd2592cc9026935eed98454524cc7ab9c82e04 Mon Sep 17 00:00:00 2001 From: zhangguoping Date: Tue, 29 Oct 2024 18:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E7=AB=8B=E5=8D=B3=E9=A2=86?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- combining.html | 27 ++++++++++++++------------- packkey/combining.html | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/combining.html b/combining.html index b844ef0..c527751 100644 --- a/combining.html +++ b/combining.html @@ -410,19 +410,20 @@ all_err.push(row.receive_error); } }); - - let obj = { - id: item.id, - type: item.type, - voucher: { - denomination: item.voucher.denomination, - reduce_amount: item.voucher.reduce_amount, - 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); + if(el.order_voucher.length) { + let obj = { + id: item.id, + type: item.type, + 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, + } + }; + product_all.push(obj); + } } }); diff --git a/packkey/combining.html b/packkey/combining.html index 896889e..4ca9693 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -412,19 +412,20 @@ all_err.push(row.receive_error); } }); - - let obj = { - id: item.id, - type: item.type, - voucher: { - denomination: item.voucher.denomination, - reduce_amount: item.voucher.reduce_amount, - 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); + if(el.order_voucher.length){ + let obj = { + id: item.id, + type: item.type, + 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, + } + }; + product_all.push(obj); + } } });