Merge remote-tracking branch 'origin/master'

rk

2025-08-27 58d63637b67a7c565618379268da604e6231fc4c

 small-program/pages/packaging-worker/packaging-worker.vue

@@ -84,10 +84,14 @@
                  <view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
               </view>
               <view class="list-item-row">
                  <view class="list-item-row-label">天数</view>
                  <view class="list-item-row-label" v-if="form.carType === 0">天数</view>
                  <view class="list-item-row-label" v-if="form.carType === 1">小时数</view>
                  <view class="list-item-row-label" v-if="form.carType === 2">重量</view>
                  <view class="list-item-row-val">
                     <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="请输入" />
                     <text>天</text>
                     <input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="请输入" />
                     <text v-if="form.carType === 0">天</text>
                     <text v-if="form.carType === 1">小时</text>
                     <text v-if="form.carType === 2">斤</text>
                  </view>
               </view>
               <view class="list-item-row">
@@ -143,6 +147,7 @@
         :show="show"
         color="#00BC12"
         mode="range"
          :allowSameDay="true"
         @close="show = false"
         @confirm="confirmDate" />
      
@@ -198,11 +203,12 @@
            },
            settlementType: [
               { name: '按天付费', id: 0 },
               { name: '按次付费', id: 1 },
               { name: '按小时付费', id: 1 },
               { name: '按重量付费', id: 2 }
            ],
            cateList: [],
            viewStatus: false
            viewStatus: false,
            workDays: 0
         };
      },
      onLoad(option) {
@@ -296,7 +302,11 @@
         confirmDate(e) {
            this.form.startDate = e[0]
            this.form.endDate = e[e.length - 1]
            this.form.priceNum1 = e.length;
            let time = this.form.startDate == this.form.endDate ? 1 : 0
            this.workDays = e.length - time;
            if (this.form.carType === 0) {
               this.form.priceNum1 = e.length - time;
            }
            this.show = false
            this.getPrice()
         },
@@ -305,7 +315,7 @@
               success: (res) => {
                  this.form.lat = res.latitude
                  this.form.lgt = res.longitude
                  this.form.address = res.address
                  this.form.address =res.name ||  res.address
               }
            });
         },
@@ -313,10 +323,13 @@
            this.form.carType = id
            if (id === 0) {
               this.form.priceUnit = '元/人/天'
               this.form.priceNum1 = this.workDays
            } else if (id === 1) {
               this.form.priceUnit = '元/人/小时'
               this.form.priceNum1 = ''
            } else {
               this.form.priceUnit = '元/斤'
               this.form.priceNum1 = ''
            }
         },
         confirmCategary(e) {