Merge remote-tracking branch 'origin/master'

doum

2026-04-30 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

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

@@ -16,12 +16,12 @@

      <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">
                        <text class="cell-title">{{ selectedStore ? selectedStore.name : servicePointPlaceholder }}</text>
                        <view class="store-cell-copy-addr" v-if="selectedStore">
                        <view class="store-cell-copy-addr1" v-if="selectedStore">
                           <image src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
                           <text class="store-cell-subtitle">{{ selectedStore.address }}</text>
                        </view>
@@ -33,22 +33,43 @@
            </view>

            <view v-else class="address-card section-card">
               <view class="address-row" @tap="openStorePopup">
               <view class="address-row" @click="openStorePopup">
                  <view class="address-left">
                     <view class="address-badge send">寄</view>
                     <view class="address-copy">
                        <text class="address-title">寄件地址</text>
                        <text class="address-desc">请选择寄件服务点</text>
                        <text class="address-title" v-if="!sendStore">寄件地址</text>
                        <text class="address-desc" v-if="!sendStore">请选择寄件服务点</text>
                        <view v-if="sendStore" class="store-cell-copy-addr">
                           <text class="store-cell-title">{{ sendStore.name }}</text>
                           <view class="store-cell-subtitle-container">
                              <image src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
                              <text class="store-cell-subtitle">{{ sendStore.address }}</text>
                           </view>
                        </view>
                     </view>
                  </view>
                  <u-icon name="arrow-right" size="20" color="#222222"></u-icon>
               </view>
               <view class="address-row no-border" @tap="openReceiveAddress">
               <view class="address-row no-border" @click="openReceiveAddress">
                  <view class="address-left">
                     <view class="address-badge receive">收</view>
                     <view class="address-copy">
                        <text class="address-title">取件地址</text>
                        <text class="address-desc">请选择取件服务点或者其他地址</text>
                        <text class="address-title" v-if="!receiveStore && !receiveAddr">取件地址</text>
                        <text class="address-desc" v-if="!receiveStore && !receiveAddr">请选择取件服务点或者其他地址</text>
                        <view v-if="receiveStore" class="store-cell-copy-addr">
                           <text class="store-cell-title">{{ receiveStore.name }}</text>
                           <view class="store-cell-subtitle-container">
                              <image src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
                              <text class="store-cell-subtitle">{{ receiveStore.address }}</text>
                           </view>
                        </view>
                        <view v-if="receiveAddr" class="store-cell-copy-addr">
                           <text class="store-cell-title">{{ receiveAddr.name }}</text>
                           <view class="store-cell-subtitle-container">
                              <image src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
                              <text class="store-cell-subtitle">{{ receiveAddr.addr }}</text>
                           </view>
                        </view>
                     </view>
                  </view>
                  <u-icon name="arrow-right" size="20" color="#222222"></u-icon>
@@ -112,7 +133,7 @@
                     <text class="section-title">寄存行李类型</text>
                     <text class="section-desc">（多选，必填）</text>
                  </view>
                  <view class="price-note">
                  <view class="price-note"  @click="goRichText(9)">
                     <image class="price-note-icon" src="/static/icon/ic_tips@2x.png" mode="widthFix"></image>
                     <text>价格说明</text>
                  </view>
@@ -124,15 +145,17 @@
                  :class="{ active: item.count > 0 }"
               >
                  <view class="luggage-info">
                     <image class="luggage-image" :src="item.iconFull" mode="widthFix"></image>
                     <view class="luggage-image">
                        <image style="height: 100%;"  :src="item.iconFull" mode="heightFix"></image>
                     </view>
                     <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>
@@ -159,7 +182,7 @@
               </view>
            </view>

            <view v-if="activeMode === 'city'" class="section-card service-time-card">
            <view v-if="activeMode === 'city' && amountData" class="section-card service-time-card">
               <view class="section-head">
                  <text class="section-title">服务时效</text>
                  <text class="section-desc">（必选）</text>
