refactor(订单/伴宠师): 重构订单和伴宠师相关代码

- 调整订单列表页的订单状态值
- 优化伴宠师列表和详情接口的代码格式
- 更新伴宠师列表页的显示逻辑，使用新的接口和数据结构
- 修复伴宠师列表页的图片和名称显示问题

api/order/order.js

@@ -0,0 +1,14 @@
+import upload from '@/utils/upload'
+import request from '@/utils/request'
+
+// 查询伴宠师列表
+export function getTeacherList(params) {
+	return request({
+		url: '/applet/mall/teacher/getTeacherList',
+		headers: {
+			"isToken": true
+		},
+		method: 'get',
+		params
+	})
+}

api/system/companion.js

@@ -3,18 +3,20 @@ import request from '@/utils/request'
 
 // 查询伴宠师列表
 export function getCompanionList(data) {
-  return request({
-    url: '/h5/staff/list',
-	headers:{ "isToken":true},
-    method: 'post',
-	data:data
-  })
+	return request({
+		url: '/h5/staff/list',
+		headers: {
+			"isToken": true
+		},
+		method: 'post',
+		data: data
+	})
 }
 
-// 查询伴宠师列表
+// 查询伴宠师详情
 export function getCompanionInfo(id) {
-  return request({
-    url: `/h5/staff/${id}`,
-    method: 'get'
-  })
-}
+	return request({
+		url: `/h5/staff/${id}`,
+		method: 'get'
+	})
+}

pages/companionPetList/companionPetList.vue

@@ -98,37 +98,45 @@
 							<view class="personal-list-item">
 								<view class="personal-info">
 									<view @click="getInfo(item.id)">
-										<image class="people-img" slot='cover'
+										<!-- <image class="people-img" slot='cover'
 											:src="item&&item.staffImages&&item.staffImages.length>0?item.staffImages[0].url:defaultStaffIamge">
+										</image> -->
+										
+										<image class="people-img" slot='cover'
+											:src="item.userImage">
 										</image>
+										
 									</view>
 									<view class="personal-info-1">
 										<view class="personal-info-2">
 											<view class="personal-info-title" @click="getInfo(item.id)">
 												<view class="personal-name">
-													{{item.name}}
+													{{ item.userName || '匿名' }}
 												</view>
 												<view class="personal-sex">
-													<img :src="item.gender=='男生'?'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/sex_m.png':
+													<img :src="item.appletUsersTeacher.sex == 0?'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/sex_m.png':
 																'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/sex_f.png'" alt="sex"
 														style="width: 20px;height: 20px;" />
 												</view>
 											</view>
 											<view class="personal-star" @click="checkIsLike">
-												<text style="color: #FFB13F;">客户点赞数{{likeNum}}</text>
+												<text style="color: #FFB13F;">客户点赞数{{ likeNum }}</text>
 												<uni-icons v-if="isLike" type="hand-up-filled" size="20"
 													color="#FFB13F"></uni-icons>
 												<uni-icons v-else type="hand-up" size="20" color="#FFB13F"></uni-icons>
 											</view>
 										</view>
 										<view class="personal-info-3" style="width: 100%;">
-											<view class="ellipsis">
-												距离{{item.id}}km
+											<view class="ellipsis" v-if="item.id">
+												距离{{ item.id }}km
+											</view>
+											<view class="ellipsis" v-else>
+												暂无距离估测
 											</view>
 										</view>
 										<view class="personal-info-4" style="width: 100%;">
 											<view class="ellipsis" style="max-width: 225px;">
-												简介：{{item.shortDescription}}
+												简介：{{ item.shortDescription || '暂无' }}
 											</view>
 										</view>
 									</view>
@@ -136,7 +144,7 @@
 							</view>
 							<view>
 								<view class="personal-item-bottom">
-									<text class="personal-item-bottom-text">养宠4年 | 评价11条 | 服务小结13份</text>
+									<text class="personal-item-bottom-text">养宠{{ item.experience || 0 }}年 | 评价{{ item.commentNum || 0 }}条 | 服务小结{{ item.serviceSummaryNum || 0 }}份</text>
 								</view>
 							</view>
 						</uni-card>
@@ -155,10 +163,13 @@
 	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 	import uniFab from '@/uni_modules/uni-fab/components/uni-fab/uni-fab.vue'
 	import FilterPopup from '@/components/FilterPopup/FilterPopup.vue'
+	// import {
+	// 	getCompanionList,
+	// 	getCompanionInfo
+	// } from "@/api/system/companion"
 	import {
-		getCompanionList,
-		getCompanionInfo
-	} from "@/api/system/companion"
+		getTeacherList,
+	} from "@/api/order/order"
 	export default {
 		data() {
 			return {
@@ -278,7 +289,14 @@
 					staffName: "君"
 				}
 				console.log('data', data);
-				getCompanionList(data).then(response => {
+				// getCompanionList(data).then(response => {
+				// 	if (response.code == 200) {
+				// 		this.companionList = response.rows
+				// 		console.log(response);
+				// 	}
+				// 	console.log(response);
+				// })
+				getTeacherList(data).then(response => {
 					if (response.code == 200) {
 						this.companionList = response.rows
 						console.log(response);

pages_order/order/orderList.vue

@@ -131,10 +131,10 @@
 			return {
 				tabs: [
 					{ name: '全部', value: '' },
-					{ name: '待付款', value: '1' },
-					{ name: '已接单', value: '2' },
-					{ name: '服务中', value: '3' },
-					{ name: '已完成', value: '4' }
+					{ name: '待付款', value: '0' },
+					{ name: '已接单', value: '1' },
+					{ name: '服务中', value: '2' },
+					{ name: '已完成', value: '3' }
 				],
 				currentTab: '',
 				orderList: [],