From aae15d1ed09271cdb8598ac59895c5907147a0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Tue, 28 Mar 2023 21:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/action.vue | 20 ++++++++++++++++----
 src/core/apis.js                | 15 +++++++++++++++
 src/core/models/order.js        | 13 +++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/components/order/action.vue b/src/components/order/action.vue
index 05a9ec2..4c2b58f 100644
--- a/src/components/order/action.vue
+++ b/src/components/order/action.vue
@@ -7,7 +7,7 @@
                     <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>
@@ -159,13 +159,26 @@ export default {
          * 取消订单
          */
         cancelOrder() {
-            this.$emit("cancelOrder");
+            this.$models.order
+                .cancelOrder({
+                    request: {
+                        api: "order.cancel." + this.order.listType,
+                        data: {
+                            id: this.order.id,
+                        },
+                    },
+                })
+                .then((response) => {
+                    this.$utils.toast(response.msg).then(() => {
+                        this.$emit("refresh");
+                    });
+                });
         },
         /**
          * 评价
          */
         appraiseOrder() {
-            this.$utils.toast("敬请期待");
+            this.$utils.toPage("/pages/worker/appraise?id=" + this.order.id + "&orderId=" + this.order.orderId);
         },
         /**
          * 退款
@@ -195,7 +208,6 @@ export default {
                 content: this.order.rejectDesc,
                 showCancel: false,
             });
-            // this.$utils.toPage("/pages/order/refund?type=reason&id=" + this.order.worker.id);
         },
     },
 };
diff --git a/src/core/apis.js b/src/core/apis.js
index 4e325b8..e98d60f 100644
--- a/src/core/apis.js
+++ b/src/core/apis.js
@@ -251,6 +251,21 @@ export default {
                 url: ""
             },
         },
+        cancel: {
+            t1: {
+                url: "/wxapp/order/cancelorder",
+                showLoading: true,
+                auth: true,
+            },
+            t2: {
+                url: "/wxapp/orderb/cancelorder",
+                showLoading: true,
+                auth: true,
+            },
+            t3: {
+                url: ""
+            }
+        },
         chooseWorker: {
             url: "/wxapp/orderb/chooseshifu",
             showLoading: true,
diff --git a/src/core/models/order.js b/src/core/models/order.js
index b73372e..24414af 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -303,6 +303,19 @@ export default {
             }).catch(e => { });
         });
     },
+    /**
+     * 取消订单
+     */
+    cancelOrder(options) {
+        return new Promise((resolve, reject) => {
+            prototype.$request(options.request).then((response) => {
+                if (response.code == 1) {
+                    return resolve(response);
+                }
+                return reject(response.msg);
+            }).catch(e => { });
+        });
+    },
     /**
      * 退款
      */