From 00a7a61df86db969f2ba61c508d02ba4709ce3d4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 六月 2026 10:09:06 +0800
Subject: [PATCH] 改bug
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 248 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 240 insertions(+), 8 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 6938b20..993ec80 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -16,7 +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 class="nr-status-type2" v-if="info.type === 0 && info.exceptionStatus === 1">寮傚父杞瓨</view>
</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">
@@ -252,6 +252,7 @@
<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" @click="openTrackPopup">璁㈠崟杞ㄨ抗</view>
<view class="btn kong" v-if="[0,1].includes(info.status) && info.abnormalOrder !== 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>
@@ -263,6 +264,7 @@
<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) && info.takeShopId">鑱旂郴闂ㄥ簵</view>
+ <view class="btn kong" @click="openTrackPopup">璁㈠崟杞ㄨ抗</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>
@@ -289,6 +291,40 @@
</view>
</view>
<view style="width: 100%; height: 30rpx;"></view>
+ </view>
+ </u-popup>
+ <u-popup :show="showTrackPopup" mode="bottom" round="24" :safeAreaInsetBottom="true" :closeOnClickOverlay="true" @close="closeTrackPopup">
+ <view class="track-popup">
+ <view class="track-popup__header">
+ <text class="track-popup__title">璁㈠崟杞ㄨ抗</text>
+ <view class="track-popup__close" @click="closeTrackPopup">脳</view>
+ </view>
+ <scroll-view scroll-y class="track-popup__body">
+ <view class="track-empty" v-if="!trackList.length">鏆傛棤杞ㄨ抗淇℃伅</view>
+ <view class="track-list" v-else>
+ <view class="track-item" v-for="(track, index) in trackList" :key="track.key || index">
+ <view class="track-item__content">
+ <view class="track-item__rail">
+ <image v-if="index === 0" class="track-item__dot track-item__dot--active" src="/static/icon/dian.png" mode="aspectFit"></image>
+ <view v-else class="track-item__dot"></view>
+ <view class="track-item__line" v-if="index !== trackList.length - 1"></view>
+ </view>
+ <view class="track-item__body">
+ <text class="track-item__time">{{ track.time }}</text>
+ <text class="track-item__desc">{{ track.title }}</text>
+ <view class="track-item__images" v-if="track.images && track.images.length">
+ <image
+ v-for="(img, imgIndex) in track.images"
+ :key="track.key + '-' + imgIndex"
+ :src="img"
+ mode="aspectFill"
+ ></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </scroll-view>
</view>
</u-popup>
<!-- 纭鏀惰揣 -->
@@ -372,13 +408,16 @@
showQrcode:false,
showPay:false,
showPhone:false,
+ showTrackPopup:false,
+ trackList: [],
linkItem:{title:'',linkname:'',linkphone:''},
qrcodeImage:null,
mapLat: 0,
mapLng: 0,
mapScale: 10,
markers: [],
- polyline: []
+ polyline: [],
+ currentOrder: null
}
},
onShow() {
@@ -392,12 +431,70 @@
this.showQrcode=false
this.showPay=false
this.showPhone=false
+ this.showTrackPopup=false
+ this.trackList = []
this.getUserDetail()
this.width = this.rpxToPx(360)
this.height = this.rpxToPx(360)
this.linkItem={title:'',linkname:'',linkphone:''}
},
methods:{
+ async openTrackPopup() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...',
+ mask: true
+ })
+ let success = false
+ try {
+ success = await this.getOrderTimeline()
+ } finally {
+ uni.hideLoading()
+ }
+ if (success) {
+ this.showTrackPopup = true
+ }
+ },
+ closeTrackPopup() {
+ this.showTrackPopup = false
+ },
+ async getOrderTimeline() {
+ if (!this.id) {
+ this.trackList = []
+ return false
+ }
+ try {
+ let res = await this.$u.api.timeline(this.id)
+ if (res.code === 200) {
+ let list = Array.isArray(res.data) ? res.data : []
+ this.trackList = list.map((item, index) => ({
+ key: item.id || item.time || index,
+ title: item.title || '',
+ time: item.time || '--',
+ images: this.normalizeTrackImages(item.images)
+ }))
+ return true
+ }
+ this.trackList = []
+ uni.showToast({
+ title: res.msg || '鑾峰彇杞ㄨ抗澶辫触',
+ icon: 'none'
+ })
+ return false
+ } catch (e) {
+ this.trackList = []
+ uni.showToast({
+ title: '鑾峰彇杞ㄨ抗澶辫触',
+ icon: 'none'
+ })
+ return false
+ }
+ },
+ normalizeTrackImages(images) {
+ if (!Array.isArray(images)) {
+ return []
+ }
+ return images.filter(item => !!item)
+ },
previewImage(images,index = 0) {
uni.previewImage({
current: index,
@@ -508,9 +605,11 @@
}
},
cancelOrder(item){
+ this.currentOrder = item || this.info
this.showCancel = !this.showCancel
},
deleteOrder(item){
+ this.currentOrder = item || this.info
this.showDelete = !this.showDelete
},
async cancelOrderDo(){
@@ -560,14 +659,14 @@
height: this.rpxToPx(360),
correctLevel: 2
})
- setTimeout(() => {
+ that.$nextTick(() => {
uni.canvasToTempFilePath({
canvasId: 'qrcodeCanvas',
success: (res) => {
that.qrcodeImage = res.tempFilePath
}
- }, this)
- }, 100)
+ }, that)
+ })
}else{
this.showQrcode = false
}
@@ -589,7 +688,7 @@
height: this.rpxToPx(360),
correctLevel: 2
})
- setTimeout(() => {
+ that.$nextTick(() => {
uni.canvasToTempFilePath({
canvasId: 'qrcodeCanvas',
success: (res) => {
@@ -599,8 +698,20 @@
fail: (err) => {
console.log("showQrcodeImg-------澶辫触",err)
}
- }, this)
- }, 100)
+ }, that)
+ })
+ // setTimeout(() => {
+ // uni.canvasToTempFilePath({
+ // canvasId: 'qrcodeCanvas',
+ // success: (res) => {
+ // console.log("showQrcodeImg-------鎴愬姛",res)
+ // that.qrcodeImage = res.tempFilePath
+ // },
+ // fail: (err) => {
+ // console.log("showQrcodeImg-------澶辫触",err)
+ // }
+ // }, this)
+ // }, 100)
}
},
@@ -838,6 +949,127 @@
.head1{
background: #E4730B;
}
+ .track-popup {
+ background: #FFFFFF;
+ border-radius: 24rpx 24rpx 0 0;
+ padding: 24rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
+ box-sizing: border-box;
+ .track-popup__header {
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ }
+ .track-popup__title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ }
+ .track-popup__close {
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 56rpx;
+ height: 56rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 56rpx;
+ line-height: 1;
+ color: #A5A7AD;
+ }
+ .track-popup__body {
+ height: 50vh;
+ }
+ .track-empty {
+ line-height: 50vh;
+ text-align: center;
+ font-size: 28rpx;
+ color: #999999;
+ }
+ .track-list {
+ padding: 12rpx 0 0;
+ }
+ .track-item {
+ position: relative;
+ }
+ .track-item__rail {
+ width: 34rpx;
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ align-self: stretch;
+ position: relative;
+ }
+ .track-item__dot {
+ width: 16rpx;
+ height: 16rpx;
+ flex-shrink: 0;
+ position: relative;
+ z-index: 1;
+ border-radius: 50%;
+ background: #CCCCCC;
+ margin-top: 12rpx;
+ }
+ .track-item__dot--active {
+ width: 32rpx;
+ height: 32rpx;
+ flex-shrink: 0;
+ display: block;
+ position: relative;
+ z-index: 1;
+ margin-top: 4rpx;
+ background: transparent;
+ }
+ .track-item__line {
+ width: 2rpx;
+ position: absolute;
+ left: 50%;
+ top: 28rpx;
+ bottom: -30rpx;
+ transform: translateX(-50%);
+ background: #E6EAF0;
+ }
+ .track-item__content {
+ display: flex;
+ align-items: flex-start;
+ column-gap: 22rpx;
+ padding: 0 0 20rpx;
+ }
+ .track-item__body {
+ flex: 1;
+ min-width: 0;
+ }
+ .track-item__time {
+ display: block;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #666666;
+ line-height: 1.4;
+ }
+ .track-item__desc {
+ display: block;
+ margin-top: 22rpx;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #666666;
+ }
+ .track-item__images {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 18rpx;
+ margin-top: 24rpx;
+ image {
+ width: 130rpx;
+ height: 130rpx;
+ border-radius: 12rpx;
+ background: #F3F5F8;
+ }
+ }
+ }
.head {
width: 100%;
padding: 0 30rpx;
--
Gitblit v1.9.3