From 957381e361f578df6cb7bff9d6d3b0f6bf78b799 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 27 Oct 2022 00:44:47 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E9=87=8D=E6=8E=92=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=B8=AD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=82=B9=202=E3=80=81=E9=A2=84=E7=BA=A6=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=E5=8F=8A=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/globalData.js                       | 31 ++--------
 manifest.json                                 |  2 +-
 pages/demand-center/accept-demand-center.vue  |  3 +-
 pages/demand-center/demand-detail.vue         |  3 +-
 pages/index/index-home.vue                    |  4 +-
 .../order-manage/modal/edit-time-arrange.vue  | 61 +++++++++++++------
 .../order-manage/modal/reject-after-sale.vue  |  1 -
 pages/order-manage/modal/time-arrange.vue     | 59 ++++++++++++------
 pages/order-manage/order-manage.vue           | 14 +++--
 pages/order-manage/serv-detail.vue            |  6 +-
 style/default.css                             |  4 ++
 11 files changed, 113 insertions(+), 75 deletions(-)

diff --git a/common/js/globalData.js b/common/js/globalData.js
index 744f71f..9f5e7dc 100644
--- a/common/js/globalData.js
+++ b/common/js/globalData.js
@@ -4,31 +4,12 @@ export default {
 	initPageNum: 1,
 	initPageSize: 10,
 	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'
+		'08:00-10:00',
+		'10:00-12:00',
+		'12:00-14:00',
+		'14:00-16:00',
+		'16:00-18:00',
+		'18:00-19:00'
 	],
 	timeRangeSplit: '-'
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index edced26..1ce1c75 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
         /* 小程序特有相关 */
         "appid" : "wx105ce607b514ff2a",
         "setting" : {
-            "urlCheck" : true,
+            "urlCheck" : false,
             "minified" : true
         },
         "usingComponents" : true,
diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue
index ae2b3bc..1ccc300 100644
--- a/pages/demand-center/accept-demand-center.vue
+++ b/pages/demand-center/accept-demand-center.vue
@@ -77,7 +77,8 @@
 				</view>
 				<view class="margin-top-sm">
 					<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text>
-					<text>{{task.expectTimeStart + '~' + task.expectTimeEnd}}</text>
+					<text v-if="task.expectTimeEndFront">{{task.expectTimeStartFront + '~' + task.expectTimeEndFront}}</text>
+					<text v-else>{{task.expectTimeStartFront}}</text>
 				</view>
 				<view class="margin-top-sm">
 					<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>
diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue
index 11e1879..b85949a 100644
--- a/pages/demand-center/demand-detail.vue
+++ b/pages/demand-center/demand-detail.vue
@@ -24,7 +24,8 @@
 			</view>
 			<view class="margin-top-sm">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text>
-				<text>{{order.expectTimeStart + '~' + order.expectTimeEnd}}</text>
+				<text v-if="order.expectTimeEndFront">{{order.expectTimeStartFront + '~' + order.expectTimeEndFront}}</text>
+				<text v-else>{{order.expectTimeStartFront}}</text>
 			</view>
 			<view class="margin-top-sm">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 90ed355..1eb04ff 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -61,7 +61,9 @@
 								<view class="text-lg">{{item.goodsName}}</view>
 							</view>
 							<view>
