From 7d67d5863e5a686d7283867cae3b465733680471 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 18 Apr 2023 11:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/AppRedemptionPoints/AppRedemptionPoints.vue   | 9 +++++++--
 src/project/fengdu/AppRedemptionPoints/myOrderList.vue   | 2 +-
 src/project/fengdu/AppRedemptionPoints/placeOrder.vue    | 2 +-
 .../fengdu/AppRedemptionPoints/productDetails.vue        | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
index e6cbe94..85c32fc 100644
--- a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
+++ b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -35,8 +35,13 @@
               <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
               <span v-if="item.type == 1">兑换后再付</span>
             </div>
-            <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.status == 1 && item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
-            <div class="btn btn0" :class="`btn`+item.status" v-else>商品缺货</div>
+            <div v-if="item.status == 1">
+              <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
+              <div class="btn btn0" :class="`btn`+item.status" v-else>商品缺货</div>
+            </div>
+            <div v-else>
+              <div class="btn btn0">店铺停用</div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
index 8903efe..2804ccc 100644
--- a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
+++ b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
@@ -24,7 +24,7 @@
         <p class="tips" v-if="item.goodsType == 1"><span>兑换成功后，点击「去购买」前往京东低价购买</span></p>
          <p class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</p>
         <p class="remark" v-if="item.remarks">备注：{{item.remarks}}</p>
-        <div class="flex-btn" v-if="item.goodsType == 1">
+        <div class="flex-btn" v-if="item.goodsType == 1 && item.status != 2">
           <p></p>
           <div class="btn confirm" @click="openJd(item)">去购买</div>
         </div>
diff --git a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
index 0a863d2..4fe722f 100644
--- a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
+++ b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
@@ -104,7 +104,7 @@ export default {
     },
     toSuccess() {
       var integralPrice = this.goodsNum*this.goodsInfo.integralPrice
-      uni.navigateTo({url: `./successOrder?isFree=${this.goodsInfo.type}&integralPrice=${integralPrice}&backLevel=${this.backLevel}&goodsJdUrl=${this.goodsInfo.goodsJdUrl}`})
+      uni.navigateTo({url: `./successOrder?isFree=${this.goodsInfo.type}&integralPrice=${integralPrice}&backLevel=${this.backLevel}&goodsJdUrl=${this.goodsInfo.jdUrl}`})
     }
   },
 }
diff --git a/src/project/fengdu/AppRedemptionPoints/productDetails.vue b/src/project/fengdu/AppRedemptionPoints/productDetails.vue
index a406b4d..077f30a 100644
--- a/src/project/fengdu/AppRedemptionPoints/productDetails.vue
+++ b/src/project/fengdu/AppRedemptionPoints/productDetails.vue
@@ -13,10 +13,11 @@
       <p>商品描述：</p>
       <p v-html="goodsInfo.description"></p>
     </div>
-    <div class="btn" @click="toOrder()">
-      <div :class="total >= goodsInfo.integralPrice ? 'status1' : 'status0'" v-if="goodsInfo.status == 1 && goodsInfo.stock > 0">{{total >= goodsInfo.integralPrice ? '立即兑换' : '积分不足'}}</div>
+    <div class="btn" @click="toOrder()" v-if="goodsInfo.status == 1">
+      <div :class="total >= goodsInfo.integralPrice ? 'status1' : 'status0'" v-if="goodsInfo.stock > 0">{{total >= goodsInfo.integralPrice ? '立即兑换' : '积分不足'}}</div>
       <div class="status0" v-else>商品缺货</div>
     </div>
+    <div class="btn btn0" v-else>店铺停用</div>
   </div>
 </template>