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/cusbar/cart/cartList.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/pages/cusbar/cart/cartList.vue b/pages/cusbar/cart/cartList.vue
index 5978190..a2a46ea 100644
--- a/pages/cusbar/cart/cartList.vue
+++ b/pages/cusbar/cart/cartList.vue
@@ -14,7 +14,7 @@
</view>
</view>
<!-- 搴楅摵鍟嗗搧淇℃伅 -->
- <div class="content" :style="{height: windowHeight - marginBottom - 50 + 'px'}">
+ <div class="content" :style="{height: windowHeight - marginBottom - 200 + 'px'}">
<div class="box box2" :class="{ invalid: isInvalid(item) }" v-for="(item, index) in cartDetail.cartList"
:key="index">
<view class="tab">
@@ -188,6 +188,7 @@
import '@/components/uview-components/uview-ui';
import * as API_Trade from "@/api/trade";
import { debounce } from "@/utils/tools.js";
+import { getSessionId, userAction } from "@/api/userAction.js";
// import uniNumberBox from '@/components/uni-number-box'
export default {
data() {
@@ -220,7 +221,18 @@
checkout: false, //鍏ㄩ�夋寜閽�
WEIXIN_num: "", //璐墿杞﹀吋瀹瑰井淇℃杩涘櫒
marginBottom: 0 ,// 搴曢儴瀹夊叏鍖哄煙
- windowHeight: 0 // 鍙娇鐢ㄥ睆骞曢珮搴�
+ windowHeight: 0 ,// 鍙娇鐢ㄥ睆骞曢珮搴�
+ pageSessionNo:"",
+ sendOnShow:false,
+ actionParam:{
+ sessionId:'',
+ actionType:"PAGE",
+ joinType:"SELF",
+ pageCode:"CART_LIST",
+ pageParams:"{}",
+ pageStatus:"JOIN",
+ pageType:"DETAIL"
+ }
};
},
@@ -235,20 +247,46 @@
onPullDownRefresh(){
this.getCardData();
},
+ onUnload() {
+ let param = Object.assign({}, this.actionParam);
+ if (this.sendOnShow)return
+ param.pageStatus = "LEAVE"
+ userAction(param)
+ },
+ onHide() {
+ this.startHidenTime = Date.now()
+ let param = Object.assign({}, this.actionParam);
+ this.sendOnShow = true;
+ param.pageStatus = "LEAVE"
+ userAction(param)
+ },
+ onLoad(options) {
+ this.actionParam.pageParams = JSON.stringify(options)
+
+ },
/**
* 鍒濆鍖栦俊鎭�
*/
onShow() {
+ getSessionId().then(res=>{
+ this.pageSessionNo = res.data.data
+ this.actionParam.sessionId = this.pageSessionNo
+ if(this.pageSessionNo){
+ let param = Object.assign({}, this.actionParam);
+ userAction(param)
+ }
+ })
this.deleteShow ? (this.deleteShow = false) : true;
- if (this.$refs.swiperAction) {
- this.$refs.swiperAction.forEach((item, index) => {
- item.show = false;
- });
+ this.getCardData();
+ // if (this.$refs.swiperAction) {
+ // this.$refs.swiperAction.forEach((item, index) => {
+ // item.show = false;
+ // });
+ // this.getCardData();
+ // } else {
+ // this.getCardData();
+ // }
- this.getCardData();
- } else {
- this.getCardData();
- }
},
methods: {
/**
@@ -718,6 +756,7 @@
.content {
padding: 20rpx 0 20rpx 0;
margin-bottom: 80rpx;
+ overflow: auto;
}
.line {
--
Gitblit v1.8.0