-								时间：<text class="text-red">{{item.expectTimeStart + ' - ' + item.expectTimeEnd}}</text>
+								时间：
+								<text class="text-red" v-if="item.expectTimeEndFront">{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</text>
+								<text v-else>{{item.expectTimeStartFront}}</text>
 							</view>
 							<view>地址：{{item.address}}</view>
 						</view>
diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue
index 3c3a7bd..a49d99c 100644
--- a/pages/order-manage/modal/edit-time-arrange.vue
+++ b/pages/order-manage/modal/edit-time-arrange.vue
@@ -29,17 +29,21 @@
 					</view>
 					<view>
 						<view class="margin-bottom-xs">选择时间：</view>
-						<!-- <picker mode="time" :value="'08:00'" :start="'08:00'" :end="'20:00'"
-							@change="timeChange">
-							<input class="radius-input" v-model="time"></input>
-						</picker>
-						<text class="margin-lr-xs">或</text> -->
-						<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
-							@change="timeRangeChange">
-							<input class="custom-input radius-input" v-model="timeRange" disabled>
-								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
-							</input>
-						</picker>
+						<view class="flex justify-start align-center">
+							<picker class="relative-view" :class="disableTime ? 'readonlyPicker' : ''" mode="time" :value="''" :start="'08:00'" :end="'19:00'"
+								@change="timeChange" @click="showTime">
+								<input class="custom-input radius-input" v-model="time" disabled>
+									<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+								</input>
+							</picker>
+							<text class="margin-lr-xs">或</text>
+							<picker class="relative-view" :class="!disableTime ? 'readonlyPicker' : ''" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
+								@change="timeRangeChange" @click="showDuration">
+								<input class="custom-input radius-input" v-model="timeRange" disabled>
+									<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+								</input>
+							</picker>
+						</view>
 					</view>
 				</view>
 				<view class="padding-top-sm padding">
@@ -57,7 +61,7 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="margin-top uni-textarea">
+					<view class="margin-top">
 						<textarea class="solid padding-sm" maxlength="-1" @input="inputSpecificReason"
 							placeholder="具体情况(选填)" />
 					</view>
@@ -102,7 +106,8 @@
 				timeRange: '',
 				timeRangeIndex: 0,
 				expectTimeStart: null,
-				expectTimeEnd: null
+				expectTimeEnd: null,
+				disableTime: false
 			}
 		},
 		onReady() {
@@ -123,20 +128,38 @@
 			dateChange(e) {
 				this.date = e.detail.value;
 				this.changeExpectTime();
+			},
+			showTime() {
+				this.disableTime = false;
+			},
+			showDuration() {
+				this.disableTime = true;
 			},
-			timeChange(e) {
-				this.time = e.detail.value;
+			timeChange(e) {
+				let time = e.detail.value;
+				if (time === '00:00') {
+					time = '08:00';
+				}
+				this.time = time;
+				this.timeRange = null;
+				this.changeExpectTime();
 			},
 			timeRangeChange(e) {
 				this.timeRangeIndex = e.detail.value;
 				this.timeRange = this.timeRangeList[this.timeRangeIndex];
+				this.time = null;
 				this.changeExpectTime();
 			},
 			changeExpectTime() {
-				let timeRangeSplit = this.$globalData.timeRangeSplit;
-				let timeArr = this.timeRange.split(timeRangeSplit);
-				this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00';
-				this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00';
+				if (this.time) {
+					this.expectTimeStart = this.date + ' ' + this.time + ':00';
+					this.expectTimeEnd = null;
+				} else if (this.timeRange) {
+					let timeRangeSplit = this.$globalData.timeRangeSplit;
+					let timeArr = this.timeRange.split(timeRangeSplit);
+					this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00';
+					this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00';
+				}
 			},
 			hideModal(e) {
 				this.resetData();
diff --git a/pages/order-manage/modal/reject-after-sale.vue b/pages/order-manage/modal/reject-after-sale.vue
index c860326..dc60568 100644
--- a/pages/order-manage/modal/reject-after-sale.vue
+++ b/pages/order-manage/modal/reject-after-sale.vue
@@ -72,7 +72,6 @@
 		},
 		data() {
 			return {
-				show: false,
 				reasonType: null,
 				remark: null,
 				imgList: []
diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue
index 745350d..5eeffb3 100644
--- a/pages/order-manage/modal/time-arrange.vue
+++ b/pages/order-manage/modal/time-arrange.vue
@@ -27,19 +27,23 @@
 							</input>
 						</picker>
 					</view>
-					<view>
+					<view>
 						<view class="margin-bottom-xs">选择时间：</view>
-						<!-- <picker mode="time" :value="'08:00'" :start="'08:00'" :end="'20:00'"
-							@change="timeChange">
-							<input class="radius-input" v-model="time" disabled></input>
-						</picker>
-						<text class="margin-lr-xs">或</text> -->
-						<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
-							@change="timeRangeChange">
-							<input class="radius-input" v-model="timeRange" disabled>
-								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
-							</input>
-						</picker>
+						<view class="flex justify-start align-center">
+							<picker class="relative-view" :class="disableTime ? 'readonlyPicker' : ''" mode="time" :value="''" :start="'08:00'" :end="'19:00'"
+								@change="timeChange" @click="showTime">
+								<input class="custom-input radius-input" v-model="time" disabled>
+									<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+								</input>
+							</picker>
+							<text class="margin-lr-xs">或</text>
+							<picker class="relative-view" :class="!disableTime ? 'readonlyPicker' : ''" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
+								@change="timeRangeChange" @click="showDuration">
+								<input class="custom-input radius-input" v-model="timeRange" disabled>
+									<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+								</input>
+							</picker>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -80,7 +84,8 @@
 				timeRange: null,
 				timeRangeIndex: 0,
 				expectTimeStart: null,
-				expectTimeEnd: null
+				expectTimeEnd: null,
+				disableTime: false
 			}
 		},
 		onReady() {
@@ -101,20 +106,38 @@
 			dateChange(e) {
 				this.date = e.detail.value;
 				this.changeExpectTime();
+			},
+			showTime() {
+				this.disableTime = false;
+			},
+			showDuration() {
+				this.disableTime = true;
 			},
 			timeChange(e) {
-				this.time = e.detail.value;
+				let time = e.detail.value;
+				if (time === '00:00') {
+					time = '08:00';
+				}
+				this.time = time;
+				this.timeRange = null;
+				this.changeExpectTime();
 			},
 			timeRangeChange(e) {
 				this.timeRangeIndex = e.detail.value;
 				this.timeRange = this.timeRangeList[this.timeRangeIndex];
+				this.time = null;
 				this.changeExpectTime();
 			},
 			changeExpectTime() {
-				let timeRangeSplit = this.$globalData.timeRangeSplit;
-				let timeArr = this.timeRange.split(timeRangeSplit);
-				this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00';
-				this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00';
+				if (this.time) {
+					this.expectTimeStart = this.date + ' ' + this.time + ':00';
+					this.expectTimeEnd = null;
+				} else if (this.timeRange) {
+					let timeRangeSplit = this.$globalData.timeRangeSplit;
+					let timeArr = this.timeRange.split(timeRangeSplit);
+					this.expectTimeStart = this.date + ' ' + timeArr[0] + ':00';
+					this.expectTimeEnd = this.date + ' ' + timeArr[1] + ':00';
+				}
 			},
 			hideModal(e) {
 				this.resetData();
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index f0102e6..7a36ef2 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -132,7 +132,8 @@
 			</view>
 			<view class="margin-top-sm">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
-				<text>服务时间：{{order.expectTimeStart + '~' + order.expectTimeEnd}}</text>
+				<text v-if="order.expectTimeEndFront">服务时间：{{order.expectTimeStartFront + '~' + order.expectTimeEndFront}}</text>
+				<text v-else>服务时间：{{order.expectTimeStartFront}}</text>
 			</view>
 			<view class="margin-top-sm" v-if="order.orderDetailId != null && order.orderStatus > 2">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
@@ -142,10 +143,10 @@
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-repair"></text></text>
 				<text>距上门：</text>
 				<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
-					:day="$dateUtil.countDownDiff(order.expectTimeEnd).day" 
-					:hour="$dateUtil.countDownDiff(order.expectTimeEnd).hour" 
-					:minute="$dateUtil.countDownDiff(order.expectTimeEnd).min" 
-					:second="$dateUtil.countDownDiff(order.expectTimeEnd).seconds">
+					:day="$dateUtil.countDownDiff(order.expectTimeStart).day" 
+					:hour="$dateUtil.countDownDiff(order.expectTimeStart).hour" 
+					:minute="$dateUtil.countDownDiff(order.expectTimeStart).min" 
+					:second="$dateUtil.countDownDiff(order.expectTimeStart).seconds">
 				</uni-countdown>
 			</view>
 			<view class="margin-top-sm" v-if="order.orderDetailId != null && order.orderStatus > 3">
@@ -793,7 +794,8 @@
 				let params = datetimeArr && datetimeArr.length > 1 ? {
 					id: id,
 					expectTimeStart: datetimeArr[0],
-					expectTimeEnd: datetimeArr[1]
+					expectTimeEnd: datetimeArr[1],
+					useTimeNotRange: datetimeArr[1] == null ? true : false
 				} : {
 					id: id,
 					revTime: datetime
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index 122547b..714cd1c 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -60,7 +60,8 @@
 			</view>
 			<view class="margin-top-sm">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
-				<text>预约时间：{{servDetail.expectTimeStart + '~' + servDetail.expectTimeEnd}}</text>
+				<text v-if="servDetail.expectTimeEndFront">预约时间：{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}}</text>
+				<text v-else>预约时间：{{servDetail.expectTimeStartFront}}</text>
 			</view>
 			<!-- <view class="margin-top-sm">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
@@ -131,7 +132,8 @@
 				<text class="margin-right-xs">联系方式：{{item.workerPhone}}</text>
 				<button class="cu-btn line-main-color sm" @click="makePhoneCall(item.workerPhone)">拨打</button>
 			</view>
-			<view class="margin-top-sm">预约时间：{{item.expectTimeStart + '~' + item.expectTimeEnd}}</view>
+			<view class="margin-top-sm" v-if="item.expectTimeEndFront">预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</view>
+			<view class="margin-top-sm" v-else>预约时间：{{item.expectTimeStartFront}}</view>
 			<view class="margin-top-sm" v-if="item.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>
 			<view class="margin-top-sm" v-if="item.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
 			<view class="margin-top-sm">
diff --git a/style/default.css b/style/default.css
index 9a01df4..4b7e3aa 100644
--- a/style/default.css
+++ b/style/default.css
@@ -280,3 +280,7 @@
 	-ms-transform: translateX(-50%) translateY(-50%);
 	transform: translateX(-50%) translateY(-50%);
 }
+
+.readonlyPicker {
+	background-color: #EEEEEE;
+}
\ No newline at end of file