From 8e66c24ff9c1ceed65435a3c932afd6ac2fd1390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 26 Apr 2022 15:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=A4=E6=96=AD=20=E4=BF=AE=E6=94=B9=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=83=A8=E5=88=86=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         |   4 +-
 pages/order/afterSales/afterSales.vue | 145 +++++++++++++++-----------
 pages/order/myOrder.vue               |   2 +-
 pages/promotion/lives.vue             |   8 +-
 4 files changed, 90 insertions(+), 69 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8bc9ebd..6973972 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.2.4.1",
-    "versionCode" : 4000241,
+    "versionName" : "4.2.5",
+    "versionCode" : 4000250,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index f7e71ca..15b41c4 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -17,7 +17,8 @@
         @clear="submitSearchOrderList(current)"
         @custom="submitSearchOrderList(current)"
         v-model="orderSn"
-      ></u-search>
+      >
+      </u-search>
     </div>
     <scroll-view class="body-view" scroll-y @scrolltolower="renderDate">
       <view
@@ -60,78 +61,77 @@
               <view>x{{ sku.num }}</view>
             </view>
           </view>
-          <view class="btn-view u-flex u-row-between">
-            <view class="description">
-              <!-- 售后申请 -->
+          <view class="description">
+            <!-- 售后申请  -->
+            <view v-if="current === 0 && order.groupAfterSaleStatus">
               <view
-                v-if="
-                  current === 0 &&
-                  order.groupAfterSaleStatus &&
-                  order.groupAfterSaleStatus.includes('ALREADY_APPLIED')
-                "
-                class="cannot_apply"
+                v-if="order.groupAfterSaleStatus.includes('ALREADY_APPLIED')"
+                class="cannot_apply not_center"
               >
                 <u-icon class="icon" name="info-circle-fill"></u-icon>
                 该商品已申请售后服务
               </view>
+            </view>
+            <view v-if="current === 0 && order.groupAfterSaleStatus">
               <view
-                class="cannot_apply"
-                v-if="
-                  current === 0 &&
-                  order.groupAfterSaleStatus &&
-                  order.groupAfterSaleStatus.includes('EXPIRED')
-                "
+                v-if="order.groupAfterSaleStatus.includes('EXPIRED')"
+                class="cannot_apply not_center"
                 @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
-                >
-              </div>
-
-              <!-- 申请记录 -->
             </view>
-            <!-- 售后申请 -->
-            <div
-              v-if="
-                current === 0 &&
-                sku.afterSaleStatus &&
-                (sku.afterSaleStatus.includes('NOT_APPLIED') ||
-                  sku.afterSaleStatus.includes('PART_AFTER_SALE'))
-              "
-              @click="applyService(sku.sn, order, sku)"
-              class="sale"
-            >
-              <view class="default-btn border"> 申请售后 </view>
+
+            <div v-if="current === 1 || current === 2">
+              <!-- 申请中 -->
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'RETURN_GOODS'"
+              >
+                退货处理-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'"
+              >
+                补发商品-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'RETURN_MONEY'"
+              >
+                退款-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'EXCHANGE_GOODS'"
+              >
+                换货-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'CANCEL'"
+              >
+                取消订单-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+            </div>
+
+            <!-- 申请记录 -->
+          </view>
+          <view class="btn-view u-flex u-row-right">
+            <!-- 售后申请  -->
+
+            <div class="sale" v-if="current === 0 && sku.afterSaleStatus">
+              <div
+                v-if="
+                  sku.afterSaleStatus.includes('NOT_APPLIED') ||
+                  sku.afterSaleStatus.includes('PART_AFTER_SALE')
+                "
+                @click="applyService(sku.sn, order, sku)"
+              >
+                <view class="default-btn border"> 申请售后 </view>
+              </div>
             </div>
             <view class="after-line">
               <!-- 申请中 -->
@@ -229,7 +229,7 @@ export default {
         pageNumber: 1,
         pageSize: 10,
         sort: "createTime",
-        flowPrice: 1,
+        flowPrice: 0,
         order: "desc",
       },
 
