From 481b7cd763f8bddc1b23c66088c24fafd1d77432 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 20 Jun 2022 18:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=97=B6=E9=97=B4=E6=AE=B5=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/globalData.js      | 40 ++++++++++++++++++++++----
 pages/my/my-order.vue        |  6 ++--
 pages/my/serv-detail.vue     |  4 +--
 pages/order/order-detail.vue | 56 +++++++++++++++++++++++++++---------
 style/default.css            |  7 +++++
 5 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/common/js/globalData.js b/common/js/globalData.js
index 5699531..00f2545 100644
--- a/common/js/globalData.js
+++ b/common/js/globalData.js
@@ -1,6 +1,34 @@
-export default {
-	deptId: 101,
-	from: 'customer',
-	initPageNum: 1,
-	initPageSize: 20
-}
\ No newline at end of file
+export default {
+	deptId: 101,
+	from: 'customer',
+	initPageNum: 1,
+	initPageSize: 20,
+	timeRangeList: [
+		'08:00-08:30',
+		'08:30-09:00',
+		'09:00-09:30',
+		'09:30-10:00',
+		'10:00-10:30',
+		'10:30-11:00',
+		'11:00-11:30',
+		'11:30-12:00',
+		'12:00-12:30',
+		'12:30-13:00',
+		'13:00-13:30',
+		'13:30-14:00',
+		'14:00-14:30',
+		'14:30-15:00',
+		'14:30-15:00',
+		'15:00-15:30',
+		'15:30-16:00',
+		'16:00-16:30',
+		'16:30-17:00',
+		'17:00-17:30',
+		'17:30-18:00',
+		'18:00-18:30',
+		'18:30-19:00',
+		'19:00-19:30',
+		'19:30-20:00'
+	],
+	timeRangeSplit: '-'
+}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 38aed85..16c747a 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -30,10 +30,10 @@
 					<view class='cu-tag bg-yellow radius margin-right-sm' v-if="tabCur === 3" @click="showServDetail(shopOrder)">查看订单详情</view>
 				</view>
 				<view class="padding-lr">
-					<view class="margin-top-sm">
+					<view class="margin-top-sm" @click="showServDetail(shopOrder)">
 						<product-picked :product="shopOrder" :pickedList="shopOrder.standardList"></product-picked>
 					</view>
-					<view class="flex justify-end align-end padding-bottom-sm">
+					<view class="flex justify-end align-end padding-bottom-sm" @click="showServDetail(shopOrder)">
 						<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text>
 						</view>
 						<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
@@ -89,7 +89,7 @@
 						class="padding-tb-sm solid-top">
 						<view>约定服务时间：</view>
 						<view class="flex justify-between align-end">
-							<view>{{shopOrder.serverTime}}</view>
+							<view>{{shopOrder.expectTimeStart + '~' + shopOrder.expectTimeEnd}}</view>
 							<view>
 								<button v-if="shopOrder.agreedServTime.customerAgreeStatus === 1"
 									class="cu-btn sm bg-yellow margin-right-sm"
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 2567df2..196f556 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -50,7 +50,7 @@
 			</view>
 			<view class="margin-top-sm">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
-				<text>预约时间：{{servDetail.serverTime}}</text>
+				<text>预约时间：{{servDetail.expectTimeStart + '~' + servDetail.expectTimeEnd}}</text>
 			</view>
 			<!-- <view class="margin-top-sm">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
@@ -85,7 +85,7 @@
 		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.orderStandardDetailList">
 			<view class="cu-bar solid-bottom">
 				<view class="action bar-first-action">
-					<text class="cuIcon-titles text-main-color"></text> 实施单完成记录
+					<text class="cuIcon-titles text-main-color"></text> 子单完成记录
 				</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm'>编码:{{item.orderDetailCode}}</view>
 			</view>
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index e8b9561..99f8316 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -40,13 +40,20 @@
 		</view>
 		<!-- 预约时间 -->
 		<view class="margin-lr-sm margin-top-sm bg-white padding">
-			<view class="flex justify-between align-center">
+			<view class="flex justify-between">
 				<text class="text-black">预约时间</text>
