From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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