霸王餐更改

pages/index/index.vue

@@ -32,7 +32,7 @@
 			</view>
 			<!-- 首页抢购区域 -->
 			<view class="fivecontent">
-				<view class="fivecontent_item" v-for="(item,index) in homelist" :key="index"
+				<view class="fivecontent_item" v-for="(item,index) in formhomelist.list" :key="index"
 					@click="fivecontentclick(item)">
 					<view class="fivecontent_item_nav flex-start">
 						<image :src="item.shopImage" mode="aspectFill"></image>
@@ -124,7 +124,7 @@
 						</view>
 					</view>
 				</view>
-				<up-loadmore height='40' :status="formhomelist.status" iconSize='16' fontSize='16' />
+				<up-loadmore :status="formhomelist.status" fontSize="14" color="#999" iconSize="14" />
 			</view>
 		</view>
 		<indexs v-if="showindex == 'shopIndex'"></indexs>
@@ -234,7 +234,8 @@
 		page: 1, //页数
 		size: 10, //页容量
 		status: 'loadmore',
-		name: '1'
+		name: '1',
+		list:[]
 	})
 	// 使用 reactive 创建响应式对象  
 	const timeData = ref({});
@@ -243,7 +244,6 @@
 	const onChange = (e) => {
 		timeData.value = e;
 	};
-	const homelist = ref([]) //接收数据
 	const onLoadhome = async () => {
 		try {
 			let res = await APIhome(formhomelist)
@@ -265,30 +265,34 @@
 					item.end_times = 0
 				}
 			})
-			if (res.pages < formhomelist.page) {
+			if ((res.totalPage == 0 || res.totalPage == 1) && res.totalRow <= 10) {
+				console.log(res)
 				formhomelist.status = 'nomore'
-				if (form.page == 1 && res.list.length == 0) {
-
+				formhomelist.list = res.records
+				if (formhomelist.page == 1 && res.records.length == 0) {
+					formhomelist.list = []
 				}
 				return false;
 			} else {
 				formhomelist.status = 'loading';
+				if (formhomelist.page == 1) {
+					formhomelist.list = res.records
+				} else {
+					formhomelist.list = [...formhomelist.list, ...res.records];
+				}
 				formhomelist.page = ++formhomelist.page;
-				setTimeout(() => {
-					homelist.value = [...homelist.value, ...res.list];
+				if (formhomelist.page > res.totalPage) {
+					formhomelist.status = 'nomore';
+				} else {
 					formhomelist.status = 'loading';
-					if (res.pageNum == res.pages) {
-						formhomelist.status = 'nomore';
-					} else {
-						formhomelist.status = 'loading';
-					}
-				}, 500)
+				}
 			}
+			
 		} catch (e) {}
 	}
 	// /筛选数据处理
 	const init_fn = async () => {
-		homelist.value = []
+		formhomelist.list = []
 		Object.assign(formhomelist, {
 			address: uni.cache.get('getLocationstorage').address, //地址
 			lng: uni.cache.get('getLocationstorage').lng,