From a9cdaf1c4018d6384db9782e82e3254bb5b08cca Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 28 Jul 2022 02:01:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=88=E5=82=85=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=9B=BE=E7=89=87=E5=8F=8A=E5=A4=87=E6=B3=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                     |  3 +++
 pages/my/components/modal/urgent-msg.vue |  2 +-
 pages/my/serv-detail.vue                 | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/common/js/request.js b/common/js/request.js
index 58e50a4..5fff12e 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -70,6 +70,9 @@ export default {
 		let res = await wx.getLocation({
 			type: 'gcj02'
 		})
+		if (!res || !res.latitude) {
+			return;
+		}
 		let areaRes = await this.baiduGetLoacation(res.latitude, res.longitude);
 		areaRes = areaRes.data;
 		if (areaRes) {
diff --git a/pages/my/components/modal/urgent-msg.vue b/pages/my/components/modal/urgent-msg.vue
index 085d08d..e52f630 100644
--- a/pages/my/components/modal/urgent-msg.vue
+++ b/pages/my/components/modal/urgent-msg.vue
@@ -69,7 +69,7 @@
 			},
 			sendUrgentMsg(e) {
 				uni.showToast({
-					icon: 'none'
+					icon: 'none',
 					title: '功能开发中'
 				})
 			},
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 0d17265..2373bd4 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -102,6 +102,21 @@
 				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
 				<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></simple-product-picked>
 			</view>
+			<view v-if="servDetail.orderStatus > 3 && item.finishImgList && item.finishImgList.length" class="bg-white">
+				<view class="cu-bar solid-bottom">
+					<view class="action bar-first-action">
+						<text class="cuIcon-title text-main-color"></text> 完工图片
+					</view>
+				</view>
+				<view class="grid col-3 grid-square flex-sub margin-top-sm">
+					<view class="bg-img" v-for="(imgUrl, index) in item.finishImgList" :key="index">
+						<image :src="imgUrl" @tap="viewImage($event, [imgUrl])" :data-url="imgUrl" mode="aspectFill"></image>
+					</view>
+				</view>
+				<view>
+					<text>备注：{{item.remark}}</text>
+				</view>
+			</view>
 		</view>
 		<!-- 订单编码和时间 -->
 		<view class="bg-white margin-top-sm padding margin-lr-sm margin-bottom-with-bar">
@@ -214,6 +229,12 @@
 			decideIfCancelOrder() {
 				this.$refs.confirmModal.showModal();
 			},
+			viewImage(e, imgList) {
+				uni.previewImage({
+					urls: imgList,
+					current: e.currentTarget.dataset.url
+				});
+			},
 			async cancelOrder(e) {
 				let res = await this.$request.cancelMasterOrder({
 					orderMasterId: this.servDetail.orderMasterId