用户端购买订单修改

components/its-calendar/its-calendar.vue

@@ -106,6 +106,7 @@
 			hosts(e) {
 				this.host_All = e
 				this.host_index = e.timeStamp
+				this.host_All.yearToDate = this.timeArr[this.day_index]
 				this.$emit('getByTime', this.host_All)
 			},
 			// 点击立即预约

components/pages/classify/orderlist.vue

@@ -25,14 +25,16 @@
 
 						<!-- 中间信息 -->
 						<view class="item-info">
-							<view class="info-line">姓名：王麻子</view>
-							<view class="info-line">类别：刨土豆</view>
-							<view class="info-line">技能介绍：{{ item.remark }}</view>
+							<view class="info-line">姓名：{{item.name}}</view>
+							<view class="info-line">类别：{{item.orderStatus}}</view>
+							<view class="info-line">技能介绍：{{ item.skillDescribe }}</view>
 						</view>
 
 						<!-- 右侧信息 -->
 						<view class="item-right">
-							<view class="rating">评分：9.5</view>
+							<!-- ，，orderStatus=0，未开始，=2已完成 -->
+							
+							<view class="rating" v-if="score">评分：9.5</view>
 							<up-tag text="标签" plain size="mini" class="tag"></up-tag>
 							<up-button type="primary" text="沟通" size="small" class="action-btn"
 								@click="handlClick(item)"></up-button>

pages/goodsDetails/goodsDetails.vue

@@ -87,7 +87,7 @@
 
 				<view class="Wrap-content6">
 					<text style="margin-left: 15rpx;">备注：</text>
-					<up-input placeholder="请输入内容" border="surround" v-model="value" @change="change"></up-input>
+					<up-input placeholder="请输入内容" border="surround" v-model="skillDescribe" @change="change"></up-input>
 				</view>
 				<view class="Wrap-detils-btn">
 					<up-button type="primary" shape="circle" :customStyle="wrapqx" @click="handlCancel">取消</up-button>
@@ -181,7 +181,6 @@
 
 	const src = ref('http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg')
 	const onePrice = ref(400)
-	const value = ref(''); //备注响应式
 	const volunteerId = ref(''); // 存储志愿者ID
 	const serviceCategory = ref('') //存储大类别
 	const doorToDoorTimeArr = ref([]) // 完整时间范围
@@ -197,7 +196,7 @@
 	const show = ref(false); //立即购买
 	const showSum = ref(false);
 	const showNotify = ref(false) //支付成功提示
-
+	const skillDescribe = ref('')//备注
 
 	const computeMoney = computed(() => {
 		return totalTimes.value * onePrice.value
@@ -339,7 +338,6 @@
 
 	// 获取志愿者排班时间
 	const getByDate = async (date = doorToDoorTimeArr.value[0]) => {
-		currentDate.value.push(date)
 		console.log(date, '获取日期2')
 		if (!volunteerId.value) {
 			console.error('volunteerId 为空');
@@ -371,6 +369,8 @@
 
 	// 点击具体时间触发
 	const getByTime = (timeObj) => {
+		console.log('>>>>>>触发111');
+		currentDate.value.push(timeObj.yearToDate)
 		currentTime.value = timeObj.hours
 		totalTimes.value += 1 // 记录点击次数
 	}
@@ -379,7 +379,7 @@
 	const upPopupOpen = () => { //显示时初始化预存储信息数据
 		totalTimes.value = 0
 		currentTime.value = ''
-		if (doorToDoorTimeArr.value.length) currentDate.value = [doorToDoorTimeArr.value[0]]
+		currentDate.value = []
 	}
 
 	// 确认购买
@@ -397,7 +397,8 @@
 				paymentMethod: 1,
 				addressId: 7,
 				remark: "我是图图小淘气，面对世界很好奇！",
-				volunteerId: volunteerId.value
+				volunteerId: volunteerId.value,
+				skillDescribe:skillDescribe.value
 			},
 			workDateList: [
 				// {
@@ -406,7 +407,8 @@
 			]
 		};
 
-		(new Set(currentDate.value)).forEach((item) => {
+
+		currentDate.value.length && (new Set(currentDate.value)).forEach((item) => {
 			orderData.workDateList.push({
 				workDate: item,
 				workStartTime: currentTime.value,

pages_classify/pages/orderItem/orderdetails.vue

@@ -51,15 +51,17 @@
 				<up-list-item v-for="(item, index) in listData.secondOrderList" :key="index">
 					<view class="Wrap-top">
 						<text>第一节课</text>
-						<text>{{item.createTime}}</text>
+
 					</view>
 					<view class="list-item">
 						<image src="/static/img/dd.png" mode="aspectFill" class="item-image"></image>
+						<!-- 状态：orderStatus: 0未开始 ，1进行中，2已完成-->
+						<!-- score如果=null，显示待评价， -->
 
 						<view class="item-info">
-							<view class="info-line">姓名：王麻子</view>
-							<view class="info-line">类别：刨土豆</view>
-							<view class="info-line">技能介绍：{{item.remark}}</view>
+							<view class="info-line">类别：serviceCategory</view>
+							<text>开始日期：{{item.workDate}}</text>
+							<text>开始时间: {{item.workStartTime}}</text>
 						</view>
 						<view class="item-right">
 							<view class="rating">评分：9.5</view>
@@ -85,7 +87,7 @@
 	} from "@/api/userList.js";
 
 	const listData = ref(); //志愿者详情数据
-	
+
 	const mainOrderId = ref(''); //志愿者ID
 	// 获取传递的参数
 	onLoad(async (options) => {
@@ -93,7 +95,7 @@
 		const res = await orderInfomainOrderId(mainOrderId.value)
 		listData.value = res.data;
 		console.log(listData.value, '获取用户详情')
-		
+
 	});
 </script>