From 7453a2d4303ce9a03ddacd4f7dc3865a6295f023 Mon Sep 17 00:00:00 2001 From: zhangguoping Date: Tue, 29 Oct 2024 11:29:47 +0800 Subject: [PATCH] bug685 --- combining.html | 2 +- packkey/combining.html | 2 +- packkey/wx-combining.html | 2 +- packkey/ysf-combining.html | 2 +- wx-combining.html | 2 +- xw-pages/wx-combining.html | 2 +- ysf-combining.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/combining.html b/combining.html index eb422b7..8f110cb 100644 --- a/combining.html +++ b/combining.html @@ -502,7 +502,7 @@ this.form.confirm = this.goods.account || ''; // 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; + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (res.data.send_status === 4) { diff --git a/packkey/combining.html b/packkey/combining.html index c6e32e9..9615a05 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -504,7 +504,7 @@ this.form.confirm = this.goods.account || ''; // 支付宝组合商品 // 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; + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (res.data.send_status === 4) { diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index 634b196..3a5a5f6 100644 --- a/packkey/wx-combining.html +++ b/packkey/wx-combining.html @@ -342,7 +342,7 @@ this.form.confirm = this.goods.account || ''; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 - self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/packkey/ysf-combining.html b/packkey/ysf-combining.html index 9955e27..c1d59dc 100644 --- a/packkey/ysf-combining.html +++ b/packkey/ysf-combining.html @@ -341,7 +341,7 @@ this.form.confirm = this.goods.account || ''; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 - self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/wx-combining.html b/wx-combining.html index d32efa2..f5f48a4 100644 --- a/wx-combining.html +++ b/wx-combining.html @@ -341,7 +341,7 @@ this.form.confirm = this.goods.account || ''; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 - self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html index e63a33b..7d298ab 100644 --- a/xw-pages/wx-combining.html +++ b/xw-pages/wx-combining.html @@ -341,7 +341,7 @@ this.form.confirm = this.goods.account || ''; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 - self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/ysf-combining.html b/ysf-combining.html index 7ef6349..797d5c2 100644 --- a/ysf-combining.html +++ b/ysf-combining.html @@ -340,7 +340,7 @@ this.form.confirm = this.goods.account || ''; // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 - self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.account ? false : true : false; // 部分失败 if (self.goods.send_status === 4) {