From 63551580405e153951c413e740d2097c771a679a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 22 May 2023 17:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=85=91=E6=8D=A2=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fd/AppRedemptionPoints/goodsList.vue      |  6 +--
 .../fd/AppRedemptionPoints/myOrderList.vue    | 15 +++++--
 .../fd/AppRedemptionPoints/placeOrder.vue     |  6 +--
 .../fd/AppRedemptionPoints/productDetails.vue |  4 +-
 .../fd/AppRedemptionPoints/successOrder.vue   | 41 ++++++++++++-------
 5 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/project/fd/AppRedemptionPoints/goodsList.vue b/src/project/fd/AppRedemptionPoints/goodsList.vue
index 502ff29f..d0fc1616 100644
--- a/src/project/fd/AppRedemptionPoints/goodsList.vue
+++ b/src/project/fd/AppRedemptionPoints/goodsList.vue
@@ -9,8 +9,8 @@
         <div class="btn" @click="toMyOrder">ta的订单</div>
       </div>
       <div class="search">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="76" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
-          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs>
+        <!-- <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="76" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
+          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs> -->
         <div class="type-select">
           <div :class="currentType == index ? 'item active' : 'item'" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">
             {{item}}
@@ -83,7 +83,7 @@ export default {
   data() {
     return {
       tabList: [{name: '全部'}, {name: '免费兑'}, {name: '京东低价商品'}],
-      currentTabs: 0,
+      currentTabs: 1,
       barStyle: {
         'width': '20px',
         'height': '3px',
diff --git a/src/project/fd/AppRedemptionPoints/myOrderList.vue b/src/project/fd/AppRedemptionPoints/myOrderList.vue
index 4727bf16..c623753d 100644
--- a/src/project/fd/AppRedemptionPoints/myOrderList.vue
+++ b/src/project/fd/AppRedemptionPoints/myOrderList.vue
@@ -16,15 +16,15 @@
           <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>
@@ -95,7 +95,14 @@ export default {
       })
     },
     openJd(item) {
-      uni.navigateTo({url: `./jdH5?goodsJdUrl=${item.goodsJdUrl}`})
+      if(item.goodsType == 1) {
+        uni.navigateTo({url: `./jdH5?goodsJdUrl=${item.goodsJdUrl}`})
+      }else {
+        uni.navigateToMiniProgram({
+          appId: item.goodsJdAppid,
+          path: item.goodsJdUrl
+        })
+      }
     },
     cancel(item) {
       uni.showModal({
diff --git a/src/project/fd/AppRedemptionPoints/placeOrder.vue b/src/project/fd/AppRedemptionPoints/placeOrder.vue
index 8ec1be30..2fa2b6f3 100644
--- a/src/project/fd/AppRedemptionPoints/placeOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/placeOrder.vue
@@ -9,10 +9,10 @@
           <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/fd/AppRedemptionPoints/productDetails.vue b/src/project/fd/AppRedemptionPoints/productDetails.vue
index 55c92847..0e11fd60 100644
--- a/src/project/fd/AppRedemptionPoints/productDetails.vue
+++ b/src/project/fd/AppRedemptionPoints/productDetails.vue
@@ -4,9 +4,9 @@
     <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">
diff --git a/src/project/fd/AppRedemptionPoints/successOrder.vue b/src/project/fd/AppRedemptionPoints/successOrder.vue
index 2b0106f2..303704ae 100644
--- a/src/project/fd/AppRedemptionPoints/successOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/successOrder.vue
@@ -1,15 +1,7 @@
 <template>
   <div class="successOrder">
     <img src="./img/success.png" alt="">
-    
-    <div v-if="isFree == 1">
-      <h3>兑换成功</h3>
-      <p>提交「京东低价商品」订单成功，扣减 <span>{{integralPrice}}积分</span>
-        可点击下方按钮前往京东商城进行低价购买
-      </p>
-      <div class="btn" @click="openJd">去购买</div>
-    </div>
-    <div v-else>
+    <div v-if="goodsInfo.type == 0">
       <h3>提交成功</h3>
       <p>提交「免费兑」订单成功，扣减 <span>{{integralPrice}}积分</span></p>
       <div class="btn-flex">
@@ -17,6 +9,13 @@
         <div @click="toOrderList">查看订单</div>
       </div>
     </div>
+    <div v-else>
+      <h3>兑换成功</h3>
+      <p>提交「京东低价商品」订单成功，扣减 <span>{{integralPrice}}积分</span>
+        可点击下方按钮前往京东商城进行低价购买
+      </p>
+      <div class="btn" @click="openJd">去购买</div>
+    </div>
   </div>
 </template>
 
@@ -28,27 +27,41 @@ export default {
   appName: '提交订单',
   data() {
     return {
-      isFree: 0, // 0免费 1京东
       integralPrice: 0,
       backLevel: 1,
-      goodsJdUrl: ''
+      shopGoodsId: '',
+      goodsInfo: {}
     }
   },
   computed: {
     ...mapState(['user']),
   },
   onLoad(option) {
-    this.isFree = option.isFree
     this.integralPrice = option.integralPrice
     this.backLevel = option.backLevel
-    this.goodsJdUrl = option.goodsJdUrl
+    this.shopGoodsId = option.shopGoodsId
+    this.getDetail()
   },
   onShow() {
     document.title = '提交订单'
   },
   methods: {
+    getDetail() {
+      this.$instance.post(`/app/appintegralsupermarketshop/queryGoodsInfoXCX?shopGoodsId=${this.shopGoodsId}`).then(res => {
+        if (res.code === 0) {
+          this.goodsInfo = res.data
+        }
+      })
+    },
     openJd() {
-      uni.navigateTo({url: `./jdH5?goodsJdUrl=${this.goodsJdUrl}`})
+      if(this.goodsInfo.type == 1) {
+        uni.navigateTo({url: `./jdH5?goodsJdUrl=${this.goodsInfo.jdUrl}`})
+      }else {
+        uni.navigateToMiniProgram({
+          appId: this.goodsInfo.jdAppid,
+          path: this.goodsInfo.jdUrl
+        })
+      }
     },
     back() {
       uni.navigateBack({delta: Number(this.backLevel)})