From b40a03e6cbba769c752d6d8f3b8a8c9af2e50955 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 16:07:04 +0800
Subject: [PATCH] 小程序端和PC端bug修复
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 d175095..5ff0fbc 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -30,7 +30,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 +38,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 +81,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 +95,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 +117,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>
@@ -137,7 +144,7 @@
<view class="item-x"></view>
<view class="item-list">
<view class="item-list-row">
- <view class="item-form-label" style="color: #333333; font-size: 28rpx;">鎶ヤ环閲戦</view>
+ <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">
@@ -215,8 +222,8 @@
<view class="tips" v-if="info.overdueStatus !==0">
<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 ===2">宸茶秴杩囧彇浠舵椂闂达紝闇�瑕佹敮浠樿秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
- <text v-if="info.overdueStatus ===3">瓒呰繃鍙栦欢鏃堕棿锛屽凡鏀粯瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+ <text v-if="info.overdueStatus ===3">宸茶秴杩囧彇浠舵椂闂达紝闇�瑕佹敮浠樿秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
+ <text v-if="info.overdueStatus ===4">瓒呰繃鍙栦欢鏃堕棿锛屽凡鏀粯瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
</view>
<view class="footer" v-if="info.type===0">
<view class="footer-btns">
@@ -226,7 +233,7 @@
<view class="btn you" @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
<!-- <view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >鏍搁攢鐮�</view>
--> <view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
- <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus===2 ">绔嬪嵆鏀粯</view>
+ <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus===3 ">绔嬪嵆鏀粯</view>
</view>
</view>
<view class="footer" v-if="info.type===1">
@@ -241,7 +248,7 @@
<!-- <view class="btn you" v-if="info.status ===1 || (info.takeShopId && info.status ===5)" @click="openQrcode(info)" >鏍搁攢鐮�</view>
--> <view class="btn you" @click="doneOrder(info)" v-if="!info.takeShopId && info.status ===5">纭鏀惰揣</view>
<view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">璇勪环璁㈠崟</view>
- <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus ===2">绔嬪嵆鏀粯</view>
+ <view class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus ===3">绔嬪嵆鏀粯</view>
</view>
</view>
<u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true" @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
@@ -343,6 +350,9 @@
}
},
onShow() {
+ },
+ onLoad(options) {
+ this.id = options.id
this.info={}
this.showDone=false
this.showCancel=false
@@ -352,9 +362,6 @@
this.showPhone=false
this.getUserDetail()
this.linkItem={title:'',linkname:'',linkphone:''}
- },
- onLoad(options) {
- this.id = options.id
},
methods:{
previewImage(images,index = 0) {
--
Gitblit v1.9.3