Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

2026-04-28 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

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

@@ -133,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>
@@ -145,10 +145,12 @@
                  :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">
@@ -208,9 +210,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">{{ 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>

@@ -255,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">
@@ -280,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>
@@ -317,19 +326,31 @@
                  </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="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" @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" @tap="goRichText('protocol')">《用户服务协议》</text>
               <text class="agreement-link" @tap="goRichText(0)">《用户服务协议》</text>
               <text class="agreement-text">及</text>
               <text class="agreement-link" @tap="goRichText('privacy')">《隐私政策》</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>
                  <view @click="showAmountPopup = false">
                  <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>
@@ -343,9 +364,9 @@
         <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" @tap="goRichText('protocol')">《用户服务协议》</text>
            <text class="agreement-link" @click="goRichText(0)">《用户服务协议》</text>
            <text class="agreement-text">及</text>
            <text class="agreement-link" @tap="goRichText('privacy')">《隐私政策》</text>
            <text class="agreement-link" @click="goRichText(1)">《隐私政策》</text>
         </view>
         <view class="bottom-action-row">
            <view class="total-wrap">
@@ -359,6 +380,7 @@
            <view class="submit-btn active-submit-btn" @click="createOrder">立即下单</view>
         </view>
      </view>
		
      <!-- 选择服务点/地址 -->
      <u-action-sheet
         :show="showReceiveAddress"
@@ -387,7 +409,7 @@
               { label: '就地寄存', value: 'local' },
               { label: '同城寄送', value: 'city' }
            ],
            agreementChecked: true,
            agreementChecked: false,
            tempSelectedStoreId: 2,
            selectedStoreId: 2,
            tempSelectedGoodsIds: [1],
@@ -406,6 +428,8 @@
               goodsImages: [],
            },
            amountData: null,
            showInsuranceTip: false,
            showInsuranceTipText: '',
            luggageTypes: [],
            serviceTimes: [],

@@ -467,7 +491,7 @@
         this.getNearbyShopList()
         this.getCategoryList()
         this.getCitySizeList()
			
         this.agreementChecked=false
         uni.$on('updateAddress', (data) => {
            console.log(data)
            this.receiveAddr = data
@@ -647,6 +671,8 @@
            }
            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) {
@@ -821,10 +847,6 @@
            }
         },
         async createOrder() {
            if (!this.agreementChecked) {
               uni.showToast({ title: '请先阅读并同意用户服务协议及隐私政策', icon: 'none' })
               return
            }
            if (this.activeMode === 'local') {
               if (!this.selectedStore) {
                  uni.showToast({ title: '请选择门店', icon: 'none' })
@@ -839,6 +861,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' })
@@ -860,6 +896,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 => ({
@@ -925,9 +981,11 @@
                  } else {
                     uni.showToast({ title: '支付失败', icon: 'none' })
                  }
                  uni.redirectTo({
                     url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
                  uni.setStorageSync("orderStatus",-2)
                  uni.switchTab({
                     url: '/pages/itinerary/itinerary'
                  });
						 
               }
            })
         }
@@ -967,8 +1025,8 @@
      position: relative;
      width: 50%;
      text-align: center;
      font-size: 28rpx;
      font-weight: 500;
       font-weight: 600;
       font-size: 32rpx;
      color: #9097a3;
   }

@@ -1001,8 +1059,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;
   }

@@ -1126,16 +1183,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;
   }
@@ -1444,7 +1505,7 @@

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

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

@@ -1840,6 +1907,12 @@
      color: #999999;
   }

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

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