From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 436 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 377 insertions(+), 59 deletions(-)
diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index 94c2c3f..5411e8d 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -13,11 +13,22 @@
<view class="nr-status">
<text>{{info.statusName|| ''}}</text>
<view class="nr-status-type1" v-if="info.type === 0">灏卞湴瀵勫瓨</view>
- <view class="nr-status-type" v-else>鍚屽煄瀵勯��</view>
+ <view class="nr-status-type" v-if="info.type === 1">鍚屽煄瀵勯��</view>
+ <view class="nr-status-type1" v-if="info.type === 1 && info.isUrgent === 0">鏍囬�熻揪</view>
+ <view class="nr-status-type1" v-if="info.type === 1 && info.isUrgent === 1">鏋侀�熻揪</view>
</view>
<view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
- <view class="item" style="padding: 10rpx;">
- <map name="mapAddr"></map>
+ <view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
+ <map
+ name="mapAddr"
+ :latitude="mapLat"
+ :longitude="mapLng"
+ :scale="mapScale"
+ :markers="markers"
+ :polyline="polyline"
+ show-location
+ style="width: 100%; height: 100%;"
+ ></map>
</view>
<view class="item">
<view class="addr">
@@ -28,24 +39,36 @@
<text>{{info.depositShopName || ''}}</text>
<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
</view>
- <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
+ <text>{{info.depositShopAddress || ''}} </text>
</view>
- <view class="addr-item">
+ <view class="addr-item" v-if="info.type === 1">
<view class="ji bg1">鏀�</view>
<view class="addr-item-top">
<text>{{info.takeShopName || info.takeLocation || ''}}</text>
<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
</view>
- <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
+ <text>{{info.takeShopAddress || ''}}</text>
</view>
</view>
- <view class="item-qrcode">
- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image>
+ <view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
+ <!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
+ <view style="width: 360rpx; height: 360rpx;">
+ <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas":style="'width: '+width+'px; height:'+height+'px;'"></canvas>
+ <image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
+ </view>
<text>{{info.memberVerifyCode || ''}}</text>
- <text>鍙栦欢鐮�</text>
+ <text @tap="copyCode(info.memberVerifyCode||'')">鏍搁攢鐮�</text>
</view>
<view class="item-x"></view>
<view class="item-list">
+ <view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜�</view>
+ <view class="item-form-val">{{info.takeUser || ''}}</view>
+ </view>
+ <view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜虹數璇�</view>
+ <view class="item-form-val">{{info.takePhone || ''}}</view>
+ </view>
<view class="item-list-row">
<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
@@ -56,32 +79,65 @@
</view>
<view class="item-list-row">
<view class="item-form-label">鐗╁搧鍚嶇О</view>
- <view class="item-form-val">{{info.typeName || ''}}</view>
+ <view class="item-form-val">{{info.goodTypeName || ''}}</view>
</view>
<view class="item-list-row">
<view class="item-form-label">鐗╁搧鐓х墖</view>
<view class="item-form-list" v-if="info.orderImages && info.orderImages.length">
<view class="item-form-list-row" v-for="(item,index) in info.orderImages" key="item">
<image :src="item" mode="widthFix" @click="previewImage(info.orderImages,index)"></image>
- </view>
+ </view>
</view>
</view>
</view>
</view>
- <view class="item">
+ <!-- <view class="item" v-if="info.refundInfo">
<view class="tuikuan">
<view class="tuikuan-top">
<text>閫�娆鹃噾棰�</text>
- <text>楼{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
+ <text>楼{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
</view>
<view class="tuikuan-bottom">
- <text v-if="info.refundStatus === 0">閫�娆句腑</text>
- <text v-if="info.refundStatus === 1">宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
- <text v-if="info.refundStatus === 2">閫�娆惧け璐�</text>
- <text>{{info.refundTime || ''}}</text>
+ <text v-if="info.refundInfo.status === 0">閫�娆句腑</text>
+ <text v-if="info.refundInfo.status === 1">宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
+ <text v-if="info.refundInfo.status === 2">閫�娆惧け璐�</text>
+ <text v-if="info.refundInfo.status === 1">{{info.refundInfo.refundTime || ''}}</text>
+ <text v-if="info.refundInfo.status !== 1">{{info.refundInfo.createTime || ''}}</text>
+ </view>
+ </view>
+ </view> -->
+ <view class="item" v-if="info.commentStatus === 1">
+ <view class="comment">
+ <view class="comment-top">
+ <text>瀹㈡埛宸茶瘎浠凤細</text>
+ </view>
+ <view class="comment-score">
+ <view class="score-item" v-if="info.depositScore">瀵勪欢闂ㄥ簵: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.depositScore || 1}} </view>
+ <view class="score-item" v-if="info.driverScore">閰嶉�佸徃鏈�: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.driverScore || 1}} </view>
+ <view class="score-item" v-if="info.takeScore">鏀朵欢闂ㄥ簵: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">鈽�</text>{{info.takeScore || 1}} </view>
+ </view>
+ <view class="comment-row" v-if="info.commentImages && info.commentImages.length" >
+ <view class="comment-image" v-for="(item,index) in info.commentImages" key="item">
+ <image :src="item" mode="widthFix" @click="previewImage(info.commentImages,index)"></image>
+ </view>
</view>
</view>
</view>
+ <view class="item" v-if="info.refundInfo">
+ <view class="tuikuan">
+ <view class="tuikuan-top">
+ <text>閫�娆鹃噾棰�</text>
+ <text>{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
+ </view>
+ <view class="tuikuan-bottom">
+ <text v-if="info.refundInfo.status === 0">閫�娆句腑</text>
+ <text v-if="info.refundInfo.status === 1">宸查��鍥炴偍鐨勬敮浠樿处鎴�</text>
+ <text v-if="info.refundInfo.status === 2">閫�娆惧け璐�</text>
+ <text v-if="info.refundInfo.status === 1">{{info.refundInfo.refundTime || ''}}</text>
+ <text v-if="info.refundInfo.status !== 1">{{info.refundInfo.createTime || ''}}</text>
+ </view>
+ </view>
+ </view>
<view class="item" v-if="info.detailList">
<view class="xl">
<view v-for="goods in info.detailList " :key="goods.luggageName" class="xl-item">
@@ -98,7 +154,7 @@
<view class="item-x"></view>
<view class="item-list">
<view class="item-list-row">
- <view class="item-form-label" style="color: #333333; font-size: 28rpx;">鎶ヤ环閲戦</view>
+ <view class="item-form-label" style="color: #333333; font-size: 28rpx;">淇濅环閲戦</view>
<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.declaredAmount || 0)/100).toFixed(2)}}</view>
</view>
<view class="item-list-row">
@@ -118,7 +174,7 @@
<view class="item-infos-item-left">璁㈠崟缂栧彿锛�</view>
<view class="item-infos-item-right">
<text>{{info.code ||''}}</text>
- <image src="/static/icon/ic_cppy@2x.png" mode="widthFix"></image>
+ <image src="/static/icon/ic_cppy@2x.png" mode="widthFix" @tap="copyCode(info.code||'')"></image>
</view>
</view>
<view class="item-infos-item">
@@ -140,7 +196,7 @@
</view>
</view>
<view class="item-infos-item" v-if="info.outTradeNo">
- <view class="item-infos-item-left">浜ゆ槗鍙凤細</view>
+ <view class="item-infos-item-left">浜ゆ槗鍗曞彿锛�</view>
<view class="item-infos-item-right">
<text>{{info.outTradeNo || ''}}</text>
</view>
@@ -157,37 +213,40 @@
<text>{{info.refundTime || ''}}</text>
</view>
</view>
- <view class="item-infos-item" v-if="info.refundAmount">
+ <view class="item-infos-item" v-if="info.refundInfo">
<view class="item-infos-item-left">閫�娆鹃噾棰濓細</view>
<view class="item-infos-item-right">
- <text>楼{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
+ <text>楼{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
</view>
</view>
<view class="item-infos-item" v-if="info.refundRemark">
<view class="item-infos-item-left">閫�娆惧師鍥狅細</view>
<view class="item-infos-item-right">
- <text>{{info.refundRemark || ''}}</text>
+ <text>{{info.refundInfo.refundRemark || ''}}</text>
</view>
</view>
</view>
</view>
<view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
</view>
- <view class="tips" v-if="info.overdue">
+ <view class="tips" v-if="info.overdueStatus !==0 && info.overdueStatus !==2">
<image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
- <text>宸茶秴杩囧彇浠舵椂闂达紝瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+ <text v-if="info.overdueStatus ===1">宸茶秴杩囧彇浠舵椂闂达紝宸蹭骇鐢熻秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+ <text v-if="info.overdueStatus ===3">宸茶秴杩囧彇浠舵椂闂达紝闇�瑕佹敮浠樿秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+ <text v-if="info.overdueStatus ===4">瓒呰繃鍙栦欢鏃堕棿锛屽凡鏀粯瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
</view>
- <view cclass="footer" v-if="info.type===0">
+ <view class="footer" v-if="info.type===0">
<view class="footer-btns">
<view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status==2 || info.status===98">鑱旂郴闂ㄥ簵</view>
<view class="btn kong" v-if="info.status ===0 || info.status ===1" @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
<view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">鍒犻櫎璁㈠崟</view>
<view class="btn you" @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
- <view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >鏍搁攢鐮�</view>
- <view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
+<!-- <view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >鏍搁攢鐮�</view>
+ --> <view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
+ <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus===3 ">绔嬪嵆鏀粯</view>
</view>
</view>
- <view class="footer" v-else>
+ <view class="footer" v-if="info.type===1">
<view class="footer-btns">
<view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status ==2">鑱旂郴闂ㄥ簵</view>
<view class="btn kong" @click="contactPhone(info,2)" v-if="info.status ===3 || info.status ===4 ">鑱旂郴楠戞墜</view>
@@ -196,22 +255,23 @@
<view class="btn you" @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
<view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">鍒犻櫎璁㈠崟</view>
<view class="btn you" @click="cancelOrder(info)" v-if="info.status ===1">鐢宠閫�娆�</view>
- <view class="btn you" v-if="info.status ===1 || (info.takeShopId && info.status ===5)" @click="openQrcode(info)" >鏍搁攢鐮�</view>
- <view class="btn you" @click="doneOrder(info)" v-if="!info.takeShopId && info.status ===5">纭鏀惰揣</view>
+<!-- <view class="btn you" v-if="info.status ===1 || (info.takeShopId && info.status ===5)" @click="openQrcode(info)" >鏍搁攢鐮�</view>
+ --> <view class="btn you" @click="doneOrder(info)" v-if="!info.takeShopId && info.status ===5">纭鏀惰揣</view>
<view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
+ <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus ===3">绔嬪嵆鏀粯</view>
</view>
</view>
<u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true" @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
<view class="phone">
<view class="phone-head">
<view></view>
- <text>鑱旂郴瀹㈡埛</text>
+ <text>{{linkItem.title}}</text>
</view>
<view class="phone-item" >
- <view>
- <image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
- <text>{{linkinfo.linkname||''}} </text>
- <text style="margin-left: 10px;"> {{linkinfo.linkphone||''}}</text>
+ <view @click="contactPhoneDo()" >
+ <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
+ <text>{{linkItem.linkname||''}} </text>
+ <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text>
</view>
</view>
<view style="width: 100%; height: 30rpx;"></view>
@@ -261,24 +321,26 @@
</view>
</view>
</u-popup>
- <u-popup :show="showQrcode" round="15" @close="openQrcode()" :safeAreaInsetBottom="false" mode="bottom" :closeable="true" :closeOnClickOverlay="false">
+ <!-- <u-popup :show="showQrcode" round="15" @close="openQrcode()" :safeAreaInsetBottom="false" mode="bottom" :closeable="true" :closeOnClickOverlay="false">
<view class="tc" style="height: 700rpx;width: 100%; ">
<view class="tc-contemt" style="text-align: center;">
<view class="tc-contemt-title" style="text-align: center;">鏍搁攢鐮�</view>
<view class="qrcode-box">
- <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
+ <canvas canvas-id="qrcodeCanvas1" id="qrcodeCanvas1" style="width: 100px; height: 100px;"></canvas>
<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
</view>
- <text class="pickup-code">{{ currentOrder.memberVerifyCode||'' }}</text>
- <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
+ <text class="pickup-code">{{ info.memberVerifyCode||'' }}</text>
+ <text class="pickup-tip" @tap="copyCode(info.memberVerifyCode||'')">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
</view>
</view>
- </u-popup>
+ </u-popup> -->
</view>
</template>
<script>
import { mapState } from 'vuex'
+ import drawQrcode from 'weapp-qrcode'
+ var amapFile = require('@/utils/amap-wx.130.js')
export default {
computed: {
@@ -287,16 +349,28 @@
data() {
return {
id:null,
+ height:180,
+ width:180,
info:{},
showDone:false,
showCancel:false,
showDelete:false,
showQrcode:false,
showPay:false,
- showPhone:false
+ showPhone:false,
+ linkItem:{title:'',linkname:'',linkphone:''},
+ qrcodeImage:null,
+ mapLat: 0,
+ mapLng: 0,
+ mapScale: 10,
+ markers: [],
+ polyline: []
}
},
onShow() {
+ },
+ onLoad(options) {
+ this.id = options.id
this.info={}
this.showDone=false
this.showCancel=false
@@ -305,9 +379,9 @@
this.showPay=false
this.showPhone=false
this.getUserDetail()
- },
- onLoad(options) {
- this.id = options.id
+ this.width = this.rpxToPx(360)
+ this.height = this.rpxToPx(360)
+ this.linkItem={title:'',linkname:'',linkphone:''}
},
methods:{
previewImage(images,index = 0) {
@@ -316,10 +390,48 @@
urls: images
});
},
+ rpxToPx(rpx) {
+ return rpx * wx.getSystemInfoSync().windowWidth / 750
+ },
payOrder(){
var that = this;
uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
this.$u.api.continuePayOrder({
+ orderId: this.id
+ }).then(res => {
+ uni.hideLoading()
+ if (res.code === 200 && res.data) {
+ let paymentData = res.data.response
+ uni.requestPayment({
+ provider: 'wxpay',
+ timeStamp: paymentData.timeStamp || '',
+ nonceStr: paymentData.nonceStr || '',
+ package: paymentData.package || '',
+ signType: paymentData.signType || 'MD5',
+ paySign: paymentData.paySign || '',
+ success: (res) => {
+ that.getUserDetail()
+ },
+ fail: (err) => {
+ if (err.errMsg.includes('cancel')) {
+ uni.showToast({ title: '宸插彇娑堟敮浠�', icon: 'none' })
+ } else {
+ uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+ }
+ }
+ })
+ } else {
+ uni.showToast({ title: res.msg || '鏀粯澶辫触', icon: 'none' })
+ }
+ }).catch(err => {
+ uni.hideLoading()
+ uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
+ })
+ },
+ payOrderFee(){
+ var that = this;
+ uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
+ this.$u.api.payOverdueFee({
orderId: this.id
}).then(res => {
uni.hideLoading()
@@ -362,13 +474,22 @@
that.getUserDetail()
}
},
- contactPhone(){
+ contactPhone(item,type){
this.showPhone = !this.showPhone
+ this.linkItem = {title:'鑱旂郴楠戞墜',linkname:'',linkphone:''}
+ if(type == 0){
+ this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:this.info.depositShopName,linkphone:this.info.depositShopPhone}
+ }else if(type ==2){
+ this.linkItem = {title:'鑱旂郴楠戞墜',linkname:this.info.driverName,linkphone:this.info.driverPhone}
+ }else if(type ==1){
+ this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:this.info.takeShopName,linkphone:this.info.takeShopPhone}
+ }
+ console.log("==================================",this.showPhone)
},
contactPhoneDo(){
- if(this.info.linkphone !=null && this.info.linkphone!=''){
+ if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
uni.makePhoneCall({
- phoneNumber: this.info.linkphone
+ phoneNumber: this.linkItem.linkphone
})
}
},
@@ -384,6 +505,7 @@
if (res.code === 200 ) {
this.showCancel = false
uni.$emit('updateOrder',{info:this.info,delete:0})
+ that.getUserDetail()
}
},
async deleteOrderDo(){
@@ -398,15 +520,15 @@
this.goBack()
}
},
- copyCode() {
- if (!this.currentOrder || !this.info.memberVerifyCode) {
+ copyCode(txt) {
+ if (!txt) {
return
}
uni.setClipboardData({
- data: this.info.memberVerifyCode,
+ data: txt,
success: () => {
uni.showToast({
- title: '宸插鍒惰嚜鎻愮爜',
+ title: '宸插鍒跺埌绮樿创鏉�',
icon: 'none'
})
}
@@ -418,10 +540,10 @@
if(!this.showQrcode){
this.showQrcode =true
drawQrcode({
- canvasId: 'qrcodeCanvas',
+ canvasId: 'qrcodeCanvas1',
text: this.info.memberVerifyCode,
- width: 100,
- height: 100,
+ width: this.rpxToPx(360),
+ height: this.rpxToPx(360),
correctLevel: 2
})
setTimeout(() => {
@@ -435,6 +557,32 @@
}else{
this.showQrcode = false
}
+ },
+ async showQrcodeImg(){
+ if((this.info.type ===0 && this.info.status >=1 &&this.info.status <7)
+ || (this.info.type ===1 && (this.info.status ===1 || (this.info.takeShopId && this.info.status ===5)))){
+ if(this.qrcodeImage){
+ return
+ }
+ this.qrcodeImage=null
+ var that =this
+ drawQrcode({
+ canvasId: 'qrcodeCanvas',
+ text: this.info.memberVerifyCode,
+ width: this.rpxToPx(360),
+ height: this.rpxToPx(360),
+ correctLevel: 2
+ })
+ setTimeout(() => {
+ uni.canvasToTempFilePath({
+ canvasId: 'qrcodeCanvas',
+ success: (res) => {
+ that.qrcodeImage = res.tempFilePath
+ }
+ }, this)
+ }, 100)
+ }
+
},
evaluateOrder(){
uni.navigateTo({
@@ -450,7 +598,113 @@
if (res.code === 200) {
this.info = res.data
uni.$emit('updateOrder',{info:this.info,delete:0})
+ this.showQrcodeImg()
+ if (this.info.type === 1 && this.info.status === 4) {
+ this.getRoutePlanning()
+ }
}
+ },
+ getRoutePlanning() {
+ var that = this
+ var driverLat = this.info.driverLat
+ var driverLng = this.info.driverLng
+ var depositShopLat = this.info.depositShopLat
+ var depositShopLng = this.info.depositShopLng
+
+ if (!driverLat || !driverLng || !depositShopLat || !depositShopLng) {
+ return
+ }
+
+ this.mapLat = driverLat
+ this.mapLng = driverLng
+
+ var myAmapFun = new amapFile.AMapWX({ key: this.$gaodeMapKey })
+ myAmapFun.getDrivingRoute({
+ origin: driverLng + ',' + driverLat,
+ destination: depositShopLng + ',' + depositShopLat,
+ success: function(data) {
+ var points = []
+ if (data.paths && data.paths.length > 0) {
+ var path = data.paths[0]
+ for (var i = 0; i < path.steps.length; i++) {
+ var step = path.steps[i]
+ var stepPoints = step.Polyline.split(';')
+ for (var j = 0; j < stepPoints.length; j++) {
+ var point = stepPoints[j].split(',')
+ points.push({
+ latitude: point[1],
+ longitude: point[0]
+ })
+ }
+ }
+ }
+
+ that.polyline = [{
+ points: points,
+ color: '#004096',
+ width: 6,
+ arrowLine: true
+ }]
+
+ that.markers = [
+ {
+ id: 1,
+ latitude: driverLat,
+ longitude: driverLng,
+ iconPath: '/static/icon/start.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 2,
+ latitude: depositShopLat,
+ longitude: depositShopLng,
+ iconPath: '/static/icon/end.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 3,
+ latitude: driverLat,
+ longitude: driverLng,
+ iconPath: '/static/icon/dizhi.png',
+ width: 24,
+ height: 30,
+ anchor: { x: 0.5, y: 0.5 }
+ }
+ ]
+
+ if (points.length > 0) {
+ that.mapLat = points[Math.floor(points.length / 2)].latitude
+ that.mapLng = points[Math.floor(points.length / 2)].longitude
+ }
+ },
+ fail: function(err) {
+ console.error('鑾峰彇璺緞瑙勫垝澶辫触', err)
+ that.markers = [
+ {
+ id: 1,
+ latitude: driverLat,
+ longitude: driverLng,
+ iconPath: '/static/icon/start.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 2,
+ latitude: depositShopLat,
+ longitude: depositShopLng,
+ iconPath: '/static/icon/end.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ }
+ ]
+ }
+ })
}
}
}
@@ -470,7 +724,7 @@
box-sizing: border-box;
background: #FFE9E9;
position: fixed;
- bottom: calc(100rpx + env(safe-area-inset-bottom));
+ bottom: calc(30rpx + env(safe-area-inset-bottom));
left: 0;
display: flex;
align-items: center;
@@ -538,7 +792,7 @@
position: fixed;
top: 0;
left: 0;
- z-index: 9;
+ z-index: 99999;
.head-nav {
width: 100%;
display: flex;
@@ -571,7 +825,7 @@
margin-right: 16rpx;
}
.nr-status-type {
- width: 164rpx;
+ width: 154rpx;
height: 38rpx;
display: flex;
align-items: center;
@@ -583,7 +837,7 @@
color: #FA8010;
}
.nr-status-type1 {
- width: 188rpx;
+ width: 158rpx;
height: 38rpx;
display: flex;
align-items: center;
@@ -708,6 +962,63 @@
}
}
}
+ .comment{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .comment-top {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ text {
+ &:nth-child(1) {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: #222222;
+ }
+ &:nth-child(2) {
+ font-weight: 500;
+ font-size: 36rpx;
+ color: #FE2C2E;
+ &:before {
+ content: "锟�";
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #FE2C2E;
+ }
+ }
+ }
+ }
+ .comment-score{
+ // font-weight: 600;
+ font-size: 28rpx;
+ color: #333333;
+ margin: 10rpx 0;
+ display: flex;
+ width: 100%;
+ .score-item{
+ flex:1;
+ margin: 20rpx 0;
+ }
+ }
+ .comment-row{
+ display: flex;
+ flex-wrap: wrap;
+ .comment-image {
+ margin: 10rpx;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 8rpx;
+ border:1px solid #f2f2f2;
+ overflow: hidden;
+ image {
+ width: 100%;
+ }
+ }
+ }
+
+ }
.tuikuan {
width: 100%;
display: flex;
@@ -759,6 +1070,12 @@
image {
width: 360rpx;
height: 360rpx;
+ }
+ canvas {
+ position: fixed;
+ top: -100%;
+ left: -100%;
+ opacity: 0;
}
text {
&:nth-child(2) {
@@ -855,6 +1172,7 @@
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
+ gap: 20rpx;
.item-form-list-row {
width: 88rpx;
height: 88rpx;
--
Gitblit v1.9.3