fix: 类别

components/its-calendar/its-calendar.vue

@@ -12,8 +12,12 @@
 			
 				<view class="time_x" :class="host_index == item?.timeStamp ? 'time_x_sty' : ''"
 					v-for="(item, index) in timeHostArr[day_index]" :key="index"
-					@click="nowTimes < item?.timeStamp ? hosts(item) : ''"
-					:style="{'color': (nowTimes > item?.timeStamp ? '#999999' : '')}">{{item?.hours}}</view>
+					@click="(nowTimes < item?.timeStamp && item.hasReservation !== 1) ? hosts(item) : ''"
+					:style="{'color': ((nowTimes > item?.timeStamp || item.hasReservation === 1) ? '#999999' : '')}">
+					<text>{{item?.hours}}</text>
+					<text v-if="item.hasReservation === 1" class="hasRe-text">已预约</text>
+
+					</view>
 			</view>
 		</view>
 		<!-- <view class="sub" @click="sub()">
@@ -212,6 +216,13 @@
 			margin: 10rpx 0;
 			font-size: 30rpx;
 			color: #333333;
+			
+			display: flex;
+			flex-direction: column;
+			.hasRe-text {
+				font-size: 20rpx;
+				color: #999999;
+			}
 		}
 
 		.time_x_sty {

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>
 

pages/goodsDetails/goodsDetails.vue

@@ -5,7 +5,7 @@
 				<template #body>
 					<view class="card-container">
 						<!-- 左侧图片 -->
-						<image class="card-image" :src="listData.certificationPicture" mode="aspectFill"></image>
+						<image class="card-image" :src="listData.volunteerPicture" mode="aspectFill"></image>
 
 						<!-- 中间信息（姓名/类别等） -->
 						<view class="card-info">

pages_classify/pages/orderItem/orderdetails.vue

@@ -25,13 +25,13 @@
 			<up-card title="志愿者介绍" :head-style="{ height: '80rpx', padding: '20rpx',}">
 				<template #body>
 					<view class="card-container">
-						<image class="card-image" :src="listData.volunteerInfo.certificationPicture" mode="aspectFill">
+						<image class="card-image" :src="listData.volunteerInfo.volunteerPicture" mode="aspectFill">
 						</image>
 
 						<view class="card-info">
 							<view class="info-item">{{listData.volunteerInfo.name}}</view>
-							<view class="info-item">类别：11</view>
-							<view class="info-item">科目：111</view>
+							<view class="info-item">类别：{{ listData.volunteerInfo.projectName }} </view>
+							<view class="info-item">科目：{{ listData.volunteerInfo.serviceSubjectName }} </view>
 							<view class="Telephone">电话：{{listData.volunteerInfo.phonenumber}}</view>
 							<view class="info-item">住址：{{listData.volunteerInfo.city}}</view>
 						</view>
@@ -65,7 +65,7 @@
 						<!-- score如果=null，显示待评价， -->
 
 						<view class="item-info">
-							<view class="info-line">类别：serviceCategory</view>
+							<view class="info-line">类别：{{ listData.volunteerInfo.projectName }}-{{ listData.volunteerInfo.serviceSubjectName }}</view>
 							<text>开始日期：{{item.workDate}}</text>
 							<text>开始时间: {{item.workStartTime}}</text>
 						</view>