@@ -168,14 +191,14 @@
                  v-for="item in serviceTimes"
                  :key="item.id"
                  class="service-time-item"
                  :class="{ active: selectedServiceTime === item.id }"
                  @tap="selectedServiceTime = item.id"
                  :class="{ active: isUrgent === item.id }"
                  @tap="isUrgent = item.id"
               >
                  <text class="service-time-name">
                     <text>标速达</text>
                     <text>(预计6小时内送达)</text>
                     <text>{{ item.name }}</text>
                     <text>(预计{{ item.serviceTime }}小时内送达)</text>
                  </text>
                  <text class="service-time-price">{{ item.price }}</text>
                  <text class="service-time-price">￥{{ item.price }}</text>
               </view>
            </view>

@@ -187,9 +210,13 @@
                     <text class="unit-text">元</text>
                  </view>
               </view>
               <view v-if="insuranceFeeText" class="insurance-tip-row">
                  <text class="insurance-tip-label">物品保费:</text>
                  <text class="insurance-tip-value">{{ insuranceFeeText }}</text>
               <view v-if="amountData || showInsuranceTip" class="insurance-tip-row">
                  <text v-if="showInsuranceTip" class="insurance-tip-warning">{{ showInsuranceTipText }}</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>

@@ -206,7 +233,7 @@
      <u-popup :show="showStorePopup" mode="bottom" round="24" :closeOnClickOverlay="true" @close="showStorePopup = false">
         <view class="store-popup-wrap">
            <view class="store-popup-head">
               <text class="store-popup-title">选择服务点</text>
               <text class="store-popup-title">{{ storePopupType === 'receive' ? '选择取件服务点' : (activeMode === 'city' ? '选择寄件服务点' : '选择服务点') }}</text>
               <view class="store-popup-close" @tap="showStorePopup = false">
                  <u-icon name="close" size="28" color="#999999"></u-icon>
               </view>
@@ -224,7 +251,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>
@@ -234,7 +261,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">
@@ -259,23 +286,26 @@
                  <text class="goods-main-title">物品名称</text>
                  <text class="goods-main-required">（必选）</text>
               </view>
               <view class="goods-danger-tip">
               <view class="goods-danger-tip"  @click="goRichText(10)">
                  <image class="goods-danger-icon" src="/static/icon/ic_tips@2x.png" mode="widthFix"></image>
                  <text>禁寄物品</text>
               </view>
            </view>
            <text class="goods-popup-desc">为确保物品寄递安全，请检查是否不夹带易燃易爆物品</text>
            <view class="goods-tag-grid">
               <view
                  v-for="(item, index) in goodsOptions"
                  :key="index"
                  class="goods-tag"
                  :class="{ active: item.active }"
                  @click="goodsOptions.forEach((row,i) => row.active = i === index)"
               >
                  <text>{{ item.name }}</text>
            <view style="display: block;height: 500rpx;overflow-y: auto;margin-top:10px ;">
               <view class="goods-tag-grid">
                  <view
                     v-for="(item, index) in goodsOptions"
                     :key="index"
                     class="goods-tag"
                     :class="{ active: item.active }"
                     @click="goodsOptions.forEach((row,i) => row.active = i === index)"
                  >
                     <text>{{ item.name }}</text>
                  </view>
               </view>
            </view>
            </view> 
				
            <view class="goods-save-btn" @tap="confirmGoods">保存</view>
         </view>
      </u-popup>
@@ -296,20 +326,40 @@
                  </view>
                  <text class="amount-row-value">{{ '￥' + item.unitPrice }}</text>
               </view>
               <view v-if="activeMode === 'city' && amountData.distance" class="amount-row amount-row-extra">
                  <view class="amount-row-left">
                     <text class="amount-row-label">配送里程</text>
                  </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>
                  </view>
                  <text class="amount-row-value">{{ '￥' + amountData.insuranceFee }}</text>
               </view>
            </view>
            <view class="agreement-bar popup-agreement-bar">
               <image class="agreement-icon" src="/static/icon/ic_accept_sel@2x.png" mode="widthFix"></image>
            <view class="agreement-bar popup-agreement-bar" @click="toggleAgreement">
               <image class="agreement-icon" :src="agreementChecked ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="widthFix" />
               <text class="agreement-text">我已阅读并同意</text>
               <text class="agreement-link">《用户服务协议》</text>
               <text class="agreement-link" @tap="goRichText(0)">《用户服务协议》</text>
               <text class="agreement-text">及</text>
               <text class="agreement-link">《隐私政策》</text>
               <text class="agreement-link" @tap="goRichText(1)">《隐私政策》</text>
            </view>
            <view class="bottom-action-row popup-action-row">
               <view class="total-wrap">
                  <text class="total-label">总费用</text>
                  <text class="total-price">{{ amountData ? '￥' + amountData.totalPrice : '￥--' }}</text>
                  <text class="detail-text">明细</text>
                  <u-icon name="arrow-up" size="13" color="#7B7F86"></u-icon>
                  <view style="display: flex; align-items: center;" @click="showAmountPopup = false">
                     <text class="detail-text">明细</text>
                     <u-icon name="arrow-up" size="13" color="#7B7F86"></u-icon>
                  </view>
               </view>
               <view class="submit-btn active-submit-btn" @click="createOrder">立即下单</view>
            </view>
