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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 328650b..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
@@ -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,7 +238,10 @@
<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="[1,4].includes(info.status) && info.takeShopId" @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>
@@ -263,7 +271,7 @@
export default {
computed: {
- ...mapState(['navHeight', 'statusbarHeight'])
+ ...mapState(['navHeight', 'statusbarHeight', 'shopInfo'])
},
data() {
return {
@@ -514,7 +522,7 @@
borderRadius: 4,
padding: 8,
display: 'ALWAYS',
- bgColor: 'rgba(255, 255, 255, 0.95)'
+ bgColor: '#ffffff'
}
}
]
@@ -680,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