Commit 8bae6cc3a031a443d9d6616d639cfc303daa2d78
1 parent
c6b8bf8f
将订单地址写成清运地址;添加处理场所地点;修改评价后无法查看信息
Showing
4 changed files
with
30 additions
and
3 deletions
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | </view> | 20 | </view> |
| 21 | <view class="order-detail-container-header-item" | 21 | <view class="order-detail-container-header-item" |
| 22 | @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)"> | 22 | @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)"> |
| 23 | - <text class="order-detail-container-header-title">订单地点:</text> | 23 | + <text class="order-detail-container-header-title">清运地点:</text> |
| 24 | <view class="order-detail-container-header-content" style="text-decoration: underline"> | 24 | <view class="order-detail-container-header-content" style="text-decoration: underline"> |
| 25 | <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text> | 25 | <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text> |
| 26 | </view> | 26 | </view> |
| @@ -44,6 +44,17 @@ | @@ -44,6 +44,17 @@ | ||
| 44 | {{ dataGram.garOrderTrashType }} | 44 | {{ dataGram.garOrderTrashType }} |
| 45 | </view> | 45 | </view> |
| 46 | </view> | 46 | </view> |
| 47 | + | ||
| 48 | + <view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites"> | ||
| 49 | + <view> | ||
| 50 | + <text class="order-detail-container-header-title" v-if="index == 0">处置场所地点:</text> | ||
| 51 | + <text class="order-detail-container-header-title" v-else> </text> | ||
| 52 | + </view> | ||
| 53 | + <view class="order-detail-container-header-content" style="text-decoration: underline" @click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)"> | ||
| 54 | + <text>{{ disposal.addrStr }}</text> | ||
| 55 | + </view> | ||
| 56 | + </view> | ||
| 57 | + | ||
| 47 | <view class="order-detail-container-header-item"> | 58 | <view class="order-detail-container-header-item"> |
| 48 | <text class="order-detail-container-header-title">订单号:</text> | 59 | <text class="order-detail-container-header-title">订单号:</text> |
| 49 | <view class="order-detail-container-header-content"> | 60 | <view class="order-detail-container-header-content"> |
garbage-removal/src/pages/order-info/order-other/detail/index.vue
| @@ -65,7 +65,7 @@ | @@ -65,7 +65,7 @@ | ||
| 65 | </view> | 65 | </view> |
| 66 | <view class="order-detail-container-header-item" | 66 | <view class="order-detail-container-header-item" |
| 67 | @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)"> | 67 | @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)"> |
| 68 | - <text class="order-detail-container-header-title">订单地点:</text> | 68 | + <text class="order-detail-container-header-title">清运地点:</text> |
| 69 | <view class="order-detail-container-header-content" style="text-decoration: underline"> | 69 | <view class="order-detail-container-header-content" style="text-decoration: underline"> |
| 70 | <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text> | 70 | <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text> |
| 71 | </view> | 71 | </view> |
| @@ -88,7 +88,18 @@ | @@ -88,7 +88,18 @@ | ||
| 88 | <view class="order-detail-container-header-content"> | 88 | <view class="order-detail-container-header-content"> |
| 89 | {{ dataGram.garOrderTrashType }} | 89 | {{ dataGram.garOrderTrashType }} |
| 90 | </view> | 90 | </view> |
| 91 | + </view> | ||
| 92 | + | ||
| 93 | + <view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites"> | ||
| 94 | + <view> | ||
| 95 | + <text class="order-detail-container-header-title" v-if="index == 0">处置场所地点:</text> | ||
| 96 | + <text class="order-detail-container-header-title" v-else> </text> | ||
| 97 | + </view> | ||
| 98 | + <view class="order-detail-container-header-content" style="text-decoration: underline" @click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)"> | ||
| 99 | + <text>{{ disposal.addrStr }}</text> | ||
| 91 | </view> | 100 | </view> |
| 101 | + </view> | ||
| 102 | + | ||
| 92 | <view class="order-detail-container-header-item"> | 103 | <view class="order-detail-container-header-item"> |
| 93 | <text class="order-detail-container-header-title">订单号:</text> | 104 | <text class="order-detail-container-header-title">订单号:</text> |
| 94 | <view class="order-detail-container-header-content"> | 105 | <view class="order-detail-container-header-content"> |
| @@ -400,6 +411,7 @@ const handleContactClick = (val) => { | @@ -400,6 +411,7 @@ const handleContactClick = (val) => { | ||
| 400 | } | 411 | } |
| 401 | 412 | ||
| 402 | const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => { | 413 | const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => { |
| 414 | + console.log(latitude+"=================>"+longitude); | ||
| 403 | // 给出提示确定要跳转吗 | 415 | // 给出提示确定要跳转吗 |
| 404 | uni.showModal({ | 416 | uni.showModal({ |
| 405 | title: '提示', | 417 | title: '提示', |
garbage-removal/src/pages/order-info/order-other/evaluate/index.vue
| @@ -7,7 +7,8 @@ | @@ -7,7 +7,8 @@ | ||
| 7 | size="28" @click="setScore(index + 1)"></u-icon> | 7 | size="28" @click="setScore(index + 1)"></u-icon> |
| 8 | </view> | 8 | </view> |
| 9 | </view> | 9 | </view> |
| 10 | - <textarea v-if="textareaShow" @blur="blur" :value="content" :placeholder="textareaPlaceholder" /> | 10 | + <u-textarea v-if="textareaShow" @blur="blur" :value="content" :placeholder="textareaPlaceholder" style="height: 180rpx"></u-textarea> |
| 11 | + | ||
| 11 | <view class="issue-btn-box"> | 12 | <view class="issue-btn-box"> |
| 12 | <button class="submit-btn" type="primary" @click="doSubmit(orderId, score, evaluateType)">提交评价</button> | 13 | <button class="submit-btn" type="primary" @click="doSubmit(orderId, score, evaluateType)">提交评价</button> |
| 13 | </view> | 14 | </view> |
garbage-removal/src/pages/order/order-disposal/index.vue
| @@ -89,6 +89,9 @@ const handleScan = () => { | @@ -89,6 +89,9 @@ const handleScan = () => { | ||
| 89 | } catch (error) { | 89 | } catch (error) { |
| 90 | uni.$u.toast("无法确认当前二维码趟次,请扫描正在进行的运输趟次"); | 90 | uni.$u.toast("无法确认当前二维码趟次,请扫描正在进行的运输趟次"); |
| 91 | } | 91 | } |
| 92 | + }, | ||
| 93 | + fail:function (res) { | ||
| 94 | + uni.$u.toast("图片扫码失败,请检查二维码图片"); | ||
| 92 | } | 95 | } |
| 93 | }); | 96 | }); |
| 94 | } | 97 | } |