From ff16a8053f3330395cb557cd90d16c88c5323af2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 7 Jul 2023 10:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=B3=E8=BD=AC=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppSuperMarket/myOrderList.vue  | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/project/pingchang/AppSuperMarket/myOrderList.vue b/src/project/pingchang/AppSuperMarket/myOrderList.vue
index 9badf77c..d6146fd4 100644
--- a/src/project/pingchang/AppSuperMarket/myOrderList.vue
+++ b/src/project/pingchang/AppSuperMarket/myOrderList.vue
@@ -1,35 +1,38 @@
 <template>
   <div class="myOrderList">
     <div class="fixed-top">
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="90" 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="90" font-size="28" bg-color="#fff"
+              inactive-color="#8891A1"
+              active-color="#1D2229 " :bar-style="barStyle" @change="changeTab"></u-tabs>
     </div>
     <div class="list-content" v-if="list.length">
       <div class="item" v-for="(item, index) in list" :key="index">
         <div class="time-flex">
-          <p>{{item.createTime.substring(0, 16)}}</p>
+          <p>{{ item.createTime.substring(0, 16) }}</p>
           <div :class="`status`+item.status">{{ $dict.getLabel('integralSGOStatus', item.status) }}</div>
         </div>
         <div class="flex">
           <img :src="item.goodsPicUrl" alt="">
-          <div class="type" :class="`type`+item.goodsTypeText">{{ $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>
+            <p>{{ item.goodsTitle }}</p>
             <div class="num-flex">
-              <h3>{{item.usedIntegral}}积分<span v-if="item.goodsType == 1">+{{item.payMoney}}元</span></h3>
-              <div>x {{item.quantity}}</div>
+              <h3>{{ item.usedIntegral }}积分<span v-if="item.goodsType == 1">+{{ 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-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</p>
-        <p class="remark" v-if="item.remarks">备注：{{item.remarks}}</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">
           <p></p>
           <div class="btn confirm" @click="openJd(item)">去购买</div>
         </div>
         <div class="flex-btn" v-else>
-          <p>核销码:<span>{{item.verificationCode}}</span></p>
+          <p>核销码:<span>{{ item.verificationCode }}</span></p>
           <div class="btn" v-if="item.status == 0" @click="cancel(item)">取消订单</div>
         </div>
       </div>
@@ -93,7 +96,7 @@ export default {
       })
     },
     openJd(item) {
-      uni.navigateTo({url: `./jdH5?goodsJdUrl=${item.goodsJdUrl}`})
+      location.href = item.goodsJdUrl
     },
     cancel(item) {
       uni.showModal({
@@ -129,6 +132,7 @@ export default {
 <style lang="scss" scoped>
 .myOrderList {
   min-height: 100%;
+
   .fixed-top {
     background-color: #fff;
     position: fixed;
@@ -136,14 +140,17 @@ export default {
     left: 0;
     z-index: 2;
   }
+
   .list-content {
     padding: 112px 24px 24px;
     background-color: #F3F6F9;
+
     .item {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
       margin-bottom: 32px;
+
       .time-flex {
         padding: 0 32px;
         line-height: 64px;
@@ -153,24 +160,29 @@ export default {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid #ddd;
+
         div {
           color: #2D7DFF;
         }
+
         .status2 {
           color: #999;
         }
       }
+
       .flex {
         padding: 32px 32px 0;
         display: flex;
         position: relative;
         margin-bottom: 20px;
+
         img {
           width: 166px;
           height: 166px;
           border-radius: 16px;
           margin-right: 20px;
         }
+
         .type {
           position: absolute;
           left: 32px;
@@ -183,18 +195,23 @@ export default {
           font-family: PingFangSC-Regular;
           font-size: 18px;
           color: #FFF;
+
           p {
             scale: 0.9;
           }
         }
+
         .type1 {
           background-color: #E64E39;
         }
+
         .type0 {
           background-color: #FF6900;
         }
+
         .flex-right {
           width: calc(100% - 186px);
+
           p {
             word-break: break-all;
             font-family: PingFangSC-Regular;
@@ -210,8 +227,10 @@ export default {
             -webkit-box-orient: vertical;
             margin-bottom: 50px;
           }
+
           .num-flex {
             display: flex;
+
             h3 {
               width: calc(100% - 100px);
               font-family: PingFangSC-SNaNpxibold;
@@ -219,6 +238,7 @@ export default {
               font-size: 34px;
               color: #FF6900;
               line-height: 48px;
+
               span {
                 display: inline-block;
                 font-size: 34px;
@@ -226,6 +246,7 @@ export default {
                 margin-left: 8px;
               }
             }
+
             div {
               width: 100px;
               text-align: right;
@@ -239,6 +260,7 @@ export default {
 
         }
       }
+
       .tips {
         display: inline-block;
         padding: 12px;
@@ -249,11 +271,13 @@ export default {
         font-size: 24px;
         color: #3BBC37;
         margin: 0 32px 16px 32px;
+
         span {
           display: inline-block;
           scale: 0.9;
         }
       }
+
       .remark {
         font-family: PingFangSC-Regular;
         font-size: 24px;
@@ -262,16 +286,19 @@ export default {
         word-break: break-all;
         margin: 0 32px 24px 32px;
       }
+
       .flex-btn {
         padding: 0 32px 32px;
         display: flex;
         justify-content: space-between;
+
         p {
           height: 56px;
           line-height: 56px;
           font-family: PingFangSC-Regular;
           font-size: 24px;
           color: #666;
+
           span {
             display: inline-block;
             font-family: PingFangSC-SNaNpxibold;
@@ -281,6 +308,7 @@ export default {
             margin-left: 8px;
           }
         }
+
         .btn {
           width: 136px;
           text-align: center;
@@ -291,6 +319,7 @@ export default {
           font-size: 22px;
           color: #666;
         }
+
         .confirm {
           border: 1px solid #2D7DFF;
           background-color: #2D7DFF;
@@ -299,6 +328,7 @@ export default {
       }
     }
   }
+
   .pad-t112 {
     padding-top: 112px;
   }