commit choose.page request methods

pages/subpack/pages/application/choose.vue

@@ -73,6 +73,8 @@
 
 	const nameText = computed(() => {
 		return (name) => {
+			
+			name = name.replaceAll('南充','').replaceAll('服务','').replaceAll('养老', '').replaceAll('有限公司', '');
 			let index = name.length - 2;
 			index = index >= 0 ? index : 0;
 			return name.substring(index);
@@ -130,7 +132,7 @@
 	}
 
 	function queryList(pageNo, pageSize) {
-		uni.showLoading({
+		/* uni.showLoading({
 			title: '加载中...',
 			mask: true
 		})
@@ -143,11 +145,17 @@
 				des: '已经服务11人',
 				checked: data.dufaultIds.indexOf(id) != -1
 			})
+		} */
+		console.log('data==>', data);
+		if(data.pageType === 'user') {
+			getUserList(pageNo, pageSize);
+		}else if(data.pageType === 'company'){
+			getFirmList(pageNo, pageSize);
 		}
-		setTimeout(() => {
+		/* setTimeout(() => {
 			paging.value.complete(list);
 			uni.hideLoading();
-		}, 500)
+		}, 500) */
 	}
 	
 	function getUserList(pageNo, pageSize){
@@ -158,6 +166,7 @@
 			}
 		}).then(res=>{
 			
+			console.log('getUserList=>', res);
 		})
 	}
 	
@@ -166,8 +175,21 @@
 			parmas: {
 				pageNum: pageNo,
 				pageSize
+			},
+			custom: {
+				catch: true
 			}
 		}).then(res=>{
+			let list = [];
+			res.map(item=>{
+				list.push({
+					id: item.companyId,
+					name: item.name,
+					des: `最大派单数(${item.count})`,
+					checked: data.dufaultIds.indexOf(item.companyId) != -1
+				})
+			})
+			paging.value.complete(list);
 			
 		})
 	}

pages/subpack/pages/application/componenets/page1.vue

@@ -112,6 +112,12 @@
 		if (chooseInfo.value.name) {
 			params.dufaultIds = chooseInfo.value.id + "";
 		}
+		console.log('item=>', props.item)
+		if(props.item.status === 'wait_assign_company') {
+			params.pageType = 'company';
+		}else if(props.item.status === 'wait_assign_nurse') {
+			params.pageType = 'user';
+		}
 		uni.$u.route('/pages/subpack/pages/application/choose', params)
 	}
 	

pages/subpack/pages/application/list.vue

@@ -23,8 +23,7 @@
 		reactive,
 		computed,
 		getCurrentInstance,
-		onMounted,
-		computed
+		onMounted
 	} from 'vue';
 	//import { onLoad } from '@dcloudio/uni-app'
 	import applyItem from '../../components/apply/apply-item.vue';

utils/request/interceptors.js

@@ -35,6 +35,7 @@ const responseInterceptors = (vm) => {
 			uni.hideLoading();
 		}
 		/* 对响应成功做点什么 可使用async await 做异步操作*/
+		if(!response.data.code) response.data.code = 200;
 		const data = response.data
 		// console.log('http=>', data)
 		// 自定义参数