@@ -317,23 +367,34 @@
      </u-popup>

      <view class="bottom-bar">
         <view class="agreement-bar">
            <image class="agreement-icon" :src="agreementChecked ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="widthFix"></image>
         <view class="agreement-bar" @click="toggleAgreement">
            <image class="agreement-icon" :src="agreementChecked ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="widthFix" />
            <text class="agreement-text">我已阅读并同意</text>
            <text class="agreement-link">《用户服务协议》</text>
            <text class="agreement-link" @click="goRichText(0)">《用户服务协议》</text>
            <text class="agreement-text">及</text>
            <text class="agreement-link">《隐私政策》</text>
            <text class="agreement-link" @click="goRichText(1)">《隐私政策》</text>
         </view>
         <view class="bottom-action-row">
            <view class="total-wrap">
               <text class="total-label">总费用</text>
               <text class="total-price">{{ amountData ? '￥' + amountData.totalPrice : '￥--' }}</text>
               <text class="detail-text detail-click" @tap.stop="openAmountPopup">明细</text>
               <u-icon name="arrow-down" size="18" color="#999999"></u-icon>
               <template v-if="amountData">
                  <text class="detail-text detail-click" @tap.stop="openAmountPopup">明细</text>
                  <u-icon name="arrow-down" size="18" color="#999999"></u-icon>
               </template>
            </view>
            <view class="submit-btn active-submit-btn" @click="createOrder">立即下单</view>
         </view>
      </view>
		
      <!-- 选择服务点/地址 -->
      <u-action-sheet
         :show="showReceiveAddress"
         @close="showReceiveAddress = false"
         @select="caozuo"
         :actions="actions"
         :round="15"
         cancelText="取消" />
   </view>
</template>

@@ -354,13 +415,13 @@
               { label: '就地寄存', value: 'local' },
               { label: '同城寄送', value: 'city' }
            ],
            agreementChecked: true,
            agreementChecked: false,
            tempSelectedStoreId: 2,
            selectedStoreId: 2,
            tempSelectedGoodsIds: [1],
            selectedGoodsIds: [1],
            selectedLuggageId: 1,
            selectedServiceTime: 1,
            isUrgent: 0,
            form: {
               receiver: '',
               mobile: '',
@@ -373,14 +434,17 @@
               goodsImages: [],
            },
            amountData: null,
            showInsuranceTip: false,
            showInsuranceTipText: '',
            luggageTypes: [],
            serviceTimes: [
               { id: 1, name: '标准达(预计6小时内送达)', price: '￥50' },
               { id: 2, name: '急速达(预计4小时内送达)', price: '￥70' }
            ],
            serviceTimes: [],

            storeList: [],
            selectedStore: null,
            sendStore: null,
            receiveStore: null,
            receiveAddr: null,
            storePopupType: 'send',
            storeForm: {
               keyword: '',
               page: 1,
@@ -388,13 +452,26 @@
            },

            goodsOptions: [],
            uploadedImages: []
            uploadedImages: [],

            showReceiveAddress: false,
            actions: [
               { name: '选择服务点' },
               { name: '选择地址簿' }
            ]
         }
      },
      watch: {
         'form.insurance': {
            handler() {
               this.calculateLocalPrice()
            }
         },
         isUrgent: {
            handler() {
               if (this.activeMode === 'city') {
                  this.calculateRemotePrice()
               }
            }
         }
      },
