Merge remote-tracking branch 'origin/master'

doum

2026-04-27 4ab710d8d70017f090dd9601099ded1a50a58a10

 small-program/pages/luggage-storage/luggage-storage.vue

@@ -16,7 +16,7 @@

      <scroll-view scroll-y class="page-scroll">
         <view class="page-content">
            <view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup">
            <view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup0">
               <view class="cell-left with-icon">
                     <image class="cell-icon" src="/static/icon/ic_store@2x.png" mode="widthFix"></image>
                     <view class="store-cell-copy">
@@ -153,7 +153,7 @@
                  </view>
                  <view class="luggage-stepper">
                     <image class="step-btn" src="/static/icon/ic_jian@2x.png" mode="widthFix" @click="decreaseCount(index)"></image>
                     <text class="step-count">{{ item.count }}</text>
                     <text class="step-count">{{ item.count || 0}}</text>
                     <image class="step-btn" src="/static/icon/ic_jia@2x.png" mode="widthFix" @click="increaseCount(index)"></image>
                  </view>
               </view>
@@ -245,7 +245,7 @@
                     @click="storeList.forEach((row,i) => row.active = index === i)"
                  >
                  <view class="store-option-main">
                     <image class="store-thumb" src="" mode="aspectFill"></image>
                     <image class="store-thumb" :src="item.coverImg || '/static/icon/default2.png'" mode="aspectFill"></image>
                     <view class="store-option-copy">
                        <view class="store-option-head">
                           <text class="store-option-name">{{ item.name }}</text>
@@ -557,9 +557,10 @@
                  })
                  try {
                     const uploadResults = await this.uploadFiles(tempFilePaths, maxCount)
                     const addrs = uploadResults.map(item => item.imgaddr)
                     const fullPaths = uploadResults.map(item => item.url || item.path || item)
                     this.uploadedImages = [...this.uploadedImages, ...fullPaths.map(url => ({ url }))]
                     this.form.goodsImages = [...this.form.goodsImages, ...fullPaths]
                     this.form.goodsImages = [...this.form.goodsImages, ...addrs]
                     uni.hideLoading()
                     uni.showToast({
                        title: '上传成功',
@@ -617,8 +618,16 @@
            this.tempSelectedStoreId = null
            this.showStorePopup = true
         },
         openStorePopup0() {
            this.storePopupType = 'send0'
            this.tempSelectedStoreId = null
            this.showStorePopup = true
         },
         confirmStore() {
				
            console.log("=========================")
            const selected = this.storeList.find(item => item.active)
            console.log(selected)
            if (this.storePopupType === 'send') {
               this.sendStore = selected
            } else if (this.storePopupType === 'receive') {
@@ -695,6 +704,7 @@
                  latitude: this.latitude,
                  longitude: this.longitude,
                  cityId: this.cityId,
                  name:this.storeForm.keyword,
                  sortType: 1
               }
            })
@@ -877,7 +887,7 @@
               orderParams.fromShopId = this.sendStore.id
               if (this.receiveStore) {
                  orderParams.toType = 0
                  orderParams.toShopId = this.receiveStore.id
                  orderParams.takeShopId = this.receiveStore.id
                  orderParams.takeLat = this.receiveStore.latitude
                  orderParams.takeLgt = this.receiveStore.longitude
                  orderParams.takeLocation = this.receiveStore.address
@@ -905,7 +915,7 @@
               signType: paymentData.signType || 'MD5',
               paySign: paymentData.paySign || '',
               success: (res) => {
                  uni.navigateTo({
                  uni.redirectTo({
                     url: '/pages/payment-success/payment-success?orderId=' + orderId
                  });
               },
@@ -915,6 +925,9 @@
                  } else {
                     uni.showToast({ title: '支付失败', icon: 'none' })
                  }
                  uni.redirectTo({
                     url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
                  });
               }
            })
         }
@@ -1206,6 +1219,7 @@
         display: flex;
         align-items: center;
         image {
            flex-shrink: 0;
            width: 24rpx;
            height: 24rpx;
            margin-right: 4rpx;