From 29851d845f4ab768c78724ab870ecec4ce28c32b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 24 十月 2025 11:42:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
pages/commodity-square/commoditySquare.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pages/commodity-square/commoditySquare.vue b/pages/commodity-square/commoditySquare.vue
index 0601ad1..a8dec07 100644
--- a/pages/commodity-square/commoditySquare.vue
+++ b/pages/commodity-square/commoditySquare.vue
@@ -54,7 +54,7 @@
<view
style="display: flex; justify-content: space-between;align-items:center;height: 100%;width: 100%;">
<view class="goodsPrice" style="padding: 20rpx 0;">锟{item.price}}</view>
- <view class="addCard" style="display: flex; align-items: center;" v-if="item.goodsType !=='VIRTUAL_GOODS'">
+ <view class="addCard" style="display: flex; align-items: center;" v-if="item.goodsType !=='VIRTUAL_GOODS'&& item.customizeFlag!=='CUSTOMIZE'">
<view style="padding: 20rpx 0 20rpx 20rpx;" v-show="item.cardNum && item.cardNum>0"
@click.stop="miousCardNum($event,item.id)">
<uni-icons type="minus" size="30" color="#96a6bc"></uni-icons>
@@ -426,14 +426,14 @@
}
},
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)
@@ -441,9 +441,9 @@
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)
}
})
--
Gitblit v1.8.0