From 908b9876dde97acbb09c53dc6debe3eecbb9d1b4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:10:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/itinerary/itinerary.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 2059d15..20e1561 100644
--- a/small-program/pages/itinerary/itinerary.vue
+++ b/small-program/pages/itinerary/itinerary.vue
@@ -14,7 +14,7 @@
:key="item.value"
class="filter-tab"
:class="{ active: activeTab === item.value }"
- @tap="activeTab = item.value"
+ @click="changeTab(item) "
>
{{ item.label }}
</view>
@@ -206,7 +206,7 @@
<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
</view>
<text class="pickup-code">{{ currentOrder.memberVerifyCode||'' }}</text>
- <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
+ <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鏍搁攢鐮�</text>
</view>
</view>
</u-popup>
@@ -254,11 +254,11 @@
dataList: []
}
},
- watch: {
- activeTab() {
- this.getFirstPageData()
- }
- },
+ // watch: {
+ // activeTab() {
+ // this.getFirstPageData()
+ // }
+ // },
onLoad(options) {
console.log(options )
this.activeTab = -1
@@ -306,7 +306,6 @@
this.activeTab = Number(orderStatus)
}
}
- if(this.ac)
uni.clearStorageSync("orderStatus")
this.getFirstPageData()
},
@@ -314,6 +313,10 @@
this.getDataList();
},
methods: {
+ changeTab(item){
+ this.activeTab = item.value
+ this.getFirstPageData()
+ },
payOrderFee(info){
var that = this;
uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
@@ -475,7 +478,7 @@
data: this.currentOrder.memberVerifyCode,
success: () => {
uni.showToast({
- title: '宸插鍒惰嚜鎻愮爜',
+ title: '宸插鍒舵牳閿�鐮�',
icon: 'none'
})
}
@@ -876,6 +879,7 @@
color: #8C939F;
}
.price-line{
+ padding: 0 30rpx;
box-sizing: border-box;
display: flex;
align-items: flex-end;
--
Gitblit v1.9.3