From ea2fb93a0dfcde8f5b66825b20f9d9b835a28acc Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 10:54:09 +0800
Subject: [PATCH] 提交
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 27511f8..6938b20 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.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="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">
@@ -56,7 +57,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>
+ <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>
@@ -75,7 +76,7 @@
<view class="item-form-val">{{info.takePhone || ''}}</view>
</view>
<view class="item-list-row">
- <view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
+ <view class="item-form-label">鍒板簵瀵勫瓨鏃堕棿</view>
<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
</view>
<view class="item-list-row">
@@ -171,6 +172,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>
@@ -247,7 +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" v-if="info.status ===0 || info.status ===1" @click="cancelOrder(info)">鍙栨秷璁㈠崟</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>
<!-- <view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >鏍搁攢鐮�</view>
@@ -260,7 +265,7 @@
<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="info.status ===0" @click="cancelOrder(info)">鍙栨秷璁㈠崟</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>
@@ -714,7 +719,7 @@
borderRadius: 4,
padding: 8,
display: 'ALWAYS',
- bgColor: 'rgba(255, 255, 255, 0.95)'
+ bgColor: '#FFFFFF'
}
}
]
@@ -884,6 +889,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