From abd8ac4775cd1a1b8f5b3e13a9f99cb5e3f17506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Thu, 30 Mar 2023 21:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/action.vue | 49 ++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/components/order/action.vue b/src/components/order/action.vue
index 7147517..cea113d 100644
--- a/src/components/order/action.vue
+++ b/src/components/order/action.vue
@@ -15,16 +15,16 @@
         </block>
         <!-- 报/议价 -->
         <block v-if="order.listType == 't2'">
-            <block v-if="order.state == 0">
-                <view class="btn" @click.stop="cancelOrder">
-                    <text>取消订单</text>
-                </view>
-            </block>
             <block v-if="order.state == 1">
                 <view class="btn" @click.stop="payOrder">
                     <text>立即支付</text>
                 </view>
             </block>
+            <block v-if="order.state == 0 || order.state == 1">
+                <view class="btn" @click.stop="cancelOrder">
+                    <text>取消订单</text>
+                </view>
+            </block>
         </block>
         <!-- 购买、报/议价公共操作 -->
         <block v-if="order.listType == 't1' || order.listType == 't2'">
@@ -54,9 +54,6 @@
                 </view>
             </block>
             <block v-if="order.state == 7">
-                <!-- <view class="btn" @click.stop="cancelRefund">
-                    <text>取消申请</text>
-                </view> -->
                 <view class="btn normal">
                     <text>请等待审核</text>
                 </view>
@@ -71,6 +68,11 @@
                     <text>查看未通过原因</text>
                 </view>
             </block>
+            <block v-if="order.state == 6 || order.state == 8 || order.state == 9">
+                <!-- <view class="del" @click.stop="deleteOrder">
+                    <text class="iconfont icon-shanchu"></text>
+                </view> -->
+            </block>
         </block>
         <!-- 货运 -->
         <block v-if="order.listType == 't3'">
@@ -79,16 +81,24 @@
                     <text>立即支付</text>
                 </view>
             </block>
-            <block v-if="order.state == 1">
+            <block v-if="order.state == 0 || order.state == 1">
                 <view class="btn" @click.stop="cancelOrder">
                     <text>取消订单</text>
                 </view>
             </block>
-            <block v-if="order.state == 2 || order.state == 3">
+            <block v-if="order.state == 2">
                 <view class="btn" @click.stop="finishOrder">
                     <text>确认完成</text>
                 </view>
             </block>
+            <block v-if="order.state == 3">
+                <view class="btn normal">
+                    <text>已完成</text>
+                </view>
+                <!-- <view class="del" @click.stop="deleteOrder">
+                    <text class="iconfont icon-shanchu"></text>
+                </view> -->
+            </block>
         </block>
     </view>
 </template>
@@ -182,6 +192,19 @@ export default {
                     });
                 });
         },
+        /**
+         * 删除订单
+         */
+        deleteOrder() {
+            console.log(this.order.id);
+            let pages = getCurrentPages();
+            if (pages[pages.length - 1].route == "pages/order/detail") {
+                this.$store.commit("system/refreshOrder", true);
+                this.$utils.toPage("", "", "back");
+            } else {
+                this.$emit("refresh");
+            }
+        },
         /**
          * 评价
          */
@@ -202,12 +225,6 @@ export default {
             );
             this.$utils.toPage("/pages/order/refund?list=" + this.order.listType + "&order=" + order);
         },
-        /**
-         * 取消退款
-         */
-        cancelRefund() {
-            this.$emit("cancelRefund");
-        },
         /**
          * 查看未通过原因
          */