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/mall/mall.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/mini-program/pages/mall/mall.vue b/mini-program/pages/mall/mall.vue
index 6bddcae..0b132df 100644
--- a/mini-program/pages/mall/mall.vue
+++ b/mini-program/pages/mall/mall.vue
@@ -58,7 +58,7 @@
</view>
<view class="commodity">
<view class="commodity-wu" v-if="goodsList.length === 0">
- <image src="/static/images/default_nodata_white.png" mode="widthFix"></image>
+ <image src="/static/images/default_nodata_grey.png" mode="widthFix"></image>
</view>
<view class="commodity-item" v-else v-for="(item, i) in goodsList" :key="i" @click="jumpDetails(item.id)">
<view class="commodity-item-image">
@@ -74,15 +74,11 @@
<text>.{{item.minPrice[1]}}</text>
</view>
<view class="commodity-item-box-price-b">
- 楼{{item.price}}
+ 楼{{item.linePrice || 0}}
</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>
@@ -479,6 +475,7 @@
font-weight: 400;
font-size: 22rpx;
color: #999999;
+ text-decoration: line-through;
}
}
.commodity-item-shou {
--
Gitblit v1.9.3