fix: 优化

components/CustomTabBar/index.vue

@@ -164,7 +164,6 @@ export default {
 
 .Text {
     font-size: 24rpx;
-    font-family: Cochin, serif;
     font-weight: 900;
 }
 

pages/common/orderList/listItem.vue

@@ -46,8 +46,6 @@
 import { inject } from 'vue';
 import DictTag from '@/components/DictTag/index.vue'
 
-import config from '@/config'
-const baseUrl = config.baseUrl
 
 const props = defineProps({
     data: {
@@ -57,14 +55,12 @@ const props = defineProps({
         }
     },
 });
-console.log('datadata',props.data);
 
 
 const inject_click = inject('onClick');
 
 const order_status = inject('order_status');
 
-const btn_style = ` width: 120rpx; height: 50rpx; font-size: 24rpx;border-radius: 25rpx;margin-left: 12rpx;`;
 
 /**
  * 1: 查看

pages/common/orderList/userItem.vue

@@ -47,8 +47,6 @@ const props = defineProps({
         }
     },
 });
-console.log('datadata', props.data);
-
 
 const order_status = inject('order_status');
 

pages/index.vue

@@ -169,6 +169,7 @@ const getList = async () => {
 		if (!res || !res.rows) {
 			return;
 		}
+<<<<<<< HEAD
 		console.log('判断是否已经到了最后一页',pages.value.current >= Math.ceil(res.total / pages.value.pageSize));
 		
 		// 如果是第一页，先清空
@@ -183,12 +184,26 @@ const getList = async () => {
 		});
 
 		if (pages.value.current >= Math.ceil(res.total / pages.value.pageSize)) {
+=======
+		res.rows.forEach((item, index) => {
+			index % 2 !== 0 ? rightList.value.push(item) : leftList.value.push(item);
+		});
+		pages.value.total = res.total;
+		console.log('判断是否已经到了最后一页',pages.value.current, res.total,pages.value.pageSize);
+		const isBottom = pages.value.current >= Math.ceil(res.total / pages.value.pageSize)
+		// 判断是否已经到了最后一页
+		if (isBottom) {
+>>>>>>> 9cb1dc3 (fix:　优化)
 			loadmoreInfo.value.status = 'nomore';
 		} else {
 			loadmoreInfo.value.status = 'loadmore';
 		}
+<<<<<<< HEAD
 
 		pages.value.total = res.total;
+=======
+		
+>>>>>>> 9cb1dc3 (fix:　优化)
 	} catch (error) {
 		leftList.value = [];
 		rightList.value = [];

pages_home/components/tabs/index.vue

@@ -65,7 +65,6 @@ const childrenList = ref([]);//二级的数据
 const children2List = ref([]);//三级的数据
 
 const handlTabs = (e, index) => {
-    console.log('e,index', e, index);
     childrenList.value = e.children ? [{
         businessName: '全部',
         id: e.id

pages_home/pages/client/details.vue

@@ -240,6 +240,11 @@
 			if (!res || !res.rows) {
 				return;
 			}
+			// 将数据分成左右两列
+			res.rows.forEach((item, index) => {
+				index % 2 !== 0 ?rightList.value.push(item) : leftList.value.push(item) ;
+			});
+			pages.value.total = res.total;
 
 			// 判断是否已经到了最后一页
 			if (pages.value.current >= Math.ceil(res.total / pages.value.pageSize)) {
@@ -248,13 +253,7 @@
 				loadmoreInfo.value.status = 'loadmore';
 			}
 
-			// 将数据分成左右两列
-			res.rows.forEach((item, index) => {
-				index % 2 !== 0 ? leftList.value.push(item) : rightList.value.push(item);
-			});
-			console.log('leftList', leftList, rightList);
-
-			pages.value.total = res.total;
+			
 		} catch (error) {
 			clearList()
 			console.error('Error fetching data:', error);