From 577042a77ff72607e2cd5de3a06f33a1c9d3f703 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 16 九月 2025 10:54:17 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' into user_action
---
pages/order/myOrder.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index e808a50..c55c741 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'"
@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))
--
Gitblit v1.8.0