From 48c7030c0e88c343a708ba6970b95b605ea5430a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 3 Nov 2021 11:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/afterSales/afterSales.vue | 48 ++++++++++++++++-----------
 pages/order/myOrder.vue               |  2 +-
 pages/passport/login.vue              |  8 ++---
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index 7526c3e..01bd547 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -1,10 +1,12 @@
 <template>
   <view class="content">
     <view class="u-tabs-box">
-      <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change" :active-color="$lightColor"></u-tabs>
+      <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"
+        :active-color="$lightColor"></u-tabs>
     </view>
     <div class="u-tabs-search">
-      <u-search placeholder="请输入订单编号" @search="handleGetOrderList(current)" @clear="handleGetOrderList(current)" @custom="handleGetOrderList(current)" v-model="params.orderSn"></u-search>
+      <u-search placeholder="请输入订单编号" @search="handleGetOrderList(current)" @clear="handleGetOrderList(current)"
+        @custom="handleGetOrderList(current)" v-model="params.orderSn"></u-search>
     </div>
     <scroll-view class="body-view" scroll-y @scrolltolower="renderDate">
       <view class="seller-view" v-for="(order, orderIndex) in orderList" :key="orderIndex">
@@ -40,31 +42,38 @@
             <view class="description">
               <!-- 售后申请 -->
               <view v-if="
-                  current === 0 && order.groupAfterSaleStatus &&
-                  order.groupAfterSaleStatus === 'ALREADY_APPLIED'
+                  current === 0 &&  order.groupAfterSaleStatus &&
+                 order.groupAfterSaleStatus.includes('ALREADY_APPLIED') 
                 " class="cannot_apply">
                 <u-icon class="icon" name="info-circle-fill"></u-icon>
                 该商品已申请售后服务
               </view>
-              <view class="cannot_apply" v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus === 'EXPIRED'" @click="tipsShow = true">
+              <view class="cannot_apply"
+                v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('EXPIRED')  "
+                @click="tipsShow = true">
                 <u-icon class="icon" name="info-circle-fill"></u-icon>
                 该商品无法申请售后
               </view>
 
               <div v-if="current === 1 || current === 2">
                 <!-- 申请中 -->
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_GOODS'">退货处理-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'">补发商品-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_MONEY'">退款-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'EXCHANGE_GOODS'">换货-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'CANCEL'">取消订单-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_GOODS'">
+                  退货处理-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'">
+                  补发商品-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_MONEY'">
+                  退款-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'EXCHANGE_GOODS'">
+                  换货-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'CANCEL'">
+                  取消订单-{{ order.serviceStatus | serviceStatusList  }}</view>
               </div>
               <!-- 申请记录 -->
             </view>
             <view class="after-line">
               <!-- 售后申请 -->
               <view v-if="
-                  current === 0 && order.groupAfterSaleStatus=='NOT_APPLIED'
+                  current === 0 && order.groupAfterSaleStatus.includes('NOT_APPLIED')
                 " @click="applyService(sku.sn, order, sku)" class="rebuy-btn">
                 申请售后
               </view>
@@ -276,19 +285,20 @@ export default {
     /**
      * 查看详情
      */
-    onDetail(goods,sku) {
+    onDetail(goods, sku) {
       // 售后申请
-      if(this.current == 0){
+      if (this.current == 0) {
         uni.navigateTo({
-          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId || sku.goodsId}`,
+          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${
+            sku.goodsId || sku.goodsId
+          }`,
         });
-      }
-      
-      else{
+      } else {
         uni.navigateTo({
-          url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId || goods.goodsId}`,
+          url: `/pages/product/goods?id=${goods.skuId}&goodsId=${
+            goods.goodsId || goods.goodsId
+          }`,
         });
-     
       }
     },
 
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index a0caf53..0f996f1 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -57,7 +57,7 @@
                   <u-button ripple :customStyle="{'background':lightColor,'color':'#fff' }" shape="circle" class="pay-btn" size="mini" v-if="order.allowOperationVO.rog" @click="onRog(order.sn)">
                     确认收货
                   </u-button>
-                  <u-button ripple shape="circle" class="cancel-btn" size="mini" v-if="order.groupAfterSaleStatus=='NOT_APPLIED'" @click="applyService(order)">
+                  <u-button ripple shape="circle" class="cancel-btn" size="mini" v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyService(order)">
                     退款/售后
                   </u-button>
                   <!-- TODO 后续完善 -->
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 3b3d263..b4de3e8 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -27,7 +27,7 @@
           boxNormalColor="#D8D8D8" cursorColor="#D8D8D8" />
 
         <div class="fetch-btn">
-          <u-verification-code change-text="验证码已发送（x）" end-text="重新获取验证码" keep-running unique-key="page-login"
+          <u-verification-code change-text="验证码已发送（x）" end-text="重新获取验证码"  unique-key="page-login"
             :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
           <span @tap="fetchCode" :style="{color:codeColor}"> {{tips}}</span>
         </div>
@@ -136,6 +136,8 @@ export default {
     }
     //#endif
   },
+  
+
   mounted() {
     // #ifndef APP-PLUS
     //判断是否微信浏览器
@@ -143,7 +145,7 @@ export default {
     if (ua.match(/MicroMessenger/i) == "micromessenger") {
       this.wechatLogin = true;
       return;
-    } 
+    }
     // #endif
     /**
      * 条件编译判断当前客户端类型
@@ -532,8 +534,6 @@ export default {
           title: "加载中",
         });
         if (!this.codeFlag) {
-          this.codeFlag = true;
-
           let timer = setInterval(() => {
             if (this.$refs.verification) {
               this.$refs.verification.error(); //发送