From 5c7fc681ec8ed5f40fc4c5c556f109bb8513cc78 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 13 Apr 2023 17:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/AppRedemptionPoints/myOrderList.vue | 18 +++++++++++-------
 .../AppRedemptionPoints/successOrder.vue       |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
index f66f168..07d4678 100644
--- a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
+++ b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue
@@ -12,11 +12,11 @@
         </div>
         <div class="flex">
           <img :src="item.goodsPicUrl" alt="">
-          <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGType', item.type) }}</div>
+          <div class="type" :class="`type`+item.goodsType">{{ $dict.getLabel('integralSGType', item.goodsType) }}</div>
           <div class="flex-right">
             <p>{{item.goodsTitle}}</p>
             <div class="num-flex">
-              <h3>{{item.usedIntegral}}积分<span v-if="item.type == 1">+{{item.payMoney}}元</span></h3>
+              <h3>{{item.usedIntegral}}积分<span v-if="item.goodsType == 1">+{{item.payMoney}}元</span></h3>
               <div>x {{item.quantity}}</div>
             </div>
           </div>
@@ -24,7 +24,7 @@
         <p class="tips" v-if="item.type == 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.type == 1">
+        <div class="flex-btn" v-if="item.goodsType == 1">
           <p></p>
           <div class="btn confirm" @click="openJd(item)">去购买</div>
         </div>
@@ -93,10 +93,13 @@ export default {
     },
     cancel(item) {
       uni.showModal({
-        title: '确认取消该订单？',
-        confirmspan: "确认",
-        confirmColor: "#135AB8",
-        success: function (res) {
+        title: '确认取消此订单？',
+        content: '取消订单后，积分将退回至积分余额',
+        confirmColor: "#2D7DFF",
+        cancelColor: "#2D7DFF",
+        cancelText: "我在想想",
+        confirmText: "确认取消", 
+        success: (res) => {
           if (res.confirm) {
             this.cancelOrder(item)
           }
@@ -135,6 +138,7 @@ export default {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
+      margin-bottom: 32px;
       .time-flex {
         padding: 0 32px;
         line-height: 64px;
diff --git a/src/project/fengdu/AppRedemptionPoints/successOrder.vue b/src/project/fengdu/AppRedemptionPoints/successOrder.vue
index 57ef95f..3d3e311 100644
--- a/src/project/fengdu/AppRedemptionPoints/successOrder.vue
+++ b/src/project/fengdu/AppRedemptionPoints/successOrder.vue
@@ -48,7 +48,7 @@ export default {
       uni.navigateTo({url: `./jdH5?goodsJdUrl=${this.goodsJdUrl}`})
     },
     back() {
-      uni.navigateBack({delta: backLevel})
+      uni.navigateBack({delta: this.backLevel})
     },
     toOrderList() {
       uni.redirectTo({