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 @@ 完成时间:{{item.workFinishTime}} + + + + 完工图片 + + + + + + + + + 备注:{{item.remark}} + + @@ -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