@@ -412,12 +489,6 @@
               .map(item => item.name)
            return labels.join('、')
         },
         insuranceFeeText() {
            if (!this.form.insurance) {
               return ''
            }
            return '+10'
         },
         totalPriceText() {
            return '￥150.00'
         }
@@ -426,8 +497,27 @@
         this.getNearbyShopList()
         this.getCategoryList()
         this.getCitySizeList()
         this.agreementChecked=false
         uni.$on('updateAddress', (data) => {
            console.log(data)
            this.receiveAddr = data
         })
      },
      methods: {
         caozuo(e) {
            var that = this;
            if (e.name === '选择服务点') {
               that.storePopupType = 'receive'
               that.receiveStore = null
               that.showStorePopup = true
            } else if (e.name === '选择地址簿') {
               that.receiveAddr = null
               uni.navigateTo({
                  url: '/pages/address/address?type=1'
               })
            }
            that.showReceiveAddress = false
         },
         async uploadFiles(filePaths, maxCount = 9) {
            if (!filePaths || filePaths.length === 0) {
               return []
@@ -497,9 +587,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: '上传成功',
@@ -519,28 +610,75 @@
         },
         switchMode(mode) {
            this.activeMode = mode
            this.selectedStore = null
            this.sendStore = null
            this.receiveStore = null
            this.receiveAddr = null
            this.form.receiver = ''
            this.form.mobile = ''
            this.form.arriveTime = ''
            this.form.pickupTime = ''
            this.form.goodType = ''
            this.form.goodTypeName = ''
            this.form.insurance = ''
            this.form.remark = ''
            this.form.goodsImages = []
            this.amountData = null
            this.uploadedImages = []
            this.luggageTypes.forEach(item => {
               item.count = 0
            })
         },
         toggleAgreement() {
            this.agreementChecked = !this.agreementChecked
         },
         goRichText(type) {
            uni.navigateTo({
               url: '/pages/rich-text/rich-text?type=' + type
            })
         },
         openReceiveAddress() {
            uni.showToast({
               title: '取件地址待接入',
               icon: 'none'
            })
            this.showReceiveAddress = true
         },
         openAmountPopup() {
            this.showAmountPopup = true
         },
         openStorePopup() {
            this.storePopupType = 'send'
            this.tempSelectedStoreId = null
            this.showStorePopup = true
         },
         openStorePopup0() {
            this.storePopupType = 'send0'
            this.tempSelectedStoreId = null
            this.showStorePopup = true
         },
         confirmStore() {
            this.selectedStore = this.storeList.find(item => item.active)
				
            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') {
               this.receiveStore = selected
               this.receiveAddr = null
               this.calculateRemotePrice()
            } else {
               this.selectedStore = selected
               this.calculateLocalPrice()
            }
            this.showStorePopup = false
            this.calculateLocalPrice()
         },
         confirmGoods() {
            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 = this.goodsOptions.find(item => item.active)?.relationOtherField === '1'
            this.showInsuranceTipText = this.goodsOptions.find(item => item.active)?.relationRemark
            this.showGoodsPopup = false
         },
         confirmArriveTime(e) {
@@ -561,7 +699,12 @@
            const day = String(date.getDate()).padStart(2, '0')
            const hour = String(date.getHours()).padStart(2, '0')
            const minute = String(date.getMinutes()).padStart(2, '0')
            this.form.pickupTime = `${year}-${month}-${day} ${hour}:${minute}`
            const pickupTime = `${year}-${month}-${day} ${hour}:${minute}`
            if (this.form.arriveTime && new Date(pickupTime) <= new Date(this.form.arriveTime)) {
               uni.showToast({ title: '预计取件时间必须大于预计到店时间', icon: 'none' })
               return
            }
            this.form.pickupTime = pickupTime
            this.showPickupTimePicker = false
            this.calculateLocalPrice()
         },
@@ -593,6 +736,7 @@
                  latitude: this.latitude,
                  longitude: this.longitude,
                  cityId: this.cityId,
                  name:this.storeForm.keyword,
                  sortType: 1
               }
            })
