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 | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 6b696dd..395c7f1 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -16,6 +16,7 @@
<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
@@ -38,8 +39,8 @@
<text>{{info.depositShopName || ''}}</text>
</view>
<text style="width: 70%;">{{info.depositShopAddress || ''}} </text>
- <view class='addr-link' style="top: 0;">
- <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
+ <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>
@@ -88,8 +89,8 @@
<view class="addr-item-top">
<text class=" txt-d">鍙告満锛歿{info.driverName || '鎴樼'}} </text>
</view>
- <view class='addr-link' style="top: 0;">
- <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>
@@ -168,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>
@@ -233,9 +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 ==2 || info.status ===3 || info.status ===4 " @click="printerOrder(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>
@@ -263,7 +271,7 @@
export default {
computed: {
- ...mapState(['navHeight', 'statusbarHeight'])
+ ...mapState(['navHeight', 'statusbarHeight', 'shopInfo'])
},
data() {
return {
@@ -421,8 +429,10 @@
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))
@@ -458,6 +468,17 @@
}
}
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,
@@ -495,13 +516,13 @@
height: 30,
anchor: { x: 0.5, y: 0.5 },
callout: {
- content: '棰勮鍒板簵鏃堕棿\n' + (that.info.expectedDepositTime || ''),
+ content: '棰勮鍒板簵鏃堕棿\n' + expectedTime,
color: '#222222',
fontSize: 14,
borderRadius: 4,
padding: 8,
display: 'ALWAYS',
- bgColor: 'rgba(255, 255, 255, 0.95)'
+ bgColor: '#ffffff'
}
}
]
@@ -667,6 +688,19 @@
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;
height: 38rpx;
--
Gitblit v1.9.3