From e9d56a221c27a7e4796e1dea139d3c5f1d4e2730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?=
 <15778543+xufeiyang6017@user.noreply.gitee.com>
Date: Fri, 26 Dec 2025 16:59:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DWXML=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=92=8C=E4=BC=98=E5=8C=96=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除index.wxml中的Git冲突标记
- 优化没有更多商品了提示的显示样式
- 添加底部额外空白空间确保提示完整显示
---
 pages/index/index.wxml |  3 ---
 pages/index/index.wxss | 22 ++++++++--------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index eb17572..2a1f895 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -208,9 +208,7 @@
                     data-index="0"
                   ></image>
                   <view wx:if="{{item.supplyStatus === '预售'}}" class="promo-tag presale">预售</view>
-                  <view wx:if="{{item.sourceType}}" class="promo-tag source">一手货源</view>
                 </view>
-<<<<<<< HEAD
                 <view class="product-info">
                   <view class="product-title">{{item.name}}</view>
                   <view class="product-spec">{{item.specification || '无'}}<text wx:if="{{item.yolk && item.yolk !== '无'}}"> | {{item.yolk}}</text></view>
@@ -268,7 +266,6 @@
                     data-index="0"
                   ></image>
                   <view wx:if="{{item.supplyStatus === '预售'}}" class="promo-tag presale">预售</view>
-                  <view wx:if="{{item.sourceType}}" class="promo-tag source">一手货源</view>
                 </view>
                 <view class="product-info">
                   <view class="product-title">{{item.name}}</view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c7581e9..3d93abe 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1234,29 +1234,23 @@ wx-button:not([size=mini]) {
 
 /* 无更多数据 */
 .no-more-data {
-  text-align: center;
-  padding: 30rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx 20rpx;
+  padding-bottom: 50rpx;
   color: #999;
   font-size: 26rpx;
-  position: relative;
+  gap: 20rpx;
 }
 
 .no-more-data::before,
 .no-more-data::after {
   content: '';
-  position: absolute;
-  top: 50%;
-  width: 100rpx;
+  flex: 1;
   height: 1rpx;
   background: #e5e5e5;
-}
-
-.no-more-data::before {
-  left: 25%;
-}
-
-.no-more-data::after {
-  right: 25%;
+  max-width: 80rpx;
 }
 
 /* 广告位样式 */