Merge remote-tracking branch 'origin/master'

doum

2026-04-28 28a2f7a48f508970a10413c8aa2367a4e4790b1b

 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">
@@ -148,12 +148,12 @@
                     <image class="luggage-image" :src="item.iconFull" mode="widthFix"></image>
                     <view class="luggage-copy">
                        <text class="luggage-name">{{ item.name }}</text>
                        <text class="luggage-size">{{ item.otherField || '' }}</text>
                        <text class="luggage-size">{{ item.remark || '' }}</text>
                     </view>
                  </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>
@@ -208,9 +208,13 @@
                     <text class="unit-text">元</text>
                  </view>
               </view>
               <view v-if="amountData" class="insurance-tip-row">
                  <text class="insurance-tip-label">物品保费:</text>
                  <text class="insurance-tip-value">￥{{ amountData.insuranceFee }}</text>
               <view v-if="amountData || showInsuranceTip" class="insurance-tip-row">
                  <text v-if="showInsuranceTip" class="insurance-tip-warning">您的物品价值较高，建议购买保价服务</text>
                  <text v-else></text>
                  <view style="display: flex; align-items: center;">
                     <text v-if="amountData" class="insurance-tip-label">物品保费:</text>
                     <text v-if="amountData" class="insurance-tip-value">￥{{ amountData.insuranceFee }}</text>
                  </view>
               </view>
            </view>

@@ -245,7 +249,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>
@@ -255,7 +259,7 @@
                           <image class="store-option-address-icon" src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
                           <text class="store-option-address">{{ item.address }}</text>
                        </view>
                        <text class="store-option-time">{{ item.time }}</text>
                        <text class="store-option-time">{{ item.shopHours || '' }}</text>
                     </view>
                  </view>
                  <view v-if="tempSelectedStoreId === item.id" class="store-check">
@@ -359,6 +363,7 @@
            <view class="submit-btn active-submit-btn" @click="createOrder">立即下单</view>
         </view>
      </view>
		
      <!-- 选择服务点/地址 -->
      <u-action-sheet
         :show="showReceiveAddress"
@@ -406,6 +411,7 @@
               goodsImages: [],
            },
            amountData: null,
            showInsuranceTip: false,
            luggageTypes: [],
            serviceTimes: [],

@@ -557,9 +563,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 +624,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') {
@@ -631,13 +646,14 @@
            }
            this.showStorePopup = false
         },
         confirmGoods() {
         confirmGoods(relationOtherField) {
            if (!this.goodsOptions.find(item => item.active)) {
               uni.showToast({ title: '请选择物品信息', icon: 'none' })
               return
            }
            this.form.goodTypeName = this.goodsOptions.find(item => item.active)?.name || ''
            this.form.goodType = this.goodsOptions.find(item => item.active)?.id || ''
            this.showInsuranceTip = relationOtherField === 1
            this.showGoodsPopup = false
         },
         confirmArriveTime(e) {
@@ -695,6 +711,7 @@
                  latitude: this.latitude,
                  longitude: this.longitude,
                  cityId: this.cityId,
                  name:this.storeForm.keyword,
                  sortType: 1
               }
            })
@@ -811,10 +828,6 @@
            }
         },
         async createOrder() {
            if (!this.agreementChecked) {
               uni.showToast({ title: '请先阅读并同意用户服务协议及隐私政策', icon: 'none' })
               return
            }
            if (this.activeMode === 'local') {
               if (!this.selectedStore) {
                  uni.showToast({ title: '请选择门店', icon: 'none' })
@@ -829,6 +842,20 @@
                  uni.showToast({ title: '请选择取件地址', icon: 'none' })
                  return
               }
            }
            if (!this.form.receiver) {
               uni.showToast({ title: '请输入收件人姓名', icon: 'none' })
               return
            }
            if (!this.form.mobile) {
               uni.showToast({ title: '请输入收件人电话', icon: 'none' })
               return
            }
            const mobileRegex = /^1\d{10}$/
            const landlineRegex = /^\d{3,4}-?\d{7,8}$/
            if (!mobileRegex.test(this.form.mobile) && !landlineRegex.test(this.form.mobile)) {
               uni.showToast({ title: '请输入正确的手机号或固定电话', icon: 'none' })
               return
            }
            if (!this.form.arriveTime) {
               uni.showToast({ title: '请选择预计到店时间', icon: 'none' })
@@ -850,6 +877,26 @@
               }))
            if (luggageList.length === 0) {
               uni.showToast({ title: '请选择行李类型', icon: 'none' })
               return
            }
            if (!this.form.goodType) {
               uni.showToast({ title: '请选择物品信息', icon: 'none' })
               return
            }
            if (!this.form.goodsImages ||!this.form.goodsImages.length) {
               uni.showToast({ title: '请上传物品照片', icon: 'none' })
               return
            }
            if (!this.form.goodsImages ||!this.form.goodsImages.length) {
               uni.showToast({ title: '请上传物品照片', icon: 'none' })
               return
            }
            if (this.form.insurance !== '' || this.form.insurance <= 0) {
               uni.showToast({ title: '请输入保价费', icon: 'none' })
               return
            }
            if (!this.agreementChecked) {
               uni.showToast({ title: '请先阅读并同意用户服务协议及隐私政策', icon: 'none' })
               return
            }
            const items = luggageList.map(item => ({
@@ -877,7 +924,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 +952,7 @@
               signType: paymentData.signType || 'MD5',
               paySign: paymentData.paySign || '',
               success: (res) => {
                  uni.navigateTo({
                  uni.redirectTo({
                     url: '/pages/payment-success/payment-success?orderId=' + orderId
                  });
               },
@@ -915,6 +962,9 @@
                  } else {
                     uni.showToast({ title: '支付失败', icon: 'none' })
                  }
                  uni.redirectTo({
                     url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
                  });
               }
            })
         }
@@ -954,8 +1004,8 @@
      position: relative;
      width: 50%;
      text-align: center;
      font-size: 28rpx;
      font-weight: 500;
       font-weight: 600;
       font-size: 32rpx;
      color: #9097a3;
   }

@@ -988,8 +1038,7 @@
   .store-popup-wrap {
      background: #ffffff;
      border-radius: 24rpx 24rpx 0 0;
      padding: 0 30rpx;
      box-sizing: border-box;
      padding: 0 30rpx 16rpx 30rpx;
      box-sizing: border-box;
   }

@@ -1113,16 +1162,20 @@
   .store-option-address-row {
      margin-top: 8rpx;
      display: flex;
      align-items: center;
      align-items: flex-start;
      flex-wrap: wrap;
   }

   .store-option-address-icon {
      flex-shrink: 0;
      width: 24rpx;
      height: 24rpx;
      margin-right: 4rpx;
      margin-top: 6rpx;
   }

   .store-option-address {
      flex: 1;
      font-size: 26rpx;
      color: #9ea4af;
   }
@@ -1206,6 +1259,7 @@
         display: flex;
         align-items: center;
         image {
            flex-shrink: 0;
            width: 24rpx;
            height: 24rpx;
            margin-right: 4rpx;
@@ -1818,7 +1872,7 @@
      padding-bottom: 14rpx;
      display: flex;
      align-items: center;
      justify-content: flex-end;
      justify-content: space-between;
      font-size: 22rpx;
   }

@@ -1826,6 +1880,12 @@
      color: #999999;
   }

   .insurance-tip-warning {
      color: #ff4d4f;
      font-size: 22rpx;
      font-weight: 400;
   }

   .insurance-tip-value {
      margin-left: 8rpx;
      color: #ff4d4f;