From 6c439362b6d275289d8426e4ca0321d55ffd0517 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 6 Aug 2023 22:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/custom-bar/load-status-bar.vue | 15 +++++++++-----
 pages/index/home.vue                      | 15 ++++++--------
 pages/product/filtered-products.vue       | 24 ++++++++++++++---------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/components/custom-bar/load-status-bar.vue b/components/custom-bar/load-status-bar.vue
index 878d42b..3bf2e0e 100644
--- a/components/custom-bar/load-status-bar.vue
+++ b/components/custom-bar/load-status-bar.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="margin-bottom-lg margin-top-sm">
-			<view v-if="hasMoreData" class="text-center bg-main-color light padding-tb-sm" @click="reqMoreData">
+			<view v-if="hasMoreData" class="text-center bg-main-color padding-tb text-lg" @click="reqMoreData">
 				<text class="margin-right-xs">查看更多</text>
 				<text class="text-bold cuIcon-unfold"></text>
 			</view>
@@ -22,7 +22,7 @@
 		},
 		methods: {
 			showLoading() {
-				this.loadMoreStatus = 'loading bg-main-color light';
+				this.loadMoreStatus = 'loading bg-main-color padding-tb text-lg';
 				this.hasMoreData = false;
 			},
 			showLoadMore() {
@@ -30,11 +30,11 @@
 				this.hasMoreData = true;
 			},
 			showLoadOver() {
-				this.loadMoreStatus = 'over bg-grey';
+				this.loadMoreStatus = 'over bg-grey padding-tb text-lg';
 				this.hasMoreData = false;
 			},
 			showLoadErr() {
-				this.loadMoreStatus = 'erro bg-red';
+				this.loadMoreStatus = 'erro bg-red padding-tb text-lg';
 				this.hasMoreData = false;
 			},
 			reqMoreData() {
@@ -44,5 +44,10 @@
 	}
 </script>
 
-<style>
+<style scoped>
+	.cu-load {
+	    display: block;
+	    line-height: unset;
+	    text-align: center;
+	}
 </style>
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 8ef2dbb..21a5ac3 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -52,7 +52,7 @@
 				</view>
 				<!-- 热门细类 -->
 				<view class="cu-list grid no-border hot-sub-category" :class="['col-5']" :style="'padding-top: 10rpx'">
-					<view class="cu-item align-center" v-for="(item,index) in hotServCategory" :key="index" v-if="tabCur === 0 && index < 5"
+					<view class="cu-item align-center" v-for="(item,index) in hotServCategory" :key="index" v-if="tabCur === 0 && index < 15"
 						@click="chooseCategory(item)">
 						<!-- <view class="hot-sub-category-icon" :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 							<view class="cu-tag badge" v-if="item.badge!=0">
@@ -63,7 +63,7 @@
 							:style="'width: 100rpx; height: 100rpx; background-image:url(' + item.cover  + ');'"></view>
 						<text>{{item.name}}</text>
 					</view>
-					<view class="cu-item align-center" v-for="(item,index) in hotFittingsCategory" :key="index" v-if="tabCur === 1 && index < 5"
+					<view class="cu-item align-center" v-for="(item,index) in hotFittingsCategory" :key="index" v-if="tabCur === 1 && index < 15"
 						@click="chooseCategory(item)">
 						<view class="cu-avatar round"
 							:style="'width: 100rpx; height: 100rpx; background-image:url(' + item.cover  + ');'"></view>
@@ -71,17 +71,14 @@
 					</view>
 				</view>
 				<!-- 细类 -->
-				<view class="cu-list grid no-border" :class="['col-5']" v-if="subCategories.length > 5">
+				<!-- <view class="cu-list grid no-border" :class="['col-5']" v-if="subCategories.length > 5">
 					<view class="cu-item" v-for="(item,index) in subCategories" :key="index"
 						v-if="index < subCategories.length && index > 4" @click="chooseCategory(item)">
 						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-							<!-- <view class="cu-tag badge" v-if="item.badge!=0">
-								<block v-if="item.badge!=1">{{item.badge}}</block>
-							</view> -->
 						</view>
 						<text>{{item.goodsCategoryName}}</text>
 					</view>
-				</view>
+				</view> -->
 				<!-- 超值服务 -->
 				<!-- <vertical-goods-card ref="discountGoodsCard" :goodsInfos="discountGoods.goodsInfos"
 					:title="discountGoods.title"></vertical-goods-card> -->
@@ -91,7 +88,7 @@
 			<!-- 当前城市服务列表 -->
 			<view class="text-gray text-lg text-center margin flex align-center">
 				<view class="divider"/>
-				<text class="margin-lr-sm" style="flex-basis: 50%;">当前城市</text>
+				<text class="margin-lr-sm" style="flex-basis: 60%; color: #9E9E9E;">当前城市</text>
 				<view class="divider"/>
 			</view>
 			<view>
@@ -103,7 +100,7 @@
 				<load-status-bar ref="loadStatusBar1" @loadMore="loadProductPage"></load-status-bar>
 			</view>
 			<!-- 其他城市服务列表 -->
-			<view class="text-gray text-lg text-center margin flex align-center">
+			<view class="text-gray text-lg text-center margin flex align-center" style="padding-top: 60rpx;">
 				<view class="divider"/>
 				<text class="margin-lr-sm" style="flex-basis: 50%;">其他城市</text>
 				<view class="divider"/>
diff --git a/pages/product/filtered-products.vue b/pages/product/filtered-products.vue
index d480556..5179502 100644
--- a/pages/product/filtered-products.vue
+++ b/pages/product/filtered-products.vue
@@ -59,14 +59,14 @@
 			</view>
 		</view>
 		<view class="margin-bottom-lg">
-			<view v-if="hasMoreData" class="text-center bg-main-color light padding-tb-sm" @click="loadProductData">
+			<view v-if="hasMoreData" class="text-center bg-main-color padding-tb text-lg" @click="loadProductData">
 				<text class="margin-right-xs">查看更多</text>
 				<text class="text-bold cuIcon-unfold"></text>
 			</view>
 			<view class="cu-load" :class="loadMoreStatus"></view>
 		</view>
 		<!-- 其他城市服务列表 -->
-		<view class="text-gray text-lg text-center margin flex align-center">
+		<view class="text-gray text-lg text-center margin flex align-center" style="padding-top: 60rpx;">
 			<view class="divider"/>
 			<text class="margin-lr-sm" style="flex-basis: 50%;">其他城市</text>
 			<view class="divider"/>
@@ -79,7 +79,7 @@
 			</view>
 		</view>
 		<view class="margin-bottom-lg">
-			<view v-if="hasMoreOtherCityData" class="text-center bg-main-color light padding-tb-sm" @click="loadOtherCityProductData({})">
+			<view v-if="hasMoreOtherCityData" class="text-center bg-main-color padding-tb text-lg" @click="loadOtherCityProductData({})">
 				<text class="margin-right-xs">查看更多</text>
 				<text class="text-bold cuIcon-unfold"></text>
 			</view>
@@ -229,13 +229,13 @@
 					params.areaId = null;
 					params.areaIds = this.chosenArea[this.chosenArea.length - 1].areaIds;
 				}
