From cdca21c0c12fa79ad4e85321d0f0960c0c4c3f33 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 三月 2026 10:56:17 +0800
Subject: [PATCH] 优化

---
 mini-program/pages/index/index.vue |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index 5c3d053..48a91e5 100644
--- a/mini-program/pages/index/index.vue
+++ b/mini-program/pages/index/index.vue
@@ -118,11 +118,7 @@
 							</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>

--
Gitblit v1.9.3