From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
mini-program/pages/mall/mall.vue | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/mini-program/pages/mall/mall.vue b/mini-program/pages/mall/mall.vue
index 0901d1a..6bddcae 100644
--- a/mini-program/pages/mall/mall.vue
+++ b/mini-program/pages/mall/mall.vue
@@ -78,7 +78,11 @@
</view>
</view>
<view class="commodity-item-shou">
+<<<<<<< HEAD
<text>宸插敭{{item.shou}}</text>
+=======
+ <text>宸插敭{{(item.saleNum ||0)+ (item.realSaleNum||0)}}</text>
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
<view class="commodity-item-shou-add" @click.stop="addCard(item)">+</view>
</view>
</view>
@@ -426,6 +430,7 @@
justify-content: center;
image {
width: 100%;
+ max-height:330rpx;
}
}
.commodity-item-box {
--
Gitblit v1.9.3