-				this.loadMoreStatus = 'loading bg-main-color light';
+				this.loadMoreStatus = 'loading bg-main-color padding-tb text-lg';
 				this.hasMoreData = false;
 				try {
 					await this.loadProductPage(params);
-					this.loadMoreStatus = this.hasMoreData ? '' : 'over bg-grey';
+					this.loadMoreStatus = this.hasMoreData ? '' : 'over bg-grey padding-tb text-lg';
 				} catch (e) {
-					this.loadMoreStatus = 'erro bg-red'
+					this.loadMoreStatus = 'erro bg-red padding-tb text-lg'
 				}
 			},
 			async loadOtherCityProductData(params = {}) {
@@ -254,13 +254,13 @@
 				params.areaId = null;
 				params.exceptParentAreaId = this.chosenArea[this.chosenArea.length - 1].areaId;
 				
-				this.loadMoreStatusOfOtherCityPage = 'loading bg-main-color light';
+				this.loadMoreStatusOfOtherCityPage = 'loading bg-main-color padding-tb text-lg';
 				this.hasMoreOtherCityData = false;
 				try {
 					await this.loadOtherCityProductPage(params);
-					this.loadMoreStatusOfOtherCityPage = this.hasMoreOtherCityData ? '' : 'over bg-grey';
+					this.loadMoreStatusOfOtherCityPage = this.hasMoreOtherCityData ? '' : 'over bg-grey padding-tb text-lg';
 				} catch (e) {
-					this.loadMoreStatusOfOtherCityPage = 'erro bg-red'
+					this.loadMoreStatusOfOtherCityPage = 'erro bg-red padding-tb text-lg'
 				}
 			},
 			reloadProductPage() {
@@ -520,5 +520,11 @@
 		margin: 0;
 		padding: 0 10rpx;
 		width: 180rpx;
+	}
+	
+	.cu-load {
+	    display: block;
+	    line-height: unset;
+	    text-align: center;
 	}
 </style>