fix: 修复WXML编译错误和优化底部提示样式

- 移除index.wxml中的Git冲突标记
- 优化没有更多商品了提示的显示样式
- 添加底部额外空白空间确保提示完整显示

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>

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;
 }
 
 /* 广告位样式 */