@@ -616,7 +760,15 @@
            this.calculateLocalPrice()
         },
         async calculateLocalPrice() {
            if (this.activeMode === 'city') {
               this.calculateRemotePrice()
            } else {
               this.calculateLocalPriceOnly()
            }
         },
         async calculateLocalPriceOnly() {
            if (!this.selectedStore || !this.form.arriveTime || !this.form.pickupTime) {
               this.amountData = null
               return
            }
            const luggageList = this.luggageTypes
@@ -626,6 +778,7 @@
                  quantity: item.count
               }))
            if (luggageList.length === 0) {
               this.amountData = null
               return
            }
            const res = await this.$u.api.calculateLocalPrice({
@@ -641,12 +794,97 @@
                  item.unitPrice = item.unitPrice / 100
               })
               res.data.totalPrice = res.data.totalPrice / 100
               res.data.insuranceFee = res.data.insuranceFee / 100
               this.amountData = res.data
            }
         },
         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
               .filter(item => item.count > 0)
               .map(item => ({
                  categoryId: item.id,
                  quantity: item.count
               }))
            if (luggageList.length === 0) {
               this.amountData = null
               return
            }
            let fromLat = ''
            let fromLgt = ''
            let toLat = ''
            let toLgt = ''
            if (this.sendStore) {
               fromLat = this.sendStore.latitude
               fromLgt = this.sendStore.longitude
            }
            if (this.receiveStore) {
               toLat = this.receiveStore.latitude
               toLgt = this.receiveStore.longitude
            } else if (this.receiveAddr) {
               toLat = this.receiveAddr.latitude
               toLgt = this.receiveAddr.longitude
            }
            const res = await this.$u.api.calculateRemotePrice({
               cityId: this.cityId,
               fromLat: fromLat,
               fromLgt: fromLgt,
               toLat: toLat,
               toLgt: toLgt,
               urgent: this.isUrgent,
               depositStartTime: this.form.arriveTime + ':00',
               depositEndTime: this.form.pickupTime + ':00',
               items: luggageList,
               declaredAmount: this.form.insurance || 0
            })
            if (res.code === 200) {
               res.data.itemList.forEach(item => {
                  item.unitPrice = item.unitPrice / 100
               })
               res.data.totalPrice = res.data.totalPrice / 100
               res.data.insuranceFee = res.data.insuranceFee / 100
               this.serviceTimes = [
                  { id: 0, name: '标准达', serviceTime: res.data.standardHours, price: res.data.itemPrice / 100 },
                  { id: 1, name: '急速达', serviceTime: res.data.urgentHours, price: (res.data.urgentFee + res.data.itemPrice) / 100 }
               ]
               this.amountData = res.data
            }
         },
         async createOrder() {
            if (!this.selectedStore) {
               uni.showToast({ title: '请选择门店', icon: 'none' })
            if (this.activeMode === 'local') {
               if (!this.selectedStore) {
                  uni.showToast({ title: '请选择门店', icon: 'none' })
                  return
               }
            } else {
               if (!this.sendStore) {
                  uni.showToast({ title: '请选择寄件服务点', icon: 'none' })
                  return
               }
               if (!this.receiveStore && !this.receiveAddr) {
                  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) {
@@ -655,6 +893,10 @@
            }
            if (!this.form.pickupTime) {
               uni.showToast({ title: '请选择预计取件时间', icon: 'none' })
               return
            }
            if (new Date(this.form.pickupTime) <= new Date(this.form.arriveTime)) {
               uni.showToast({ title: '预计取件时间必须大于预计到店时间', icon: 'none' })
               return
            }
            const luggageList = this.luggageTypes
@@ -667,14 +909,33 @@
               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 => ({
               categoryId: item.categoryId,
               quantity: item.quantity
            }))
            const res = await this.$u.api.createOrder({
            let orderParams = {
               cityId: this.cityId,
               declaredAmount: this.form.insurance || 0,
               depositShopId: this.selectedStore.id,
               expectedDepositTime: this.form.arriveTime + ':00',
               expectedTakeTime: this.form.pickupTime + ':00',
               goodType: this.form.goodType,
@@ -683,25 +944,47 @@
               remark: this.form.remark,
               takePhone: this.form.mobile,
               takeUser: this.form.receiver,
               type: this.activeMode === 'local' ? 0 : 1
            })
               type: this.activeMode === 'local' ? 0 : 1,
               isUrgent: this.isUrgent
            }
            if (this.activeMode === 'local') {
               orderParams.depositShopId = this.selectedStore.id
            } else {
               orderParams.depositShopId = this.sendStore.id
               orderParams.fromShopId = this.sendStore.id
               if (this.receiveStore) {
                  orderParams.toType = 0
                  orderParams.takeShopId = this.receiveStore.id
                  orderParams.takeLat = this.receiveStore.latitude
                  orderParams.takeLgt = this.receiveStore.longitude
                  orderParams.takeLocation = this.receiveStore.address
               } else if (this.receiveAddr) {
                  orderParams.toType = 1
                  orderParams.toAddrId = this.receiveAddr.id
                  orderParams.takeLat = this.receiveAddr.latitude
                  orderParams.takeLgt = this.receiveAddr.longitude
                  orderParams.takeLocation = this.receiveAddr.addr
               }
            }
            const res = await this.$u.api.createOrder(orderParams)
            if (res.code === 200) {
               uni.showToast({ title: '下单成功', icon: 'success' })
               if (res.data) {
                  this.processPayment(res.data.response)
                  this.processPayment(res.data.response, res.data.orderId)
               }
            }
         },
         processPayment(paymentData) {
         processPayment(paymentData, orderId) {
            uni.requestPayment({
               provider: 'wxpay',
               timeStamp: paymentData.timeStamp || '',
               nonceStr: paymentData.nonceStr || '',
               package: paymentData.packageValue || '',
               package: paymentData.package || '',
               signType: paymentData.signType || 'MD5',
               paySign: paymentData.paySign || '',
               success: (res) => {
                  uni.showToast({ title: '支付成功', icon: 'success' })
                  uni.redirectTo({
                     url: '/pages/payment-success/payment-success?orderId=' + orderId
                  });
               },
               fail: (err) => {
                  if (err.errMsg.includes('cancel')) {
@@ -709,6 +992,11 @@
                  } else {
                     uni.showToast({ title: '支付失败', icon: 'none' })
                  }
                  uni.setStorageSync("orderStatus",-2)
                  uni.switchTab({
                     url: '/pages/itinerary/itinerary'
                  });
						 
               }
            })
         }
@@ -748,8 +1036,8 @@
      position: relative;
      width: 50%;
      text-align: center;
      font-size: 28rpx;
      font-weight: 500;
       font-weight: 600;
       font-size: 32rpx;
      color: #9097a3;
   }

@@ -782,8 +1070,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;
   }