-				<uni-datetime-picker @change="changeDoorTime">
-					<view v-if="formInfo.doorTime" class="text-sm">{{formInfo.doorTime}}<text class="text-bold cuIcon-right"></text>
-					</view>
-					<view v-else class="text-red text-sm">请选择上门时间<text class="text-bold cuIcon-right"></text></view>
-				</uni-datetime-picker>
+				<view class="flex justify-end align-center">
+					<uni-datetime-picker @change="changeDoorTime" type="date">
+						<view v-if="formInfo.doorTime">
+							<text>{{formInfo.doorTime}}</text>
+						</view>
+						<view v-else class="text-red text-sm">请选择上门时间<text class="text-bold cuIcon-right"></text></view>
+					</uni-datetime-picker>
+					<picker class="margin-left-xs" v-if="formInfo.doorTime" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
+						@change="timeRangeChange">
+						<input class="radius-input time-picker" v-model="timeRange" disabled></input>
+					</picker>
+				</view>
 			</view>
 			<view class="text-sm text-gray margin-top-sm"><text
 					class="cuIcon-question">选择的为期望上门时间，稍后工程师将与你确认具体上门时间</text></view>
@@ -150,9 +157,14 @@
 					isNeedBill: '0',
 					comments: '',
 					doorTime: null,
-					defaultAddress: null
+					defaultAddress: null,
+					expectTimeStart: '',
+					expectTimeEnd: ''
 				},
-				totalPrice: 0
+				totalPrice: 0,
+				timeRangeIndex: 0,
+				timeRange: '',
+				timeRangeList: []
 			}
 		},
 		onLoad(options) {
@@ -167,8 +179,9 @@
 			async loadData(params) {
 				console.log(params)
 				// this.pickedProductList = await this.$api.data('pickedProductList');
-				this.pickedProductList = params.pickedProductList;
-				this.formInfo.defaultAddress = await this.$api.data('defaultAddress');
+				this.pickedProductList = params.pickedProductList;
+				this.timeRangeList = this.$globalData.timeRangeList;
+				this.timeRange = this.timeRangeList[0];
 			},
 			bindEvent() {
 				uni.$on(this.$globalFun.CHOOSE_ADDRESS, this.chooseAddress);
@@ -194,7 +207,19 @@
 				this.formInfo.defaultAddress = addressInfo;
 			},
 			changeDoorTime(value) {
-				this.formInfo.doorTime = value;
+				this.formInfo.doorTime = value;
+				this.changeExpectTime();
+			},
+			timeRangeChange(e) {
+				this.timeRangeIndex = e.detail.value;
+				this.timeRange = this.timeRangeList[this.timeRangeIndex];
+				this.changeExpectTime();
+			},
+			changeExpectTime() {
+				let timeRangeSplit = this.$globalData.timeRangeSplit;
+				let timeArr = this.timeRange.split(timeRangeSplit);
+				this.formInfo.expectTimeStart = this.formInfo.doorTime + ' ' + timeArr[0] + ':00';
+				this.formInfo.expectTimeEnd = this.formInfo.doorTime + ' ' + timeArr[1] + ':00';
 			},
 			parseGoodsList() {
 				let goodsList = [];
@@ -218,7 +243,7 @@
 					})
 					return false;
 				}
-				if (!this.formInfo.doorTime) {
+				if (!this.formInfo.doorTime || !this.formInfo.expectTimeEnd || !this.formInfo.expectTimeStart) {
 					uni.showToast({
 						title: '请选择上门时间',
 						icon: 'none'
@@ -235,7 +260,8 @@
 				let curUserInfo = this.$request.getCurUserInfo();
 				let params = {
 					customerId: curUserInfo.customerId,
-					serverTime: this.formInfo.doorTime,
+					expectTimeStart: this.formInfo.expectTimeStart,
+					expectTimeEnd: this.formInfo.expectTimeEnd,
 					addressId: this.formInfo.defaultAddress.customerAddressId,
 					payType: this.formInfo.payWay,
 					remark: this.formInfo.comments,
@@ -308,5 +334,9 @@
 
 	.cu-progress.sm {
 		height: 12rpx;
+	}
+	
+	.time-picker {
+		width: 180rpx;
 	}
 </style>
diff --git a/style/default.css b/style/default.css
index 5a690b8..e6318ed 100644
--- a/style/default.css
+++ b/style/default.css
@@ -100,4 +100,11 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
+}
+
+.radius-input {
+	border: 1rpx solid rgba(0, 0, 0, 0.1);
+	border-radius: 10rpx;
+	padding: 11rpx;
+	box-sizing: content-box;
 }
\ No newline at end of file