From 59e80b2a8f81aa6c6a25097a25be70614c4ead01 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 30 Oct 2022 15:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=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/request.js     | 6 +++---
 pages/my/serv-detail.vue | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 43bc4f3..c7ae812 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -1,7 +1,7 @@
 import globalData from '@/common/js/globalData.js';
 
 export default {
-	address: 'https://www.opsoul.com',
+	address: 'https://www.opsoul.com:8881',
 	// 异步接口拦截
 	addInterceptor() {
 		uni.addInterceptor('request', {
@@ -11,9 +11,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com:8881' + args.url;
+				args.url = 'https://www.opsoul.com:8881' + args.url;
 				// args.url = 'http://192.168.2.42:80' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 4877a8f..4a0f52c 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -103,7 +103,8 @@
 			<view class="margin-top-sm">
 				<view>师傅：{{item.workerName}}</view>
 				<view class="margin-top-sm">联系方式：{{item.workerPhone}}</view>
-				<view class="margin-top-sm">预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</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="servDetail.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>
 				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
 				<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders"