Merge remote-tracking branch 'origin/master'

doum

2026-04-30 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

 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 = ''