jiayubo преди 1 седмица
родител
ревизия
cd14835e90

+ 0 - 1
components/CustomTabBar/index.vue

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

+ 2 - 2
config.js

@@ -2,9 +2,9 @@
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
-	baseUrl: 'http://192.168.100.95:9527',//嵘哥
+	// baseUrl: 'http://192.168.100.95:9527',//嵘哥
 	// baseUrl: 'http://192.168.100.121:9527',//龙哥
-	// baseUrl: 'https://zybooks.tech/prod-api',
+	baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',
 	// 应用信息

+ 0 - 4
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: 查看

+ 0 - 2
pages/common/orderList/userItem.vue

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

+ 2 - 2
pages/index.vue

@@ -181,14 +181,14 @@ const getList = async () => {
 		res.rows.forEach((item, index) => {
 			index % 2 !== 0 ? leftList.value.push(item) : rightList.value.push(item);
 		});
-
+		pages.value.total = res.total;
 		if (pages.value.current >= Math.ceil(res.total / pages.value.pageSize)) {
 			loadmoreInfo.value.status = 'nomore';
 		} else {
 			loadmoreInfo.value.status = 'loadmore';
 		}
 
-		pages.value.total = res.total;
+	
 	} catch (error) {
 		leftList.value = [];
 		rightList.value = [];

+ 0 - 1
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

+ 6 - 7
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);

+ 1 - 1
utils/request.ts

@@ -5,7 +5,7 @@ import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 import { RequestConfig, ResponseData } from '@/types/request'
 
-let timeout = 10000
+let timeout = 600000
 const baseUrl = config.baseUrl
 
 const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {