From f422860fe7e521f4d252e5d77621d92d7f8dfe61 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 28 四月 2026 16:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 145 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 136 insertions(+), 9 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 7b03de9..b50e23e 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -19,7 +19,16 @@
</view>
<view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
<view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
- <map name="mapAddr"></map>
+ <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">
@@ -30,7 +39,7 @@
<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" v-if="info.type === 1">
<view class="ji bg1">鏀�</view>
@@ -38,20 +47,27 @@
<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" 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: 180px; height: 180px;"></canvas>
- <!-- <image :src="qrcodeImage" mode="widthFix"></image> -->
</view>
<text>{{info.memberVerifyCode || ''}}</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>
@@ -74,7 +90,7 @@
</view>
</view>
</view>
- <view class="item" v-if="info.refundInfo">
+ <!-- <view class="item" v-if="info.refundInfo">
<view class="tuikuan">
<view class="tuikuan-top">
<text>閫�娆鹃噾棰�</text>
@@ -88,7 +104,7 @@
<text v-if="info.refundInfo.status !== 1">{{info.refundInfo.createTime || ''}}</text>
</view>
</view>
- </view>
+ </view> -->
<view class="item" v-if="info.commentStatus === 1">
<view class="comment">
<view class="comment-top">
@@ -110,7 +126,7 @@
<view class="tuikuan">
<view class="tuikuan-top">
<text>閫�娆鹃噾棰�</text>
- <text>楼{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
+ <text>{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
</view>
<view class="tuikuan-bottom">
<text v-if="info.refundInfo.status === 0">閫�娆句腑</text>
@@ -323,6 +339,7 @@
<script>
import { mapState } from 'vuex'
import drawQrcode from 'weapp-qrcode'
+ var amapFile = require('@/utils/amap-wx.130.js')
export default {
computed: {
@@ -339,7 +356,12 @@
showPay:false,
showPhone:false,
linkItem:{title:'',linkname:'',linkphone:''},
- qrcodeImage:null
+ qrcodeImage:null,
+ mapLat: 0,
+ mapLng: 0,
+ mapScale: 10,
+ markers: [],
+ polyline: []
}
},
onShow() {
@@ -569,7 +591,112 @@
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 }
+ }
+ ]
+ }
+ })
}
}
}
@@ -657,7 +784,7 @@
position: fixed;
top: 0;
left: 0;
- z-index: 9;
+ z-index: 99999;
.head-nav {
width: 100%;
display: flex;
--
Gitblit v1.9.3