diff --git a/combining.html b/combining.html index da6c339..11abe6b 100644 --- a/combining.html +++ b/combining.html @@ -488,26 +488,23 @@ }).then(res => { if (res.code == 200) { this.goods = res.data - // 支付宝组合商品 - if (this.goods.group_info.channel == 3 || this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 2) { - // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 - this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; - // 部分失败 - if (res.data.send_status === 4) { - let all_product_length = res.data.product.length; - let is_err_length = res.data.product.filter(item => item.voucher.status === 5).length; - self.isOKLength = all_product_length - is_err_length; - self.isErrLength = is_err_length; - } + // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; - // 发放中 轮循 - if (res.data.send_status === 1) { - setTimeout(() => { - self.groupProductVoucherDetail(); - self.cont++; - }, 5000) - } + // 部分失败 + if (res.data.send_status === 4) { + let all_product_length = res.data.product.length; + let is_err_length = res.data.product.filter(item => item.voucher.status === 5).length; + self.isOKLength = all_product_length - is_err_length; + self.isErrLength = is_err_length; + } + + // 发放中 轮循 + if (res.data.send_status === 1) { + setTimeout(() => { + self.groupProductVoucherDetail(); + }, 5000) } } else { @@ -574,7 +571,6 @@ .then((res) => { if (res.code == 200) { - this.message = '领取成功'; this.getProductDetail(); } else { diff --git a/packkey/combining.html b/packkey/combining.html index 6166308..30682f1 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -386,7 +386,6 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code === 200) { - alert(JSON.stringify(res.data.product)) // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 // status 1待领取,2发放中,3待使用,4已使用,5领取失败 @@ -489,29 +488,25 @@ code_batch_id: this.code_batch_id }).then(res => { if (res.code == 200) { - alert(res.data.send_status) this.goods = res.data // 支付宝组合商品 - if (this.goods.group_info.channel == 3 || this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 2) { - // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 - this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; + // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; - // 部分失败 - if (res.data.send_status === 4) { - let all_product_length = res.data.product.length; - let is_err_length = res.data.product.filter(item => item.voucher.status === 5).length; - self.isOKLength = all_product_length - is_err_length; - self.isErrLength = is_err_length; - } - - // 发放中 轮循 - if (res.data.send_status === 1) { - setTimeout(() => { - self.groupProductVoucherDetail(); - }, 5000) - } + // 部分失败 + if (res.data.send_status === 4) { + let all_product_length = res.data.product.length; + let is_err_length = res.data.product.filter(item => item.voucher.status === 5).length; + self.isOKLength = all_product_length - is_err_length; + self.isErrLength = is_err_length; } + // 发放中 轮循 + if (res.data.send_status === 1) { + setTimeout(() => { + self.groupProductVoucherDetail(); + }, 5000) + } // 代码暂时这样 if (res.data.group_info.channel == 1 && res.data.group_info.receive_mode == 1) { @@ -599,7 +594,6 @@ settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type); } - this.message = '领取成功'; this.getProductDetail(); } else { diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index 24c3c13..30682f1 100644 --- a/packkey/wx-combining.html +++ b/packkey/wx-combining.html @@ -6,7 +6,7 @@ 组合立减金 - + @@ -102,7 +102,6 @@ v-model="form.receive_account"> -