From b289b42c3d7f537094fcf750e888d3a429633820 Mon Sep 17 00:00:00 2001 From: zhangds Date: Wed, 10 Apr 2024 21:38:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=AE=E5=BE=AA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++-- packkey/wx-combining.html | 2 +- packkey/ysf-combining.html | 2 +- wx-combining.html | 10 +++++----- ysf-combining.html | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index cd85eec..0a26f70 100644 --- a/index.html +++ b/index.html @@ -123,9 +123,9 @@ let self = this; //获取链接携带的参数 let linkId = getQueryString('id'); - // let linkId = "2460" + // let linkId = "2492" let keyCode = getQueryString('key'); - // let keyCode = "AAACD7eSqWZp4AbJ" + // let keyCode = "AAACFNCWzV4KBcBX" if (!linkId) {//地址栏无携带id let path = window.location.pathname; let parmas = path.split('/'); diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index 1bc9ec9..8042976 100644 --- a/packkey/wx-combining.html +++ b/packkey/wx-combining.html @@ -541,7 +541,7 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code === 200) { - let new_data = res.data; + let new_data = res.data.product; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // status 1待领取，2发放中，3待使用，4已使用，5领取失败 diff --git a/packkey/ysf-combining.html b/packkey/ysf-combining.html index a0c8a59..980ffa6 100644 --- a/packkey/ysf-combining.html +++ b/packkey/ysf-combining.html @@ -398,7 +398,7 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code === 200) { - let new_data = res.data; + let new_data = res.data.product; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // status 1待领取，2发放中，3待使用，4已使用，5领取失败 diff --git a/wx-combining.html b/wx-combining.html index 8d0432e..a7f238a 100644 --- a/wx-combining.html +++ b/wx-combining.html @@ -385,7 +385,7 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code === 200) { - let new_data = res.data; + let new_data = res.data.product; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // status 1待领取，2发放中，3待使用，4已使用，5领取失败 @@ -399,17 +399,17 @@ if (el) { // 存储错误 - el.voucher.forEach(row => { + el.order_voucher.forEach(row => { if (row.receive_error !== "") { all_err.push(row.receive_error); } }) // 合并所有数组 用于判断最终状态 - new_voucher_all = new_voucher_all.concat(el.voucher); + new_voucher_all = new_voucher_all.concat(el.order_voucher); - // 替换 voucher - old_product_all[i].voucher = el.voucher; + // 替换 order_voucher + old_product_all[i].voucher = el.order_voucher; } } diff --git a/ysf-combining.html b/ysf-combining.html index 1ddfa41..d9e146c 100644 --- a/ysf-combining.html +++ b/ysf-combining.html @@ -385,7 +385,7 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code === 200) { - let new_data = res.data; + let new_data = res.data.product; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // status 1待领取，2发放中，3待使用，4已使用，5领取失败