From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/luggage-storage/luggage-storage.vue | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 26fb854..f56b395 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -332,9 +332,15 @@
</view>
<text class="amount-row-value">{{ amountData.distance + 'km' }}</text>
</view>
+ <view v-if="activeMode !== 'city' && amountData.days" class="amount-row amount-row-extra">
+ <view class="amount-row-left">
+ <text class="amount-row-label">瀵勫瓨澶╂暟</text>
+ </view>
+ <text class="amount-row-value">{{ amountData.days + '澶�' }}</text>
+ </view>
<view v-if="amountData.insuranceFee" class="amount-row amount-row-extra">
<view class="amount-row-left">
- <text class="amount-row-label">琛屾潕淇濅环</text>
+ <text class="amount-row-label">鐗╁搧淇濊垂</text>
</view>
<text class="amount-row-value">{{ '锟�' + amountData.insuranceFee }}</text>
</view>
@@ -762,6 +768,7 @@
},
async calculateLocalPriceOnly() {
if (!this.selectedStore || !this.form.arriveTime || !this.form.pickupTime) {
+ this.amountData = null
return
}
const luggageList = this.luggageTypes
@@ -771,6 +778,7 @@
quantity: item.count
}))
if (luggageList.length === 0) {
+ this.amountData = null
return
}
const res = await this.$u.api.calculateLocalPrice({
@@ -792,9 +800,11 @@
},
async calculateRemotePrice() {
if (!this.sendStore || !this.form.arriveTime || !this.form.pickupTime) {
+ this.amountData = null
return
}
if (!this.receiveStore && !this.receiveAddr) {
+ this.amountData = null
return
}
const luggageList = this.luggageTypes
@@ -804,6 +814,7 @@
quantity: item.count
}))
if (luggageList.length === 0) {
+ this.amountData = null
return
}
let fromLat = ''
--
Gitblit v1.9.3