From 18cb093e45cc4a51702811a38be4d78e2036aabc Mon Sep 17 00:00:00 2001
From: zhangguoping <jackzgp@aliyun.com>
Date: Mon, 28 Oct 2024 10:36:11 +0800
Subject: [PATCH] bug 673

---
 exchange.html         | 4 ++--
 packkey/exchange.html | 8 ++++----
 packkey/reduce.html   | 2 +-
 reduce.html           | 2 +-
 xw-pages/reduce.html  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/exchange.html b/exchange.html
index 14d2349..9d3e9b0 100644
--- a/exchange.html
+++ b/exchange.html
@@ -231,7 +231,7 @@
     methods: {
       bindAvailable () {
         if (goodsDetail.available != 1) {
-          if(goodsDetail.available === 23 && goodsDetail.period_tips_text) {
+          if(goodsDetail.available === 23 || goodsDetail.period_tips_text) {
             return this.openErrorDialog(goodsDetail.period_tips_text)
           } else {
             return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
@@ -300,7 +300,7 @@
       //兑换商品
       exchangeGoodsFn () {
         if (goodsDetail.available != 1) {
-          if(this.goodsDetail.available === 23 && this.goodsDetail.period_tips_text) {
+          if(this.goodsDetail.available === 23 || this.goodsDetail.period_tips_text) {
             return this.openErrorDialog(this.goodsDetail.period_tips_text)
           } else {
             return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
diff --git a/packkey/exchange.html b/packkey/exchange.html
index 143cf9b..bc243a3 100644
--- a/packkey/exchange.html
+++ b/packkey/exchange.html
@@ -59,7 +59,7 @@
         <p>
           <span>账号:</span>
           <span class="j-input"
-            style="color: #b1bbc3;height:0.32rem;padding-right: 0.1rem;line-height: 0.32rem;display: inline-block;width: 80%;">{{placeholder}}</span>
+            style="color: #b1bbc3;height:0.32rem;padding-right: 0.1rem;line-height: 0.32rem;display: inline-block;width: 80%;">{{goodsDetail.account?account:placeholder}}</span>
         </p>
 
         <p v-if="goodInfo.is_e_card">
@@ -73,7 +73,7 @@
         <p v-else>
           <span>再次输入:</span>
           <span class="j-input"
-            style="color: #b1bbc3;height:0.32rem;padding-right: 0.1rem;line-height: 0.32rem;display: inline-block;width: 80%;">{{placeholder}}</span>
+            style="color: #b1bbc3;height:0.32rem;padding-right: 0.1rem;line-height: 0.32rem;display: inline-block;width: 80%;">{{goodsDetail.account?reaccount:placeholder}}</span>
         </p>
       </div>
 
@@ -279,7 +279,7 @@
     methods: {
       bindAvailable () {
         if (goodsDetail.available != 1) {
-          if(goodsDetail.available === 23 && goodsDetail.period_tips_text) {
+          if(goodsDetail.available === 23 || goodsDetail.period_tips_text) {
             return this.openErrorDialog(goodsDetail.period_tips_text)
           } else {
             return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
@@ -348,7 +348,7 @@
       //兑换商品
       exchangeGoodsFn () {
         if (goodsDetail.available != 1) {
-          if(this.goodsDetail.available === 23 && this.goodsDetail.period_tips_text) {
+          if(this.goodsDetail.available === 23 || this.goodsDetail.period_tips_text) {
             return this.openErrorDialog(this.goodsDetail.period_tips_text)
           } else {
             return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
diff --git a/packkey/reduce.html b/packkey/reduce.html
index afeb31a..54f2881 100644
--- a/packkey/reduce.html
+++ b/packkey/reduce.html
@@ -232,7 +232,7 @@
         this.loading = true;
         let self = this;
         if (self.goodInfo.available != 1) {
-          if(self.goodInfo.available === 23 && self.goodInfo.period_tips_text) {
+          if(self.goodInfo.available === 23 || self.goodInfo.period_tips_text) {
             self.openErrorDialog(self.goodInfo.period_tips_text)
           } else {
             self.openErrorDialog(product_status(self.goodInfo.available, self.goodInfo));
diff --git a/reduce.html b/reduce.html
index 2b72509..e8f4a38 100644
--- a/reduce.html
+++ b/reduce.html
@@ -237,7 +237,7 @@
         this.loading = true;
         let self = this;
         if (self.goodInfo.available != 1) {
-          if(self.goodInfo.available === 23 && self.goodInfo.period_tips_text) {
+          if(self.goodInfo.available === 23 || self.goodInfo.period_tips_text) {
             self.openErrorDialog(self.goodInfo.period_tips_text)
           } else {
             self.openErrorDialog(product_status(self.goodInfo.available, self.goodInfo));
diff --git a/xw-pages/reduce.html b/xw-pages/reduce.html
index effc1a7..e42cd4f 100644
--- a/xw-pages/reduce.html
+++ b/xw-pages/reduce.html
@@ -244,7 +244,7 @@
         this.loading = true;
         let self = this;
         if (self.goodInfo.available != 1) {
-          if(self.goodInfo.available === 23 && self.goodInfo.period_tips_text) {
+          if(self.goodInfo.available === 23 || self.goodInfo.period_tips_text) {
             self.openErrorDialog(self.goodInfo.period_tips_text)
           } else {
             self.openErrorDialog(product_status(self.goodInfo.available, self.goodInfo));