From 4c85457a83afeebb0bb4977d0525222493d29de2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 17:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/order/myOrder.vue | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index c55c741..4a156ed 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -161,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)"
>
鍐嶆潵涓�鍗�
@@ -175,6 +175,14 @@
</u-button> -->
</view>
</view>
+ <view style="display: flex;justify-content: space-around;">
+ <view class="" @click="callPhone">
+ 瀹㈡湇鐑嚎: 19980834650
+ </view>
+ <view class="" @click="copyToClipboard">
+ 瀹㈡湇寰俊: meiyikuang
+ </view>
+ </view>
</view>
</view>
<uni-load-more :status="tabItem.loadStatus"></uni-load-more>
@@ -386,6 +394,29 @@
},
},
methods: {
+ copyToClipboard(){
+ uni.setClipboardData({
+ data:'meiyikuang',
+ success() {
+ uni.showToast({
+ title: '澶嶅埗鎴愬姛',
+ icon: 'none'
+ })
+ }
+ })
+ },
+ callPhone(){
+ uni.showModal({
+ title:'纭鑱旂郴瀹㈡湇鍚�?',
+ success(e) {
+ if(e.confirm){
+ uni.makePhoneCall({
+ phoneNumber:'19980834650'
+ })
+ }
+ }
+ })
+ },
openCouponPackage(order){
console.log(order)
uni.navigateTo({
@@ -654,6 +685,10 @@
url:
"/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
});
+ // uni.navigateTo({
+ // url:
+ // `/pages/order/deliverDetail?order_sn=${order.sn}`,
+ // });
},
},
};
--
Gitblit v1.8.0