fix: 订单详情

components/pages/classify/orderlist.vue

@@ -26,7 +26,7 @@
 						<!-- 中间信息 -->
 						<view class="item-info">
 							<view class="info-line">姓名：{{item.name}}</view>
-							<view class="info-line">类别：{{item.orderStatus}}</view>
+							<view class="info-line">类别：{{item.businessTierName}}</view>
 							<view class="info-line skill-description">技能介绍：{{ item.skillDescribe }}</view>
 						</view>
 
@@ -124,8 +124,8 @@ const handlClick = (item) => {
 	}
 
 	.item-image {
-		width: 80px;
-		height: 80px;
+		width: 60px;
+		height: 60px;
 		border-radius: 8px;
 		margin-right: 12px;
 	}
@@ -138,7 +138,7 @@ const handlClick = (item) => {
 
 	.info-line {
 		margin-bottom: 6px;
-		font-size: 14px;
+		font-size: 12px;
 		color: #333;
 	}
 

pages_classify/pages/handle/index.vue

@@ -66,21 +66,22 @@ const getOrderDetail = async () => {
             title: '数据加载中...'
         });
         const res = await getVolunteerOrderInfo({ orderId: orderId.value });
-        const ad_res = await getAddress(res.data.addressId);
-
-        let data = res.data;
-        if (ad_res.data) {
-            data = {
-                ...data,
-                address: ad_res.data.address,
-                name: ad_res.data.name,
-                telephone: ad_res.data.telephone,
-                isContagion: ad_res.data.isContagion,
-                haveContagion: ad_res.data.haveContagion,
-
-            }
-        }
-        detaile.value = data;
+        // const ad_res = await getAddress(res.data.secondOrder.addressId);
+        console.log('res',res.data);
+        
+        let data = res.data.secondOrder;
+        detaile.value = {...res.data.secondOrder,...res.data.address};
+        // if (data.address) {
+        //     data = {
+        //         ...data,
+        //         telephone: data.address.telephone,
+        //         isContagion: data.address.isContagion,
+        //         haveContagion: data.address.haveContagion,
+        //         address: data.address.address,
+        //         name: data.address.name,
+        //     }
+        // }
+        // detaile.value = data;
         if (data.orderStatus === 1) {
 
             orderStatus.value = true;

pages_classify/pages/order/index.vue

@@ -138,22 +138,22 @@ const getOrderDetail = async () => {
 			title: '数据加载中...'
 		});
 		const res = await getVolunteerOrderInfo({ orderId: orderId.value });
-		const ad_res = await getAddress(res.data.addressId);
-		let data = res.data;
-		if (ad_res.data) {
-			data = {
-				...data,
-				address: ad_res.data.address,
-				name: ad_res.data.name,
-				telephone: ad_res.data.telephone
-			}
-		}
+		// const ad_res = await getAddress(res.data.addressId);
+		// let data = res.data;
+		// if (ad_res.data) {
+		// 	data = {
+		// 		...data,
+		// 		address: ad_res.data.address,
+		// 		name: ad_res.data.name,
+		// 		telephone: ad_res.data.telephone
+		// 	}
+		// }
 		// if (data.volunteerPicture) {
 		// 	fileList.value = data.volunteerPicture.split(',').map(item => {
 		// 		return { url: item }
 		// 	});
 		// }
-		detaile.value = data;
+		detaile.value = {...res.data.secondOrder,...res.data.address};
 		console.log('detaile.value', detaile.value);
 
 	} catch (error) {