From 506cc6053d589a8862ab6fd307378f84e1f05274 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 20 Sep 2024 11:37:15 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8--=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=88=A0=E9=99=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E2=80=9D=E9=94=AE=EF=BC=8C=E5=8F=AA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AF=A5=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=AE=A2=E5=8D=95=E8=AE=B0=E5=BD=95=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 76588f1..d2704df 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -117,9 +117,12 @@
           </view>
           <template v-else>
             <view class="v12-justify-between" style="width: 100%">
-              <view class="bnt service" @click="goRoom(order)" v-if="order.merName && order._status._type != 0">联系商家</view>
+              <view>
+                <view class="bnt service" @click="goRoom(order)" v-if="order.merName && order._status._type != 0 && Number(order._status._type) !== 9">联系商家</view>
+              </view>
               <view class="v12-justify-between">
                 <view class="bnt service" @click="goOrderDetails(order)" v-if="['-1','-2','-3'].includes(order._status._type)">查看详情</view>
+                <view class="bnt service" @click="delOrder(order)" v-if="['9'].includes(order._status._type)">删除订单</view>
                 <!-- <view class="bnt v12-primary-text v12-primary-border" @click="takeOrder(order)" v-if="['-2','-3'].includes(order._status._type)">确认收货</view> -->
               </view>
             </view>
@@ -132,7 +135,7 @@
               <view class="bnt cancelBnt v12-dark-text v12-dark-border" @click="addressTap(order)">修改地址</view>
               <view class="bnt bg-color-lightred  v12-white v12-primary-text v12-primary-border v12-radius-40" @click="subscribePay(order)">立即付款</view>
             </template>
-            <template v-if="(order._status._type == 1 || order._status._type == 9) && order.isTickets==0">
+            <template v-if="(order._status._type == 1 ) && order.isTickets==0">
               <view class="bnt bg-color-lightred v12-white v12-primary-text v12-primary-border v12-radius-40" @click="goOrderDetails(order)">查看详情</view>
             </template>
             <template v-if="order._status._type == 1 && order.isTickets == 1">
@@ -186,8 +189,8 @@
 </template>
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
-import {getOrderData, getOrderList, orderDelay, editAddress} from "@/api/order";
-import {cancelOrderHandle, payOrderHandle, takeOrderHandle, yuePayOrderHandle} from "@/libs/order";
+import {getOrderData, getOrderList, orderDelay, editAddress } from "@/api/order";
+import {cancelOrderHandle, payOrderHandle, takeOrderHandle, yuePayOrderHandle, delOrderHandle} from "@/libs/order";
 import Loading from "@/components/Loading";
 import Payment from "@/components/Payment";
 import {mapGetters} from "vuex";
@@ -306,6 +309,14 @@ export default {
     }
   },
   methods: {
+    delOrder(order) {
+      delOrderHandle(order.orderId).then(() => {
+        // this.goBack()
+        this.page = 1
+        this.orderList = [];
+        this.getOrderListReq()
+      })
+    },
     goStore(order) {
       if(!order.hotelId) {
         uni.showToast({