From 9cae2893549455b1e46338b54c6272969ae0fbca Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 22 May 2023 16:19:52 +0800
Subject: [PATCH] type

---
 src/project/fengdu/AppRedemptionPoints/myOrderList.vue | 10 +++++-----
 src/project/fengdu/AppRedemptionPoints/placeOrder.vue  |  8 ++++----
 .../fengdu/AppRedemptionPoints/productDetails.vue      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
index 43151c2..6ae5de7 100644
--- a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
+++ b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
@@ -12,23 +12,23 @@
         </div>
         <div class="flex">
           <img :src="item.goodsPicUrl" alt="">
-          <div class="type" :class="`type`+item.goodsType">{{ $dict.getLabel('integralSGTypeText', item.goodsTypeText) }}</div>
+          <div class="type" :class="`type`+item.goodsTypeText">{{ $dict.getLabel('integralSGTypeText', item.goodsTypeText) }}</div>
           <div class="flex-right">
             <p>{{item.goodsTitle}}</p>
             <div class="num-flex">
-              <h3>{{item.usedIntegral}}积分<span v-if="item.goodsType == 1">+{{item.payMoney}}元</span></h3>
+              <h3>{{item.usedIntegral}}积分<span v-if="item.goodsType == 2">+{{item.payMoney}}元</span></h3>
               <div>x {{item.quantity}}</div>
             </div>
           </div>
         </div>
-        <p class="tips" v-if="item.goodsType == 1"><span>兑换成功后，点击「去购买」前往京东低价购买</span></p>
+        <p class="tips" v-if="item.goodsType == 2"><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 && item.status != 2">
+        <div class="flex-btn" v-if="item.goodsType == 2 && item.status != 2">
           <p></p>
           <div class="btn confirm" @click="openJd(item)">去购买</div>
         </div>
-        <div class="flex-btn" v-if="item.goodsType != 1">
+        <div class="flex-btn" v-if="item.goodsType != 2">
           <p>核销码:<span>{{item.verificationCode}}</span></p>
           <div class="btn" v-if="item.status == 0" @click="cancel(item)">取消订单</div>
         </div>
diff --git a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
index 325610e..54998b8 100644
--- a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
+++ b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue
@@ -3,16 +3,16 @@
     <div class="header-info">
       <div class="flex">
         <img :src="goodsInfo.picUrl" alt="">
-        <div class="type" :class="`type`+goodsInfo.type">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
+        <div class="type" :class="`type`+goodsInfo.typeText">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
         <div class="flex-right">
           <p>{{goodsInfo.title}}</p>
           <div>
             <u-number-box v-model="goodsNum" @change="valChange" input-height="44" size="24" :min="1" :max="goodsInfo.stock"></u-number-box>
           </div>
-          <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 1">+￥{{goodsInfo.payMoney}}.00</span></h3>
+          <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 2">+￥{{goodsInfo.payMoney}}.00</span></h3>
         </div>
       </div>
-      <p class="tips" v-if="goodsInfo.type == 1">兑换成功后，点击「去购买」前往京东低价购买</p>
+      <p class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</p>
       <p class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</p>
     </div>
     <div class="content">
@@ -28,7 +28,7 @@
         <div class="label">支付积分</div>
         <div class="value">减{{(goodsNum*goodsInfo.integralPrice).toFixed(2)}}积分</div>
       </div>
-      <div class="item-flex" v-if="goodsInfo.type == 1">
+      <div class="item-flex" v-if="goodsInfo.type == 2">
         <div class="label">京东支付</div>
         <div class="value color-999">¥{{(goodsNum*goodsInfo.payMoney).toFixed(2)}}</div>
       </div>
diff --git a/src/project/fengdu/AppRedemptionPoints/productDetails.vue b/src/project/fengdu/AppRedemptionPoints/productDetails.vue
index a0d1243..340eb43 100644
--- a/src/project/fengdu/AppRedemptionPoints/productDetails.vue
+++ b/src/project/fengdu/AppRedemptionPoints/productDetails.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="productDetails" v-if="goodsInfo.picUrl">
     <img :src="goodsInfo.picUrl" alt="">
-    <div class="type" :class="`type`+goodsInfo.type">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
+    <div class="type" :class="`type`+goodsInfo.typeText">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
     <div class="product-info">
       <p>{{goodsInfo.title}}</p>
-      <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 1">+￥{{goodsInfo.payMoney}}<span v-if="goodsInfo.type == 1">（兑换后再付）</span></span></h3>
+      <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 2">+￥{{goodsInfo.payMoney}}<span v-if="goodsInfo.type == 2">（兑换后再付）</span></span></h3>
       <div>零售单价¥{{goodsInfo.retailPrice}}</div>
-      <span class="tips" v-if="goodsInfo.type == 1">兑换成功后，点击「去购买」前往京东低价购买</span>
+      <span class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</span>
       <span class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</span>
     </div>
     <div class="product-content">