@@ -404,6 +404,10 @@ export default {
      */
     onExpress(order, sku) {
       sku.storeName = order.storeName;
+      let data = {
+        ...order,
+        ...sku,
+      };
 
       storage.setAfterSaleData(data);
       uni.navigateTo({
@@ -458,31 +462,38 @@ page,
   overflow-y: auto;
   height: calc(100vh - 44px - 80rpx - 104rpx);
 }
+
 .u-tabs-search {
   padding: 20rpx;
   background: #fff;
 }
+
 .countMoney {
   margin-left: 7rpx;
   color: $main-color;
   font-size: 28rpx;
 }
+
 .seller-view {
   background-color: #fff;
   margin: 20rpx 0rpx;
   padding: 0rpx 20rpx;
   border-radius: 20rpx;
+
   .seller-info {
     height: 70rpx;
+
     .seller-name {
       font-size: 28rpx;
       display: flex;
       flex-direction: row;
+
       .name {
         margin-left: 15rpx;
         margin-top: -2rpx;
       }
     }
+
     .order-sn {
       font-size: 22rpx;
       color: #909399;
@@ -526,6 +537,7 @@ page,
       color: $main-color;
     }
   }
+
   .btn-view {
     padding: 16rpx 0;
 
@@ -535,10 +547,12 @@ page,
     }
   }
 }
+
 .description {
   color: #909399;
   size: 25rpx;
 }
+
 .cannot_apply {
   text-align: center;
   font-size: 22rpx;
@@ -547,6 +561,10 @@ page,
   height: 70rpx;
   line-height: 70rpx;
 }
+.not_center {
+  text-align: left;
+}
+
 .icon {
   margin-right: 10rpx;
 }
@@ -556,6 +574,7 @@ page,
   display: flex;
   justify-content: flex-end;
 }
+
 .default-btn {
   background-color: #ffffff;
   margin-left: 15rpx;
@@ -566,9 +585,11 @@ page,
   padding: 0 24rpx;
   border-radius: 200px;
 }
+
 .close {
   color: $light-color;
 }
+
 .border {
   border: 2rpx solid $light-color;
   color: $light-color;
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index fccdc14..88cae7e 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -139,7 +139,7 @@
                     shape="circle"
                     class="cancel-btn"
                     size="mini"
-                    v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')"
+                    v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')"
                     @click="applyService(order)"
                   >
                     退款/售后
diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue
index bda1fa3..bd0a728 100644
--- a/pages/promotion/lives.vue
+++ b/pages/promotion/lives.vue
@@ -159,7 +159,7 @@ export default {
       let recommendLives = await getLiveList(this.recommendParams);
       if (recommendLives.data.success) {
         // 推荐直播间
-        if (recommendLives.data.result.records.length != 0) {
+        if (recommendLives.data.result.records.length ) {
           this.status = "loadmore";
           this.recommendLives = recommendLives.data.result.records;
         } else {
@@ -172,7 +172,7 @@ export default {
          * 2.如果没有直播间设置一个默认图片
          */
 
-        if (this.recommendLives.length == 0) {
+        if (!this.recommendLives.length) {
           if (this.liveList[0].shareImg) {
             this.$set(this, "swiperImg", [
               {
@@ -199,7 +199,7 @@ export default {
       let res = await getLiveList(this.params[this.current]);
       // 直播间
       if (res.data.success) {
-        if (res.data.result.records.length != 0) {
+        if (res.data.result.records.length ) {
           this.status = "loadmore";
           this.liveList.push(...res.data.result.records);
         } else {
@@ -211,7 +211,7 @@ export default {
           ? (this.status = "loadmore")
           : (this.status = "noMore");
 
-        console.log(this.status);
+      
         this.liveList.forEach((item) => {
           if (item.roomGoodsList) {
             item.roomGoodsList = JSON.parse(item.roomGoodsList);