From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/shop/pages/order-details/order-details.vue | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 229 insertions(+), 11 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 4cb367f..395c7f1 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -16,9 +16,19 @@
<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 class="nr-status-type2" v-if="info.exceptionStatus === 1">寮傚父杞瓨</view>
</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: 362rpx;"
+ ></map>
</view>
<view class="item">
<view class="addr">
@@ -28,9 +38,9 @@
<view class="addr-item-top">
<text>{{info.depositShopName || ''}}</text>
</view>
- <text>{{info.depositShopAddress || ''}} </text>
- <view class='addr-link' style="top: 50rpx;">
- <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
+ <text style="width: 70%;">{{info.depositShopAddress || ''}} </text>
+ <view class='addr-link' style="top: 0;" @click="contactPhoneDo(info.takePhone)">
+ <image style="margin-right: 10rpx;" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
<text class=" txt-d1">鑱旂郴瀹㈡埛</text>
</view>
</view>
@@ -79,8 +89,8 @@
<view class="addr-item-top">
<text class=" txt-d">鍙告満锛歿{info.driverName || '鎴樼'}} </text>
</view>
- <view class='addr-link'>
- <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.driverPhone)" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
+ <view class='addr-link' style="top: 0;" @click="contactPhoneDo(info.driverPhone)">
+ <image style="margin-right: 10rpx;" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
<text class=" txt-d1">鑱旂郴鍙告満</text>
</view>
@@ -159,6 +169,10 @@
<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.declaredFee || 0)/100).toFixed(2)}}</view>
</view>
<view class="item-list-row">
+ <view class="item-form-label" style="color: #333333; font-size: 28rpx;">浼樻儬閲戦</view>
+ <view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.deductionAmount || 0)/100).toFixed(2)}}</view>
+ </view>
+ <view class="item-list-row">
<view class="item-form-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">瀹炰粯娆�</view>
<view class="item-form-val price" style="color: #FE2C2E; font-size: 36rpx;">{{((info.actualPayAmount || 0)/100).toFixed(2)}}</view>
</view>
@@ -214,7 +228,7 @@
</view>
<view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
</view>
- <view class="tips" v-if="info.overdueStatus !==0">
+ <view class="tips" v-if="info.overdueStatus !==0 &&info.overdueStatus !==2">
<image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
<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>
@@ -224,8 +238,12 @@
<view class="footer-btns">
<view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 || info.status === 5" >鑱旂郴瀹㈡埛</view>
<view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 || info.status === 3)">鑱旂郴楠戞墜</view>
- <view class="btn you" v-if="info.status ===1 || info.status ===4 " @click="hexiaoOrder(info)" >鏀朵欢鏍搁攢</view>
- <view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1)" @click="hexiaoOrder(info)" >纭鍒板簵</view>
+ <!-- <view class="btn you" v-if="[1,4].includes(info.status) && info.takeShopId" @click="hexiaoOrder(info)" >鏀朵欢鏍搁攢</view> -->
+
+ <view class="btn you" v-if="(info.status === 1 && (shopInfo.id == info.depositShopId)) || (info.status === 4 && (shopInfo.id == info.takeShopId))" @click="hexiaoOrder(info)" >鏀朵欢鏍搁攢</view>
+
+ <view class="btn you" v-if="info.status>0||info.status<=7 " @click="printerOrder(info)" >鎵撳嵃鏍囩</view>
+ <view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1) && info.takeShopId" @click="hexiaoOrder(info)" >纭鍒板簵</view>
<view class="btn you" v-if="info.status ===5 && (info.overdueStatus == 4 || info.overdueStatus == 2)" @click="hexiaoOrder(info)" >鍙栦欢鏍搁攢</view>
</view>
</view>
@@ -249,17 +267,24 @@
<script>
import { mapState } from 'vuex'
import drawQrcode from 'weapp-qrcode'
+ var amapFile = require('@/utils/amap-wx.130.js')
export default {
computed: {
- ...mapState(['navHeight', 'statusbarHeight'])
+ ...mapState(['navHeight', 'statusbarHeight', 'shopInfo'])
},
data() {
return {
+ loading:false,
id:null,
qrcodeImage:null,
showCancel:false,
- info:{}
+ info:{},
+ mapLat: 0,
+ mapLng: 0,
+ mapScale: 12,
+ markers: [],
+ polyline: []
}
},
onShow() {
@@ -292,6 +317,27 @@
cancelOrder(item){
this.showCancel = !this.showCancel
},
+ async printerOrder(){
+ if(this.loading){
+ return
+ }
+ this.loading =true
+ try{
+ var that =this
+ that.$u.api.printOrderLabel({ orderId: this.id }).then(res=>{
+ if (res.code === 200 ) {
+ uni.showToast({
+ title:'鍙戣捣鎵撳嵃璇锋眰鎴愬姛',
+ icon:'none'
+ })
+ }
+ that.loading =false
+ })
+ }catch(e){
+ this.loading =false
+ }
+
+ },
async cancelOrderDo(){
var that =this
let res = await that.$u.api.cancelOrder({ orderId: this.id });
@@ -351,7 +397,165 @@
if (res.code === 200) {
this.info = res.data
uni.$emit('updateOrder',{info:this.info,delete:0})
+ 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
+
+ console.log('getRoutePlanning called', driverLat, driverLng, depositShopLat, depositShopLng)
+
+ if (!driverLat || !driverLng || !depositShopLat || !depositShopLng) {
+ console.log('鍧愭爣缂哄け')
+ 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) {
+ console.log('鑾峰彇璺緞瑙勫垝鎴愬姛 data:', data)
+ console.log('data keys:', Object.keys(data))
+ console.log('data.paths:', data.paths)
+ console.log('driverLng:', driverLng, 'driverLat:', driverLat, 'depositShopLng:', depositShopLng, 'depositShopLat:', depositShopLat)
+ var points = []
+ var duration = 0
+ if (data.paths && data.paths.length > 0) {
+ var path = data.paths[0]
+ duration = path.duration || 0
+ console.log('path:', path)
+ console.log('path keys:', Object.keys(path))
+
+ var steps = path.steps || path.routs || path.roads || []
+ if (steps.length === 0 && path.distance) {
+ steps = [path]
+ }
+
+ console.log('steps:', steps)
+
+ if (steps && steps.length > 0) {
+ for (var i = 0; i < steps.length; i++) {
+ var step = steps[i]
+ console.log('step:', step)
+ console.log('step keys:', step ? Object.keys(step) : 'null')
+
+ var polylineStr = step.polyline || step.Polyline || step.path || step.line || step.road || ''
+ console.log('polylineStr:', polylineStr)
+
+ if (!step || !polylineStr) continue
+ var stepPoints = polylineStr.split(';')
+ if (!stepPoints || stepPoints.length === 0) continue
+ for (var j = 0; j < stepPoints.length; j++) {
+ if (!stepPoints[j]) continue
+ var point = stepPoints[j].split(',')
+ if (!point || point.length < 2) continue
+ points.push({
+ latitude: parseFloat(point[1]),
+ longitude: parseFloat(point[0])
+ })
+ }
+ }
+ }
+ }
+ console.log('points:', points)
+
+ var expectedTime = ''
+ if (duration > 0) {
+ var now = new Date()
+ var arrivalTime = new Date(now.getTime() + duration * 1000)
+ var month = arrivalTime.getMonth() + 1
+ var day = arrivalTime.getDate()
+ var hours = arrivalTime.getHours()
+ var minutes = arrivalTime.getMinutes()
+ expectedTime = month + '.' + (day < 10 ? '0' + day : day) + ' ' + (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
+ }
+
+ that.polyline = [{
+ points: points,
+ color: '#00c47c',
+ width: 10,
+ arrowLine: true
+ }]
+ console.log('polyline set:', that.polyline)
+
+ that.markers = [
+ {
+ id: 1,
+ latitude: parseFloat(driverLat),
+ longitude: parseFloat(driverLng),
+ iconPath: '/static/icon/start.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 2,
+ latitude: parseFloat(depositShopLat),
+ longitude: parseFloat(depositShopLng),
+ iconPath: '/static/icon/end.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 3,
+ latitude: parseFloat(driverLat),
+ longitude: parseFloat(driverLng),
+ iconPath: '/static/icon/dizhi.png',
+ width: 24,
+ height: 30,
+ anchor: { x: 0.5, y: 0.5 },
+ callout: {
+ content: '棰勮鍒板簵鏃堕棿\n' + expectedTime,
+ color: '#222222',
+ fontSize: 14,
+ borderRadius: 4,
+ padding: 8,
+ display: 'ALWAYS',
+ bgColor: '#ffffff'
+ }
+ }
+ ]
+
+ 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: parseFloat(driverLat),
+ longitude: parseFloat(driverLng),
+ iconPath: '/static/icon/start.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ },
+ {
+ id: 2,
+ latitude: parseFloat(depositShopLat),
+ longitude: parseFloat(depositShopLng),
+ iconPath: '/static/icon/end.png',
+ width: 30,
+ height: 40,
+ anchor: { x: 0.5, y: 1 }
+ }
+ ]
+ }
+ })
}
}
@@ -483,6 +687,19 @@
font-weight: 400;
font-size: 24rpx;
color: #FA8010;
+ }
+ .nr-status-type2 {
+ width: 158rpx;
+ height: 38rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FF0000;
+ margin-left: 16rpx;
}
.nr-status-type1 {
width: 158rpx;
@@ -840,6 +1057,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