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/itinerary/itinerary.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 38a4b23..b85cfaf 100644
--- a/small-program/pages/itinerary/itinerary.vue
+++ b/small-program/pages/itinerary/itinerary.vue
@@ -108,7 +108,7 @@
<view class="card-footer">
<view class="footer-actions" v-if="item.type===0">
<view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 ||item.status ===5 || item.status==2 || item.status===98">鑱旂郴闂ㄥ簵</view>
- <view class="footer-btn contact-btn" v-if="item.status ===0 || item.status ===1" @click="cancelOrder(item)">鍙栨秷璁㈠崟</view>
+ <view class="footer-btn contact-btn" v-if="[0,1].includes(item.status) && item.abnormalOrder !== 1" @click="cancelOrder(item)">鍙栨秷璁㈠崟</view>
<view class="footer-btn contact-btn" @click="deleteOrder(item)" v-if="item.status ===7 || item.status===96 || item.status == 99">鍒犻櫎璁㈠崟</view>
<view class="footer-btn primary-btn" @click="payOrder(item)" v-if="item.status ===0">绔嬪嵆鏀粯</view>
<view class="footer-btn primary-btn" @click="payOrderFee(item)" v-if="item.status ===5 && item.overdueStatus===3 ">绔嬪嵆鏀粯</view>
@@ -210,7 +210,8 @@
<view style="margin-bottom: 30rpx;">
<text class="pickup-code" style="font-size: 48rpx;">琛屾潕缂栧彿锛歿{ currentOrder.sortnum||'' }}</text>
<view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;">鐢ㄦ埛锛歿{currentOrder.takeUser||''}}({{currentOrder.takePhone||''}})</view>
- <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;">闂ㄥ簵锛歿{currentOrder.depositShopName||''}}</view>
+ <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;" v-if="currentOrder.type === 1">闂ㄥ簵锛歿{ currentOrder.status === 3 ? currentOrder.depositShopName||'' : currentOrder.status === 5 ? currentOrder.takeShopName||'' : ''}}</view>
+ <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;" v-else>闂ㄥ簵锛歿{ currentOrder.depositShopName||'' }}</view>
<view class="item-form-list" style="align-items:baseline;" v-if="currentOrder && currentOrder.orderImages && currentOrder.orderImages.length">
<view class="item-form-list-row" v-for="(item,index) in currentOrder.orderImages" key="item">
<image :src="item" mode="widthFix" @click="previewImage(currentOrder.orderImages,index)" ></image>
--
Gitblit v1.9.3