From 89582d28a45af3a8a55e38b02133c1548c2857d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sat, 18 Mar 2023 23:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/action.vue | 31 ++++++++++++++++++++++---------
 src/core/models/order.js        |  1 +
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/order/action.vue b/src/components/order/action.vue
index 1c07afa..08a76c5 100644
--- a/src/components/order/action.vue
+++ b/src/components/order/action.vue
@@ -8,17 +8,17 @@
                 </view>
             </block>
             <block v-if="order.state == 1">
-                <view class="btn" @click.stop="cancelOrder">
+                <!-- <view class="btn" @click.stop="cancelOrder">
                     <text>取消订单</text>
-                </view>
+                </view> -->
             </block>
         </block>
         <!-- 报/议价 -->
         <block v-if="order.listType == 't2'">
             <block v-if="order.state == 0">
-                <view class="btn" @click.stop="cancelOrder">
+                <!-- <view class="btn" @click.stop="cancelOrder">
                     <text>取消订单</text>
-                </view>
+                </view> -->
             </block>
             <block v-if="order.state == 1">
                 <view class="btn" @click.stop="payOrder">
@@ -49,8 +49,13 @@
                 </view>
             </block>
             <block v-if="order.state == 7">
-                <view class="btn" @click.stop="cancelRefund">
+                <!-- <view class="btn" @click.stop="cancelRefund">
                     <text>取消申请</text>
+                </view> -->
+            </block>
+            <block v-if="order.state == 8">
+                <view class="btn normal">
+                    <text>已退款</text>
                 </view>
             </block>
             <block v-if="order.state == 9">
@@ -67,9 +72,9 @@
                 </view>
             </block>
             <block v-if="order.state == 1">
-                <view class="btn" @click.stop="cancelOrder">
+                <!-- <view class="btn" @click.stop="cancelOrder">
                     <text>取消订单</text>
-                </view>
+                </view> -->
             </block>
             <block v-if="order.state == 2 || order.state == 3">
                 <view class="btn" @click.stop="finishOrder">
@@ -160,7 +165,7 @@ export default {
          * 评价
          */
         appraiseOrder() {
-            this.$utils.toPage("/pages/worker/appraise?id=" + this.order.worker.id);
+            this.$utils.toast("敬请期待");
         },
         /**
          * 退款
@@ -185,7 +190,12 @@ export default {
          * 查看未通过原因
          */
         showReason() {
-            this.$utils.toPage("/pages/order/refund?type=reason&id=" + this.order.worker.id);
+            uni.showModal({
+                title: "驳回原因",
+                content: this.order.rejectDesc,
+                showCancel: false,
+            });
+            // this.$utils.toPage("/pages/order/refund?type=reason&id=" + this.order.worker.id);
         },
     },
 };
@@ -212,6 +222,9 @@ export default {
         color: #666666;
         line-height: 26rpx;
     }
+    .btn.normal {
+        border: 0;
+    }
     .btn.active {
         color: #666666;
     }
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 2f9e00f..c7157a8 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -105,6 +105,7 @@ export default {
                                 orderType: item.types,
                                 price: item.money,
                                 state: item.status,
+                                rejectDesc: item.backdesc,
                                 workerList: [],
                             };
                             // 尾款