From ce1248297e07cf5e409a37d43f2e0b54fcf86071 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:06 +0800
Subject: [PATCH] 提交
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 82 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 18 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 5411e8d..33cb620 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -17,7 +17,12 @@
<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="nr-desc" v-if="info.statusDesc && info.status !== 0">{{info.statusDesc || ''}}</view>
+ <view class="nr-desc" style="display: flex; align-items: center;" v-if="info.statusDesc && info.status === 0">
+ 璇峰湪
+ <u-count-down :time="info.payCountdownMs" format="mm:ss"></u-count-down>
+ 鍐呭畬鎴愭敮浠橈紝瓒呮椂璁㈠崟灏嗚嚜鍔ㄥ彇娑�
+ </view>
<view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
<map
name="mapAddr"
@@ -26,8 +31,7 @@
:scale="mapScale"
:markers="markers"
:polyline="polyline"
- show-location
- style="width: 100%; height: 100%;"
+ style="width: 100%; height: 362rpx;"
></map>
</view>
<view class="item">
@@ -52,6 +56,7 @@
</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> -->
+ <text style="font-size: 36rpx;font-weight: 600;margin-bottom: 20rpx;">琛屾潕缂栧彿锛歿{info.sortnum || ''}}</text>
<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>
@@ -153,9 +158,13 @@
</view>
<view class="item-x"></view>
<view class="item-list">
- <view class="item-list-row">
+ <!-- <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.declaredAmount || 0)/100).toFixed(2)}}</view>
+ </view> -->
+ <view class="item-list-row">
+ <view class="item-form-label" style="color: #333333; font-size: 28rpx;">{{ info.type === 1 ? '閰嶉�佽垂' : '瀵勫瓨璐�' }}</view>
+ <view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.basicAmount || 0)/100).toFixed(2)}}</view>
</view>
<view class="item-list-row">
<view class="item-form-label" style="color: #333333; font-size: 28rpx;">琛屾潕淇濊垂</view>
@@ -248,10 +257,10 @@
</view>
<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>
- <view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5">鑱旂郴闂ㄥ簵</view>
- <view class="btn kong" v-if="info.status ===0" @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
+ <view class="btn kong" @click="contactPhone(info,0)" v-if="(info.status ===1 || info.status ==2) && info.takeShopId">鑱旂郴闂ㄥ簵</view>
+ <view class="btn kong" @click="contactPhone(info,2)" v-if="[3,4,5].includes(info.status) && !info.takeShopId">鑱旂郴楠戞墜</view>
+ <view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5 && info.takeShopId">鑱旂郴闂ㄥ簵</view>
+ <view class="btn kong" v-if="[0,1,2].includes(info.status)" @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
<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>
@@ -559,8 +568,10 @@
}
},
async showQrcodeImg(){
+ console.log("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)))){
+ console.log("showQrcodeImg-------杩涘叆")
if(this.qrcodeImage){
return
}
@@ -577,7 +588,11 @@
uni.canvasToTempFilePath({
canvasId: 'qrcodeCanvas',
success: (res) => {
+ console.log("showQrcodeImg-------鎴愬姛",res)
that.qrcodeImage = res.tempFilePath
+ },
+ fail: (err) => {
+ console.log("showQrcodeImg-------澶辫触",err)
}
}, this)
}, 100)
@@ -624,12 +639,18 @@
destination: depositShopLng + ',' + depositShopLat,
success: function(data) {
var points = []
+ var duration = 0
+ console.log("data",data)
if (data.paths && data.paths.length > 0) {
var path = data.paths[0]
+ duration = path.duration || 0
for (var i = 0; i < path.steps.length; i++) {
var step = path.steps[i]
- var stepPoints = step.Polyline.split(';')
+ var polylineStr = step.Polyline || step.polyline
+ if (!polylineStr) continue
+ var stepPoints = polylineStr.split(';')
for (var j = 0; j < stepPoints.length; j++) {
+ if (!stepPoints[j]) continue
var point = stepPoints[j].split(',')
points.push({
latitude: point[1],
@@ -639,10 +660,23 @@
}
}
+ 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)
+ }
+
+ console.log("points", points)
+
that.polyline = [{
points: points,
- color: '#004096',
- width: 6,
+ color: '#10c27b',
+ width: 10,
arrowLine: true
}]
@@ -652,7 +686,7 @@
latitude: driverLat,
longitude: driverLng,
iconPath: '/static/icon/start.png',
- width: 30,
+ width: 35,
height: 40,
anchor: { x: 0.5, y: 1 }
},
@@ -661,7 +695,7 @@
latitude: depositShopLat,
longitude: depositShopLng,
iconPath: '/static/icon/end.png',
- width: 30,
+ width: 35,
height: 40,
anchor: { x: 0.5, y: 1 }
},
@@ -670,9 +704,18 @@
latitude: driverLat,
longitude: driverLng,
iconPath: '/static/icon/dizhi.png',
- width: 24,
+ width: 30,
height: 30,
- anchor: { x: 0.5, y: 0.5 }
+ anchor: { x: 0.5, y: 0.5 },
+ callout: {
+ content: '棰勮鍒板簵鏃堕棿\n' + expectedTime,
+ color: '#222222',
+ fontSize: 14,
+ borderRadius: 4,
+ padding: 8,
+ display: 'ALWAYS',
+ bgColor: 'rgba(255, 255, 255, 0.95)'
+ }
}
]
@@ -712,6 +755,11 @@
<style>
page {
background-color: #F8F9FB;
+ }
+ .u-count-down__text {
+ font-weight: 400 !important;
+ font-size: 26rpx !important;
+ color: #ffffff !important;
}
</style>
<style lang="scss" scoped>
@@ -864,8 +912,6 @@
border-radius: 16rpx;
margin-top: 30rpx;
map {
- width: 100%;
- height: 362rpx;
border-radius: 16rpx;
}
.addr {
@@ -1071,7 +1117,7 @@
width: 360rpx;
height: 360rpx;
}
- canvas {
+ #qrcodeCanvas {
position: fixed;
top: -100%;
left: -100%;
--
Gitblit v1.9.3