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"
>
预售
- 一手货源
-<<<<<<< HEAD
{{item.name}}
{{item.specification || '无'}} | {{item.yolk}}
@@ -268,7 +266,6 @@
data-index="0"
>
预售
- 一手货源
{{item.name}}
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;
}
/* 广告位样式 */