From f7269ff824627a6760e51072af867ddf8aa3bdd8 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 23 Oct 2022 00:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E5=8A=9F=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E6=A1=86=E5=8F=B3=E4=BE=A7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E7=AE=AD=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                          |  6 ++---
 .../order-manage/modal/edit-time-arrange.vue  | 22 +++++++++++++++----
 .../modal/new-serv-price-offline.vue          |  2 +-
 .../modal/new-serv-price-online.vue           |  2 +-
 pages/order-manage/modal/time-arrange.vue     | 22 +++++++++++++++----
 pages/order-manage/order-manage.vue           |  4 +++-
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 514e521..c9ea711 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,9 +13,9 @@ export default {
 				})
 				let userInfo = _this.getCurUserInfo();
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
-				// args.url = 'http://192.168.2.42:80' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'http://192.168.2.50:80' + args.url;
 				
 				if (!args.data) {
 					args.data = {}
diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue
index 9bd1887..3c3a7bd 100644
--- a/pages/order-manage/modal/edit-time-arrange.vue
+++ b/pages/order-manage/modal/edit-time-arrange.vue
@@ -21,8 +21,10 @@
 				<view class="padding">
 					<view class="margin-bottom-xs">
 						<view class="margin-bottom-xs">选择日期：</view>
-						<picker mode="date" :value="date" :start="curDate" @change="dateChange">
-							<input class="radius-input" v-model="date" disabled></input>
+						<picker class="relative-view" mode="date" :value="date" :start="curDate" @change="dateChange">
+							<input class="radius-input" v-model="date" disabled>
+								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+							</input>
 						</picker>
 					</view>
 					<view>
@@ -32,9 +34,11 @@
 							<input class="radius-input" v-model="time"></input>
 						</picker>
 						<text class="margin-lr-xs">或</text> -->
-						<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
+						<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
 							@change="timeRangeChange">
-							<input class="radius-input" v-model="timeRange" disabled></input>
+							<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>
@@ -180,5 +184,15 @@
 		right: 35rpx;
 		top: 35rpx;
 		z-index: 1;
+	}
+	
+	.relative-view {
+		position: relative;
+	}
+	
+	.input-arrow {
+		position: absolute;
+		right: 10rpx;
+		top: 25%;
 	}
 </style>
diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue
index e41525a..70e0b5f 100644
--- a/pages/order-manage/modal/new-serv-price-offline.vue
+++ b/pages/order-manage/modal/new-serv-price-offline.vue
@@ -178,6 +178,6 @@
 
 <style scoped>
 	.inline-input {
-		flex-basis: 25%;
+		flex-basis: 30%;
 	}
 </style>
diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue
index 4bc9851..5d4ffda 100644
--- a/pages/order-manage/modal/new-serv-price-online.vue
+++ b/pages/order-manage/modal/new-serv-price-online.vue
@@ -178,6 +178,6 @@
 
 <style scoped>
 	.inline-input {
-		flex-basis: 25%;
+		flex-basis: 30%;
 	}
 </style>
diff --git a/pages/order-manage/modal/time-arrange.vue b/pages/order-manage/modal/time-arrange.vue
index c3cb64a..745350d 100644
--- a/pages/order-manage/modal/time-arrange.vue
+++ b/pages/order-manage/modal/time-arrange.vue
@@ -21,8 +21,10 @@
 				<view class="padding">
 					<view class="margin-bottom-xs">
 						<view class="margin-bottom-xs">选择日期：</view>
-						<picker mode="date" :value="date" :start="curDate" @change="dateChange">
-							<input class="radius-input" v-model="date" disabled></input>
+						<picker class="relative-view" mode="date" :value="date" :start="curDate" @change="dateChange">
+							<input class="radius-input" v-model="date" disabled>
+								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+							</input>
 						</picker>
 					</view>
 					<view>
@@ -32,9 +34,11 @@
 							<input class="radius-input" v-model="time" disabled></input>
 						</picker>
 						<text class="margin-lr-xs">或</text> -->
-						<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
+						<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
 							@change="timeRangeChange">
-							<input class="radius-input" v-model="timeRange" disabled></input>
+							<input class="radius-input" v-model="timeRange" disabled>
+								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+							</input>
 						</picker>
 					</view>
 				</view>
@@ -152,5 +156,15 @@
 		right: 35rpx;
 		top: 35rpx;
 		z-index: 1;
+	}
+	
+	.relative-view {
+		position: relative;
+	}
+	
+	.input-arrow {
+		position: absolute;
+		right: 10rpx;
+		top: 25%;
 	}
 </style>
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index bd33e43..f0102e6 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -190,6 +190,8 @@
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="recordClockInLocation(order)" v-show="order.orderDetailId != null && !order.clockInLocation">打卡到达</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOffline" data-modal="showNewServPriceOfflineModal" v-show="order.orderDetailId != null && order.clockInLocation && order.payType === 1">报价/完单</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.clockInLocation && order.payType === 0">报价/完单</button>
+				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOffline" data-modal="showNewServPriceOfflineModal" v-show="order.orderDetailId != null && order.payType === 1">报价/完单</button> -->
+				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.payType === 0">报价/完单</button> -->
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">重新排期</button>
 				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1" v-show="order.orderDetailId != null">发起完单</button> -->
@@ -1053,7 +1055,7 @@
 				if (!res || !res.latitude) {
 					uni.showToast({
 						title: '定位获取失败，打卡失败，请稍后重试',
-						icon: 'error',
+						icon: 'none',
 						duration: 2500
 					})
 				} else {