From d9c696af233deb198cf401dc54b5ac1f323f55c6 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Fri, 11 Oct 2024 21:49:07 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A2445=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=9C=AA=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=9A=84=E5=BE=85=E8=AF=84=E4=BB=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=9A=84=E3=80=90=E7=94=B3=E8=AF=B7=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E3=80=91=E6=8C=89=E9=92=AE=E4=BB=8D=E7=84=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=80=E6=AC=BE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 3cba9e9..ea32a0e 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -10,7 +10,7 @@
         <view class="state v12-primary-text v12-font-32 v12-font-bold" v-else>{{ getStatus(orderInfo) }}</view>
         <view v-if="getStatus(orderInfo)!=='待付款'" class="v12-mt-2 v12-font-24 v12-secondary-dark-text" :class="{'fails-bg': orderInfo._status._type == -3}">
           <view>{{ orderInfo._status._msg }}</view>
-          <view>驳回原因: {{ orderInfo.refundReasonWap }}</view>
+          <view v-if="orderInfo._status._type == -3">驳回原因: {{ orderInfo.refundReasonWap }}</view>
         </view>
         <view class="pending-payments flex ai-center v12-mt-2 v12-font-24 v12-secondary-dark-text" v-else>
           <text>需支付{{ orderInfo.payPrice }}元，</text>
@@ -347,7 +347,7 @@
           <view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
           <view class="v12-justify-between">
             <view class="" style="position: relative">
-              <text class="btn-more v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
+              <view class="btn-more v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</view>
               <view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}">
                 <view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view>
                 <view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
@@ -549,7 +549,7 @@ export default {
     copyClipboard,
     handleBody() {
       this.showMore = false
-      this.$forceUpdate()
+      // this.$forceUpdate()
     },
     getExpressInfo() {
       let params = {
@@ -729,12 +729,21 @@ export default {
       })
     },
     goGoodsReturn(orderInfo) {
-      this.$yrouter.push({
-        path: "/pages/order/GoodsReturn/index",
-        query: {
-          id: orderInfo.orderId
-        }
-      });
+      if(orderInfo.refundSystemStatus === 0) {
+        uni.showToast({
+          title: '订单已收货，如需退款请联系商家',
+          mask: false,
+          icon: 'none',
+          duration: 3000
+        })
+      } else {
+        this.$yrouter.push({
+          path: "/pages/order/GoodsReturn/index",
+          query: {
+            id: orderInfo.orderId
+          }
+        });
+      }
     },
     goGroupRule(orderInfo) {
       this.$yrouter.push({