From 66b2fafb361fe1e04b1eb738ff632096e3816354 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 05 三月 2026 09:44:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/index/index.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index d995322..5c3d053 100644
--- a/mini-program/pages/index/index.vue
+++ b/mini-program/pages/index/index.vue
@@ -118,7 +118,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>
@@ -276,6 +280,7 @@
if (res.code === 200) {
res.data.records.forEach(item => {
item.minPrice = item.minPrice.toFixed(2).split('.')
+ item.shou = (item.salenum || 0) + (item.realSaleNum || 0)
})
this.goodsList.push(...res.data.records)
this.page++
@@ -576,6 +581,11 @@
box-sizing: border-box;
.commodity-item-box-title {
+ width: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
font-weight: 600;
font-size: 30rpx;
color: #222222;
--
Gitblit v1.9.3