From 4c85457a83afeebb0bb4977d0525222493d29de2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 17:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/cusbar/cart/cartList.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/pages/cusbar/cart/cartList.vue b/pages/cusbar/cart/cartList.vue
index 5978190..da6bd4a 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">
@@ -240,15 +240,16 @@
*/
onShow() {
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 +719,7 @@
.content {
padding: 20rpx 0 20rpx 0;
margin-bottom: 80rpx;
+ overflow: auto;
}
.line {
--
Gitblit v1.8.0