From 14ae2f656166b98302682664888d2b882b7e4649 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 16 十月 2025 11:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon

---
 manager/src/views/order/order/orderDetail.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 5245977..7682cce 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -817,7 +817,7 @@
       console.log("to:",to.fullPath)
       console.log("form:",from.fullPath)
       // 姝g‘鎵撳嵃璺敱瀵硅薄鐨勬柟娉�
-      if((from.fullPath === "/orderList"|| from.fullPath === "/fictitiousOrderList" ||from.fullPath === "/orderStatistics"||from.fullPath.includes( "/member-detail")) && to.fullPath.includes("/order-detail")){
+      if((from.fullPath === "/orderList"|| from.fullPath === "/fictitiousOrderList" ||from.fullPath === "/orderStatistics"||from.fullPath === "/userAction"||from.fullPath.includes( "/member-detail")) && to.fullPath.includes("/order-detail")){
         this.sn = this.$route.query.sn;
         this.getDataList();
         this.getOrderPackage();

--
Gitblit v1.8.0