Merge remote-tracking branch 'origin/master'

jiangping

2025-07-19 0cfbaf9a439dc75824c52a6e58b6849064afbc80

 small-program/pages/demand-hall/demand-hall.vue

@@ -36,7 +36,7 @@
         </view>
         <!-- 发单方 -->
         <view class="index-list" v-if="typeViewId === 0">
            <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
            <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
               <view class="index-list-item-head">
                  <view class="index-list-item-head-l">
                     <view class="xoam"></view>
@@ -85,7 +85,7 @@
                  </view>
                  <view class="index-list-item-dz">
                     <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
                     <text>{{item.startDate}} 至 {{item.endDate}}（{{item.priceNum1}}天）</text>
                     <text>{{item.startDate}} 至 {{item.endDate}}（{{item.totalDays}}天）</text>
                  </view>
               </template>
               <view class="index-list-item-price">
@@ -344,6 +344,11 @@
         this.getOrderList()
      },
      methods: {
         jumpDesc(item) {
            uni.navigateTo({
               url: `/pages/order-details/order-details?id=${item.id}`
            })
         },
         // 修改
         jumpEdit(item) {
            if (item.type === 0 && item.workType === 0) {
@@ -357,6 +362,10 @@
            } else if (item.type === 0 && item.workType === 2) {
               uni.navigateTo({
                  url: `/pages/packaging-worker/packaging-worker?id=${item.id}`
               })
            } else if (item.type === 1) {
               uni.navigateTo({
                  url: `/pages/freight/freight?id=${item.id}`
               })
            }
         },
@@ -404,6 +413,8 @@
               
               if (this.orderList.length === res.data.total) {
                  this.next = false
               } else {
                  this.page += 1
               }
            })
         },