From af0dcf5446eaed348018204022f015dab1b575f0 Mon Sep 17 00:00:00 2001 From: zhangguoping Date: Tue, 29 Oct 2024 16:28:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 d53410e..b844ef0 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 ? this.goods.account ? false : true : false; + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (res.data.send_status === 4) { diff --git a/packkey/combining.html b/packkey/combining.html index 08e032f..896889e 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 ? this.goods.account ? false : true : false; + this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (res.data.send_status === 4) { diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index 3a5a5f6..1e33e37 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 ? this.goods.account ? false : true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/packkey/ysf-combining.html b/packkey/ysf-combining.html index c1d59dc..e7bcf63 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 ? this.goods.account ? false : true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/wx-combining.html b/wx-combining.html index f5f48a4..0c4070d 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 ? this.goods.account ? false : true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html index 7d298ab..6b43f25 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 ? this.goods.account ? false : true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (self.goods.send_status === 4) { diff --git a/ysf-combining.html b/ysf-combining.html index 797d5c2..216f599 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 ? this.goods.account ? false : true : false; + self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? this.goods.period_type == 2 || this.goods.period_type == 3 ? false : true : false; // 部分失败 if (self.goods.send_status === 4) {