From 50eac4101c827bc7202b8259534eed70aa909a49 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 15 十月 2025 00:42:55 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' of http://42.193.1.25:9521/r/lmk-shop-wx into dev_fix_sub
---
pages/order/myOrder.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 41f5961..55b224e 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -177,7 +177,7 @@
</view>
<view style="display: flex;justify-content: space-around;">
<view class="" @click="callPhone">
- 瀹㈡湇鐑嚎: 028-84472936
+ 瀹㈡湇鐑嚎: 19980834650
</view>
<view class="" @click="copyToClipboard">
瀹㈡湇寰俊: meiyikuang
@@ -369,14 +369,14 @@
// this.loadData(this.status);
},
onUnload() {
- let param = this.actionParam;
+ let param = Object.assign({}, this.actionParam);
if (this.sendOnShow)return
param.pageStatus = "LEAVE"
userAction(param)
},
onHide() {
this.startHidenTime = Date.now()
- let param = this.actionParam;
+ let param = Object.assign({}, this.actionParam);
this.sendOnShow = true;
param.pageStatus = "LEAVE"
userAction(param)
@@ -384,12 +384,12 @@
onShow() {
getSessionId().then(res=>{
this.pageSessionNo = res.data.data
+ this.actionParam.sessionId = this.pageSessionNo
if(this.pageSessionNo){
- let param = this.actionParam;
- param.sessionId = this.pageSessionNo
+ let param = Object.assign({}, this.actionParam);
userAction(param)
}
- })
+ })
if(this.$options.filters.tipsToLogin()){
if (!this.tabCurrentIndex) {
this.initData(0);
@@ -444,7 +444,7 @@
success(e) {
if(e.confirm){
uni.makePhoneCall({
- phoneNumber:'028-84472936'
+ phoneNumber:'19980834650'
})
}
}
@@ -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}`,
- });
},
},
};
--
Gitblit v1.8.0