From 58c78011ca0567a597d8c1e51696e317a3086604 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 29 九月 2025 10:52:20 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' into user_action
---
pages/order/myOrder.vue | 12 ++++++------
pages/tabbar/user/my.vue | 39 ++++++++++++++++++++++++++++-----------
pages/order/orderDetail.vue | 2 +-
3 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 41f5961..ac40f47 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -389,7 +389,7 @@
param.sessionId = this.pageSessionNo
userAction(param)
}
- })
+ })
if(this.$options.filters.tipsToLogin()){
if (!this.tabCurrentIndex) {
this.initData(0);
@@ -714,14 +714,14 @@
* 鏌ョ湅鐗╂祦
*/
navigateToLogistics(order) {
+ uni.navigateTo({
+ url:
+ "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ });
// uni.navigateTo({
// url:
- // "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ // `/pages/order/deliverDetail?order_sn=${order.sn}`,
// });
- uni.navigateTo({
- url:
- `/pages/order/deliverDetail?order_sn=${order.sn}`,
- });
},
},
};
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 5d5e5cc..ed8aea0 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -10,7 +10,7 @@
</div>
<!-- 鐗╂祦淇℃伅 -->
<view class="info-view logistics-view">
- <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 ">
+ <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 && !(orderPackage && orderPackage.length)">
<view class="logistics-List-title">
{{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
</view>
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index d3b8b31..f4f3e1e 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -205,17 +205,6 @@
} catch (e) {
console.error('瀛樺偍澶辫触锛�', e);
}
- }else{
- shareStoreId = uni.getStorageSync('shareStoreId');
- shareStoreId = uni.getStorageSync('shareTime');
- console.log('浠庣紦瀛樿鍙栧弬鏁�:', { shareStoreId, shareTime });
- // this.bindMemberAndStore(shareStoreId, shareTime)
- if (shareStoreId && shareTime) {
- console.log('妫�娴嬪埌鏈夋晥鍙傛暟锛岃皟鐢ㄥ悗绔帴鍙�');
- this.bindMemberAndStore(shareStoreId, shareTime);
- } else {
- console.log('鏃犳湁鏁堝弬鏁帮紝鎵ц姝ｅ父閫昏緫');
- }
}
this.initCOS()
},
@@ -246,6 +235,7 @@
userAction(param)
}
})
+
this.userInfo = this.$options.filters.isLogin() || {};
if (this.$options.filters.isLogin("auth")) {
this.getUserOrderNum();
@@ -254,6 +244,16 @@
this.couponNum = 0;
this.footNum = 0;
}
+
+ let shareStoreId = uni.getStorageSync('shareStoreId');
+ let shareTime = uni.getStorageSync('shareTime');
+ console.log('浠庣紦瀛樿鍙栧弬鏁�:', { shareStoreId, shareTime });
+ if (shareStoreId && shareTime) {
+ console.log('妫�娴嬪埌鏈夋晥鍙傛暟锛岃皟鐢ㄥ悗绔帴鍙�');
+ this.bindMemberAndStore(shareStoreId, shareTime);
+ } else {
+ console.log('鏃犳湁鏁堝弬鏁帮紝鎵ц姝ｅ父閫昏緫');
+ }
},
onPullDownRefresh() {
this.getUserOrderNum();
@@ -270,6 +270,23 @@
mounted() { },
methods: {
+ // 瑙ｆ瀽URL鍙傛暟
+ parseUrlParams(url) {
+ const params = {};
+ // 澶勭悊鍙兘瀛樺湪鐨刪ash锛堝鏋滄湁鐨勮瘽锛�
+ const cleanUrl = url.split('#')[0];
+ const queryStr = cleanUrl.split('?')[1] || '';
+
+ queryStr.split('&').forEach(pair => {
+ const [key, value] = pair.split('=');
+ if (key) {
+ // 濡傛灉鍊煎瓨鍦紝鍒欒В鐮侊紝鍚﹀垯璁句负绌哄瓧绗︿覆
+ params[key] = value ? decodeURIComponent(value) : '';
+ }
+ });
+
+ return params;
+ },
async bindMemberAndStore(shareStoreId, shareTime){
let form ={
shareStoreId: shareStoreId,
--
Gitblit v1.8.0