@@ -907,16 +1194,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;
   }
@@ -982,14 +1273,29 @@
      flex-direction: column;
      justify-content: center;
   }
	
   .store-cell-copy-addr {

   .store-cell-copy-addr1 {
      display: flex;
      align-items: baseline;
      image {
         width: 24rpx;
         height: 24rpx;
         margin-right: 4rpx;
      }
   }
	
   .store-cell-copy-addr {
      display: flex;
      flex-direction: column;
      .store-cell-subtitle-container {
         display: flex;
         align-items: center;
         image {
            flex-shrink: 0;
            width: 24rpx;
            height: 24rpx;
            margin-right: 4rpx;
         }
      }
   }

@@ -1210,7 +1516,7 @@

   .luggage-item {
      display: flex;
      align-items: baseline;
      align-items: flex-end;
      justify-content: space-between;
      padding: 24rpx;
      box-sizing: border-box;
@@ -1236,6 +1542,9 @@
      height: 100rpx;
      border-radius: 8rpx;
      margin-right: 18rpx;
      display: flex;
      align-items: center;
      justify-content: center;
      background: #f0f1f4;
      overflow: hidden;
      margin-right: 24rpx;
@@ -1481,6 +1790,9 @@
      font-weight: 500;
      color: #333333;
      border: 2rpx solid transparent;
     white-space: nowrap; /* 防止文本换行 */
     overflow: hidden; /* 隐藏溢出的内容 */
     text-overflow: ellipsis; /* 显示省略号来代表被修剪的文本 */
      box-sizing: border-box;
   }

@@ -1598,7 +1910,7 @@
      padding-bottom: 14rpx;
      display: flex;
      align-items: center;
      justify-content: flex-end;
      justify-content: space-between;
      font-size: 22rpx;
   }

@@ -1606,6 +1918,12 @@
      color: #999999;
   }

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

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