From e452f7cb19b5a23a259f829b87888dd410682e4d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 18 Aug 2023 19:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E3=80=91=201?=
 =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=85=A5=E9=80=80=E6=AC=BE=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderGoods/index.vue | 29 +++++++++++++++++++++++++----
 pages/order_details/index.vue   | 18 +++++++-----------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 8c7b81dd..9606e282 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -18,10 +18,16 @@
             </text>
           </view>
 					<view class='money font-color'>￥{{ fen2yuan(item.price) }}</view>
+          <!-- 售后状态 -->
+          <!-- TODO 芋艿：这样式不太合理；应该顺着向右对齐 -->
+          <view class="evaluate" style="right: 60px;" v-if="afterSale" @click.stop="afterSaleTap(item)">
+            {{
+              item.afterSaleStatus === 0 ? '申请退款' :
+                item.afterSaleStatus === 10 ? '退款中' : '退款成功'
+            }}
+          </view>
           <!-- 评价状态 -->
-					<view class='evaluate' v-if='item.commentStatus === false && evaluate === 2' @click.stop="evaluateTap(item)">
-            评价
-					</view>
+					<view class='evaluate' v-if='item.commentStatus === false && evaluate === 2' @click.stop="evaluateTap(item)">评价</view>
 					<view class='evaluate' v-else-if="item.replyStatus === true">已评价</view>
 				</view>
 			</view>
@@ -36,6 +42,10 @@
 				type: Number,
 				default: 0, // 是否开启评价功能 0 - 不开启；2 - 开启
 			},
+      afterSale: { // 是否开启售后功能
+        type: Boolean,
+        default: false,
+      },
 			cartInfo: {
 				type: Array,
 				default: function() {
@@ -68,7 +78,7 @@
 				nVal.forEach((item, index) => {
 					num += item.count
 				})
-				this.totalNmu = num
+				this.totalNmu =  num
 			}
 		},
 		methods: {
@@ -77,6 +87,17 @@
 					url: "/pages/users/goods_comment_con/index?orderItemId=" + item.id
 				})
 			},
+      afterSaleTap(item) {
+        if (item.afterSaleStatus === 0) {
+          uni.navigateTo({
+            url: "/pages/users/goods_return/index?orderId=" + item.orderId + '&orderItemId=' + item.id
+          })
+          return;
+        }
+        uni.navigateTo({
+          url: "/pages/users/user_return_detail/index?id=" + item.afterSaleId
+        })
+      },
 			jumpCon: function(id) {
 				let type = this.productType === 0 ?'normal':'video'
 				if (this.jump) {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 5bc4d76d..f6026507 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -122,6 +122,7 @@
         <!-- 商品列表 -->
 				<orderGoods
           :evaluate='evaluate'
+          :afterSale="afterSale"
           :productType="orderInfo.type"
           :orderId="order_id"
           :cartInfo="cartInfo"
@@ -235,17 +236,6 @@
 					<view class='bnt bg-color' v-if="orderInfo.status === 0" @tap='goPay'>
             立即付款
           </view>
-          <!-- TODO 芋艿：退款各种 -->
-          <!-- #ifdef MP -->
-					<view @tap="openSubcribe('/pages/users/goods_return/index?orderId='+orderInfo.orderId)"
-						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
-					</view>
-					<!-- #endif -->
-					<!-- #ifndef MP -->
-					<navigator hover-class="none" :url="'/pages/users/goods_return/index?orderId='+orderInfo.orderId"
-						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
-					</navigator>
-					<!-- #endif -->
           <!-- TODO 芋艿：拼团 -->
           <view class='bnt bg-color' v-if="orderInfo.combinationId > 0" @tap='goJoinPink'>查看拼团</view>
           <navigator class='bnt cancel' v-if="orderInfo.logisticsId > 0"
@@ -295,7 +285,9 @@
           systemStore: {},
         },
         cartInfo: [], // 购物车产品
+
         evaluate: 0, // 是否开启评论，和订单状态有关
+        afterSale: false, // 是否开启售后
 
         // ========== 门店自提（核销） ==========
         system_store: {}, // 门店信息
@@ -359,6 +351,10 @@
 
           // 如果已完成，且未评论，则设置 evaluate 为 2，开启评论功能
           this.$set(this, 'evaluate', res.data.status === 30 && !res.data.commentStatus ? 2 : 0);
+          //  如果满足指定状态，则开启售后按钮
+          if ([10, 20, 30].includes(res.data.status)) {
+            this.$set(this, 'afterSale', true);
+          }
 
           // 配送方式：门店自提
           if (res.data.pickUpStoreId) {