From 507deefd69a980e4d0d0c2e8da0dacad800951f7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 24 十月 2025 15:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
pages/order/myOrder.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 0f790f4..25c3d35 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -172,7 +172,7 @@
shape="circle"
class="cancel-btn"
size="mini"
- v-if="order.orderStatus === 'COMPLETED'&& order.orderType !=='VIRTUAL'"
+ v-if="order.orderStatus === 'COMPLETED'&& order.orderType !=='VIRTUAL'&& order.customizeFlag !=='CUSTOMIZE'"
@click="buyBack(order)"
>
鍐嶆潵涓�鍗�
@@ -470,7 +470,7 @@
opencustomize(order){
console.log(order)
uni.navigateTo({
- url:"/pages/order/cardPack?sn=" + order.sn
+ url:"/pages/order/constomize/constomize?sn=" + order.sn
})
},
//鍐嶆潵涓�鍗�
--
Gitblit v1.8.0