Merge remote-tracking branch 'origin/master'

doum

2025-08-22 391c0cfc4ba595ef26c7a2315c555d8c75afec7d

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

@@ -36,7 +36,10 @@
         </view>
         <!-- 发单方 -->
         <view class="index-list" v-if="typeViewId === 0">
            <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
            <view class="index-list-wu" v-if="orderList.length === 0">
               <text>已加载全部数据</text>
            </view>
            <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
               <view class="index-list-item-head">
                  <view class="index-list-item-head-l">
                     <view class="xoam"></view>
@@ -75,7 +78,7 @@
                     <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
                     <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
                     <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
                     <text>{{item.location}}</text>
                     <text>{{address.location}}</text>
                  </view>
               </view>
               <template v-if="[0, 2].includes(item.type)">
@@ -100,7 +103,7 @@
                     <view class="eidt-phone" v-if="item.status === 4 && item.commentStatus === 0">评价订单</view>
                     <view class="eidt-btn" v-if="[0,1,2].includes(item.status) && item.type !== 2" @click.stop="jumpEdit(item)">修改订单</view>
                     <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) ||  (item.type === 2 && item.status === 3)" @click.stop="jumpEdit(item)">继续支付</view>
                     <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">开始作业</view>
                     <!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">开始作业</view> -->
                     <view class="eidt-btn" v-if="item.status === 3" @click.stop="jumpDesc(item)">完成并支付</view>
                  </view>
               </view>
@@ -118,7 +121,7 @@
                     <text v-else-if="item.type === 1">运货单-{{item.categoryName}}-{{item.carUnit}}</text>
                     <text v-else-if="item.type === 2">订餐单</text>
                     <view class="tips" v-if="item.acceptType === 1">系统派单</view>
                     <view class="tips1" v-if="item.acceptType === 0">手动接单</view>
                     <view class="tips1" v-if="item.acceptType === 0">自主抢单</view>
                  </view>
                  <view class="index-list-item-head-r" v-if="item.status === 2">已接单</view>
                  <view class="index-list-item-head-r" v-if="item.status === 3">进行中</view>
@@ -146,7 +149,7 @@
                     <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
                     <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
                     <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
                     <text>{{item.location}}</text>
                     <text>{{address.location}}</text>
                  </view>
               </view>
               <template v-if="[0, 2].includes(item.type)">
@@ -450,6 +453,15 @@
         width: 100%;
         padding: 20rpx 30rpx;
         box-sizing: border-box;
         .index-list-wu {
            width: 100%;
            margin-top: 40rpx;
            text-align: center;
            text {
               font-size: 30rpx;
               color: #666666;
            }
         }
         .index-list-item {
            width: 100%;
            padding: 30rpx;