From eadae8814dc4a1b6f8cbd98daf0bfbc0c2cac892 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 15:31:56 +0800
Subject: [PATCH] 我的订单页面相关问题

---
 pages/order/myOrder.vue |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index e808a50..7e00d25 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -101,8 +101,19 @@
                     @click="waitPay(order)"
                     >绔嬪嵆浠樻</view
                   >
+				  <!-- 鏂板锛氫紭鎯犲埜鍗″寘鎸夐挳 -->
+				  <view
+				    ripple
+				    shape="circle"
+				    class="cancel-btn"
+				    size="mini"
+					v-if="order.couponFlag === 'COUPON'&& order.orderStatus ==='COMPLETED'"
+				    @click="openCouponPackage(order)"
+				  >
+				    浼樻儬鍒稿崱鍖�
+				  </view>
                   <!-- 鍙栨秷璁㈠崟 -->
-                  <view
+<!--                  <view
                     ripple
                     class="cancel-btn"
                     shape="circle"
@@ -111,7 +122,7 @@
                     @click="onCancel(order.sn)"
                   >
                     鍙栨秷璁㈠崟
-                  </view>
+                  </view> -->
                   <!-- 绛夊緟鏀惰揣 -->
                   <view
                     ripple
@@ -138,7 +149,9 @@
                     shape="circle"
                     class="cancel-btn"
                     size="mini"
-                    v-if="order.groupAfterSaleStatus && ( order.groupAfterSaleStatus.includes('NOT_APPLIED') || order.groupAfterSaleStatus.includes('PART_AFTER_SALE'))"
+                    v-if="order.groupAfterSaleStatus &&
+					 ( order.groupAfterSaleStatus.includes('NOT_APPLIED') 
+					 || order.groupAfterSaleStatus.includes('PART_AFTER_SALE')||order.orderStatus === 'UNDELIVERED')"
                     @click="applyService(order)"
                   >
                     閫�娆�/鍞悗
@@ -148,7 +161,7 @@
 				    shape="circle"
 				    class="cancel-btn"
 				    size="mini"
-				    v-if="order.orderStatus === 'COMPLETED' "
+				    v-if="order.orderStatus === 'COMPLETED'&& order.orderType !=='VIRTUAL'"
 				    @click="buyBack(order)"
 				  >
 				    鍐嶆潵涓�鍗�
@@ -373,6 +386,12 @@
     },
   },
   methods: {
+	  openCouponPackage(order){
+		  console.log(order)
+		uni.navigateTo({
+			url:"/pages/order/cardPack?sn=" + order.sn
+		})  
+	  },
 	  //鍐嶆潵涓�鍗�
 	  buyBack(order){
       console.log(JSON.stringify(order))
@@ -631,10 +650,14 @@
      * 鏌ョ湅鐗╂祦
      */
     navigateToLogistics(order) {
-      uni.navigateTo({
-        url:
-          "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
-      });
+      // uni.navigateTo({
+      //   url:
+      //     "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+      // });
+	  uni.navigateTo({
+	    url:
+	      `/pages/order/deliverDetail?order_sn=${order.sn}`,
+	  });
     },
   },
 };

--
Gitblit v1.8.0