From 1fad8d3f814a9762aee04df1b74bbbd6b0439d00 Mon Sep 17 00:00:00 2001
From: wtq <2394975549@qq.com>
Date: Sat, 28 Feb 2026 09:39:47 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84bug'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/orderPage/index.js                   | 44 +++++++++++--------
 src/pagesOrders/my-order/index.vue            |  3 +-
 .../orderCmp/order-cell/order-cell.vue        |  1 +
 src/store/indexPage/actions.js                |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/apis/orderPage/index.js b/src/apis/orderPage/index.js
index 7cea581..2050202 100644
--- a/src/apis/orderPage/index.js
+++ b/src/apis/orderPage/index.js
@@ -351,25 +351,33 @@ export default {
         //   console.error('BuyerCancelOrder', e)
         //   throw e
         // }
-        if(store.getters['indexPage/isMaterial']){
-            logInfo({
-                rootUrl:'https://wx.jxc4.com/',
-                url: 'v2/order/CancelOrder',
-                params: json,
-                // time: endTime - startTime,
-                token:uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
-                // data: JSON.stringify(json)
-                data: order ? JSON.stringify(order) : '',
-                status:'被阻止调用了'
-            })
-            return
-        }
+        // if(store.getters['indexPage/isMaterial']){
+        //     logInfo({
+        //         rootUrl:'https://wx.jxc4.com/',
+        //         url: 'v2/order/CancelOrder',
+        //         params: json,
+        //         // time: endTime - startTime,
+        //         token:uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
+        //         // data: JSON.stringify(json)
+        //         data: order ? JSON.stringify(order) : '',
+        //         status:'被阻止调用了'
+        //     })
+        //     return
+        // }
+           
         try {
-            let res = await api('v2/order/CancelOrder', {
-                method: 'PUT',
-                data: json
-            })
-            return res
+            // 取消前先查看订单的状态
+            let res = await api('v2/jxorder/GetMyOrders', {data: {vendorOrderID:json.vendorOrderID}})
+            if(res.data.length === 1 && res.data[0].vendorOrderID === json.vendorOrderID){
+                //  console.log('取消前先查看订单的状态',res.data[0].status)
+                 if(res.data[0].status === 2){
+                    let res = await api('v2/order/CancelOrder', {
+                        method: 'PUT',
+                        data: json
+                    })
+                    return res
+                 }
+            }
         } catch (e) {
             console.error('buyerCancelOrder', e)
             throw (e)
diff --git a/src/pagesOrders/my-order/index.vue b/src/pagesOrders/my-order/index.vue
index 669e920..3ef4e7d 100644
--- a/src/pagesOrders/my-order/index.vue
+++ b/src/pagesOrders/my-order/index.vue
@@ -179,6 +179,7 @@ export default {
     async refreshPage() {
       try {
         this.showLoad()
+        this.orderList = []
         // 请求订单数量
         await this.handleGetOrderCount()
         // 请求订单
@@ -291,7 +292,7 @@ export default {
             payInfo.prepayID,
             JSON.parse(payInfo.codeURL),
             payInfo,
-            {merCupNo:this.storeLklMerchant.merchantNo2 || ""}
+            {merCupNo:this.storeLklMerchant ? this.storeLklMerchant.merchantNo2 || "" : ''}
           )
           // #endif
 
diff --git a/src/pagesOrders/orderCmp/order-cell/order-cell.vue b/src/pagesOrders/orderCmp/order-cell/order-cell.vue
index 9b8b6be..24b4199 100644
--- a/src/pagesOrders/orderCmp/order-cell/order-cell.vue
+++ b/src/pagesOrders/orderCmp/order-cell/order-cell.vue
@@ -104,6 +104,7 @@ export default {
           })
           // 取消完订单后通知父组件刷新页面
           this.$emit('refreshPage')
+          if(this.timer) clearInterval(this.timer)
         }
         return '已超时'
       } else {
diff --git a/src/store/indexPage/actions.js b/src/store/indexPage/actions.js
index 4ea9fc7..32cb304 100644
--- a/src/store/indexPage/actions.js
+++ b/src/store/indexPage/actions.js
@@ -70,7 +70,7 @@ export default {
 
             // #ifdef MP-WEIXIN
             // 存储来自哪的信息
-            if (res && res.stores.length !== 0) {
+            if (res && res.stores && res.stores.length !== 0) {
                 let obj = {
                     ...state.materialInfo,
                     fromStoreInfo: res.stores[0]           // 来自哪里的信息