Merge remote-tracking branch 'origin/master'

doum

2025-09-15 82735e4d46ac7b9969facef2acc8f8e793b68f71

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

@@ -6,278 +6,221 @@
            <text>我的订单</text>
         </view>
      </view>
      <!-- 发单方 -->
      <view class="index-labs" v-if="type === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
         <view class="index-labs-row">
            全部
            <view class="index-labs-row-x"></view>
         </view>
         <view class="index-labs-row active">待接单</view>
         <view class="index-labs-row">已接单</view>
         <view class="index-labs-row">进行中</view>
         <view class="index-labs-row">待评价</view>
         <view class="index-labs-row">已取消</view>
      </view>
      <!-- 接单方 -->
      <view class="index-labs" v-if="type === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
         <view class="index-labs-row">
            全部
            <view class="index-labs-row-x"></view>
         </view>
         <view class="index-labs-row active">已接单</view>
         <view class="index-labs-row">进行中</view>
         <view class="index-labs-row">已完成</view>
         <view class="index-labs-row">已取消</view>
      </view>
      <!-- 发单方 -->
      <view class="index-list" v-if="type === 0">
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>订餐单</text>
               </view>
               <view class="index-list-item-head-r">待接单方接单</view>
            </view>
            <view class="index-list-item-info">
               午餐5元(30份)｜晚餐8元(20份)
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
               <text>长江西路大蜀山森林公园西门保安室</text>
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view></view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>运货单-小货车-厢式</text>
               </view>
               <view class="index-list-item-head-r">待接单方接单</view>
            </view>
            <view class="index-list-item-info">
               葡萄｜20000斤｜需2辆
            </view>
            <view class="index-list-item-date">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="address">
               <view class="address-xian"></view>
               <view class="address-row">
                  <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
                  <text>长江西路大蜀山森林公园西门保安室</text>
               </view>
               <view class="address-row">
                  <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
                  <text>长江西路大蜀山森林公园东门保安室</text>
               </view>
               <view class="address-row">
                  <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
                  <text>安徽莲花科技产业园豆米科技有限公司</text>
               </view>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view></view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>用工单-采摘工</text>
               </view>
               <view class="index-list-item-head-r">待接单</view>
            </view>
            <view class="index-list-item-info">
               葡萄｜2000斤
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
               <text>长江西路大蜀山森林公园西门保安室</text>
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view></view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
      </view>
      <!-- 接单方 -->
      <view class="index-list" v-if="type === 1">
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>订餐单</text>
                  <view class="tips">系统派单</view>
               </view>
               <view class="index-list-item-head-r">已接单</view>
            </view>
            <view class="index-list-item-info">
               午餐5元(30份)｜晚餐8元(20份)
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
               <text>长江西路大蜀山森林公园西门保安室</text>
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view class="eidt-tips">
                  <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
                  <text>订单已修改</text>
               </view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>运货单-小货车-厢式</text>
                  <view class="tips1">自主抢单</view>
               </view>
               <view class="index-list-item-head-r">已接单</view>
            </view>
            <view class="index-list-item-info">
               葡萄｜20000斤｜需2辆
            </view>
            <view class="index-list-item-date">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="address">
               <view class="address-xian"></view>
               <view class="address-row">
                  <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
                  <text>长江西路大蜀山森林公园西门保安室</text>
               </view>
               <view class="address-row">
                  <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
                  <text>长江西路大蜀山森林公园东门保安室</text>
               </view>
               <view class="address-row">
                  <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
                  <text>安徽莲花科技产业园豆米科技有限公司</text>
               </view>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view></view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
         <view class="index-list-item">
            <view class="index-list-item-head">
               <view class="index-list-item-head-l">
                  <view class="xoam"></view>
                  <text>用工单-采摘工</text>
                  <view class="tips1">自主抢单</view>
               </view>
               <view class="index-list-item-head-r">待接单</view>
            </view>
            <view class="index-list-item-info">
               葡萄｜2000斤
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
               <text>长江西路大蜀山森林公园西门保安室</text>
            </view>
            <view class="index-list-item-dz">
               <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
               <text>07-26 至 07-27（2天）</text>
            </view>
            <view class="index-list-item-price">
               <text>预估：</text>
               <text>¥1000.00</text>
            </view>
            <view class="eidt">
               <view></view>
               <view class="eidt-right">
                  <view class="eidt-close">取消订单</view>
                  <!-- <view class="eidt-close">删除订单</view>
                  <view class="eidt-phone">联系师傅</view>
                  <view class="eidt-phone">评价订单</view>
                  <view class="eidt-btn">修改订单</view>
                  <view class="eidt-btn">完成并支付</view> -->
               </view>
            </view>
         </view>
      </view>
      <!-- <view class="index-wu">
      <!-- 未登录 -->
      <view class="index-wu" v-if="!isLogin">
         <image src="/static/icon/default_login@2x.png" mode="widthFix"></image>
         <text>您还没有登录，请登录后查看订单</text>
         <button>登录</button>
      </view> -->
         <button @click="toLogin">登录</button>
      </view>
		
      <!-- 已登陆 -->
      <template v-else>
         <!-- 发单方 -->
         <view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
            <scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
               <view :class=" item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
                  {{item.name}}
                  <view class="index-labs-row-x" v-if=" item.id === status"></view>
               </view>
            </scroll-view>
         </view>
         <!-- 接单方 -->
         <view class="index-labs" v-if="typeViewId === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
            <scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
               <view :class=" item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
                  {{item.name}}
                  <view class="index-labs-row-x" v-if=" item.id === status "></view>
               </view>
            </scroll-view>
         </view>
         <!-- 发单方 -->
         <view class="index-list" v-if="typeViewId === 0">
            <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>
                     <text v-if="item.type === 0 && item.workType === 0">用工单 - 采摘工</text>
                     <text v-else-if="item.type === 0 && item.workType === 1">用工单 - 分拣工</text>
                     <text v-else-if="item.type === 0 && item.workType === 2">用工单 - 包装工</text>
                     <text v-else-if="item.type === 1">运货单 - {{item.categoryName}}</text>
                     <text v-else-if="item.type === 2">订餐单</text>
                  </view>
                  <view class="index-list-item-head-r" v-if="item.status === 0 || item.status === 5">待支付</view>
                  <view class="index-list-item-head-r" v-if="item.status === 1">待接单</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>
                  <view class="index-list-item-head-r hui" v-if="item.status === 4 && item.commentStatus !== 0">已完成</view>
                  <view class="index-list-item-head-r hui" v-if="item.status === 99">已取消</view>
                  <view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">待评价</view>
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
                  {{item.categoryName}}｜{{item.priceNum1}}斤
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
                  {{item.categoryName}}｜{{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
                  {{item.categoryName}}｜{{item.priceNum1}}天 | {{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
                  {{item.categoryName}}｜{{item.priceNum1}}小时 | {{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
                  {{item.categoryName}}｜{{item.priceNum1}}斤 | {{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 1">
                  {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}{{item.carType === 0?"天":"次"}}
               </view>
               <view class="index-list-item-info" v-if="item.type === 2">
                  {{item.wayInfoCopy}}
               </view>
               <view class="address" v-if="item.type === 1">
                  <view class="address-xian"></view>
                  <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
                     <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>{{address.location}}</text>
                  </view>
               </view>
               <template v-if="[0, 2].includes(item.type)">
                  <view class="index-list-item-dz">
                     <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
                     <text>{{item.location}}</text>
                  </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.totalDays}}天）</text>
                  </view>
               </template>
               <view class="index-list-item-price"> 
                  <text v-if="item.status==4 || item.type==2">已支付：</text>
                  <text v-if="item.status!=4&& item.type!=2">预估：</text>
                  <text>¥{{item.payAccount / 100}}</text>
               </view>
               <view class="eidt">
                  <view>
                     <view class="eidt-tips" v-if="item.status === 2 && item.isUpdate == 1"><text>已修改，待接单方确认</text></view>
                     <view class="eidt-tips" v-if="item.status === 5">
                        <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
                        <text>接单方已确认费用，请支付</text>
                     </view>
                   </view>
                  <view class="eidt-right">
                     <view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click.stop="orderId = item.id, show = true">取消订单</view>
                     <view class="eidt-phone" v-if="[2].includes(item.status)">联系师傅</view>
                     <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 &&  item.isUpdate!=1" @click.stop="jumpEdit(item)">修改订单</view>
                     <view class="eidt-btn" v-if="(item.type  == 2 && item.status === 0)" @click.stop="jumpDesc(item,1)">继续支付</view>
                     <!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">开始作业</view> -->
                     <view class="eidt-btn" v-if="item.type != 2 && item.status === 5" @click.stop="jumpDesc(item,2)">立即支付</view>
                     <view class="eidt-btn" v-if="item.type == 2 && item.status === 3" @click.stop="jumpDesc(item)">完成作业</view>
                  </view>
               </view>
            </view>
         </view>
         <!-- 接单方 -->
         <view class="index-list" v-if="typeViewId === 1">
            <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>
                     <text v-if="item.type === 0 && item.workType === 0">用工单 - 采摘工</text>
                     <text v-else-if="item.type === 0 && item.workType === 1">用工单 - 分拣工</text>
                     <text v-else-if="item.type === 0 && item.workType === 2">用工单 - 包装工</text>
                     <text v-else-if="item.type === 1">运货单 - {{item.categoryName}}</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>
                  <view class="index-list-item-head-r" v-if="item.status === 0 || item.status === 5">待支付</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>
                  <view class="index-list-item-head-r hui" v-if="item.status === 4">已完成</view>
                  <view class="index-list-item-head-r hui" v-if="item.status === 99">已取消</view>
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
                  {{item.categoryName}}｜{{item.priceNum1}}斤
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
                  {{item.categoryName}}｜{{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
                  {{item.categoryName}}｜{{item.priceNum1}}天 ｜{{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
                  {{item.categoryName}}｜{{item.priceNum1}}小时 ｜{{item.priceNum2}}人
               </view>
               <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
                  {{item.categoryName}}｜{{item.priceNum1}}斤 
               </view> 
               <view class="index-list-item-info" v-if="item.type === 1">
                  {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}{{item.carType === 0?"天":"次"}}
               </view>
               <view class="index-list-item-info" v-if="item.type === 2">
                  {{item.wayInfoCopy}}
               </view>
               <view class="address" v-if="item.type === 1">
                  <view class="address-xian"></view>
                  <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
                     <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>{{address.location}}</text>
                  </view>
               </view>
               <template v-if="[0, 2].includes(item.type)">
                  <view class="index-list-item-dz">
                     <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
                     <text>{{item.location}}</text>
                  </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>
                  </view>
               </template>
               <view class="index-list-item-price">
                  <text v-if="item.status==4">已支付：</text>
                  <text v-if="item.status!=4">预估：</text>
                  <text>¥{{item.payAccount / 100}}</text>
               </view>
               <view class="eidt">
                  <view class="eidt-tips" v-if="item.isUpdate === 1">
                     <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
                     <text>订单已修改</text>
                  </view>
                  <view class="eidt-tips" v-else></view>
						
                  <view class="eidt-right">
                     <view class="eidt-close" v-if="item.status === 2" @click.stop="orderId = item.id, show = true">取消订单</view>
                     <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click.stop="phoneCall(item.linkPhone)">联系业主</view>
                  </view>
               </view>
            </view>
         </view>
      </template>
		
      <u-modal
         title="温馨提示"
         :show="show"
         closeOnClickOverlay
         showCancelButton
      >
         <view class="slot-content">
            确认取消订单吗？
         </view>
         <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
            <view class="btn1" @click="show = false">我再想想</view>
            <view class="btn2" @click="cancelOrder">确认取消</view>
         </view>
      </u-modal>
		
   </view>
</template>

@@ -285,12 +228,269 @@
   import { mapState } from 'vuex'
   export default {
      computed: {
         ...mapState(['navHeight', 'statusbarHeight'])
         ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
      },
      async onShow(options) {
         var flag = getApp().globalData.orderStatus
         console.log(getApp().globalData,"=====================================")
         // this.status = ''
         // this.commentStatus=''
         // status: this.status === 5 ? 4 : this.status,
         // commentStatus: this.status === 5 ? 0 : '',
         if(flag =='1'){//发单方待接单
            this.status = 1				
         }else if(flag =='2'){//发单方进行中
            this.status = 3 
         }else if(flag =='3'){//发单方待评价
            this.status = 6				
         }else if(flag =='4'){//接单方已接单
            this.status =2				
         }else if(flag =='5'){//接单方进行中
            this.status =3	
         }else if(flag =='6'){//接单方已完成
            this.status =4
         }else if(flag =='0'){
            this.status = -1
         }
         console.log(getApp().globalData,this.status ,"=====================================")
         this.typeViewId = 0
         if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
            console.log('已登陆')
            this.isLogin = true
         /*    this.getOrderList()
            if (!this.isOnce) {
               this.commentStatus = ''
               this.orderList = []
               this.next = true
               this.page = 1
               this.getOrderList()
            } */
         } else {
            this.isLogin = false
            console.log('未登陆')
         }
         if(this.isLogin){
            if(this.typeViewId !== this.userInfo.useIdentity || flag !=null){
               this.typeViewId = this.userInfo.useIdentity || 0
               //如果发生
               this.initOrderList()
            }else{
               //如果未发生变化不刷新
               this.typeViewId = this.userInfo.useIdentity || 0
               if(!this.orderList || !this.orderList.length){
                  this.initOrderList()
               }else{
                  if( this.tempOrderId){
                     this.getOrderData()
                  }
               }
               console.log('this.tempOrderId',this.tempOrderId)
            }
         }
         getApp().globalData.orderStatus =null
      },
      data() {
         return {
            type: 1
            show: false,
            isLogin: false,
            typeViewId: -1,
            tempOrderId:null,
            list: [
               { name: '全部', id: -1 },
               { name: '已接单', id: 2 },
               { name: '进行中', id: 3 },
               { name: '待支付', id: 5 },
               { name: '已完成', id: 4 },
               // { name: '已取消', id: 99 },
            ],
            list1: [
               { name: '全部', id: -1 },
               { name: '待支付', id: 0 },
               { name: '待接单', id: 1 },
               { name: '已接单', id: 2 },
               { name: '进行中', id: 3 }, 
               { name: '已完成', id: 4 },
               { name: '已取消', id: 99 },
               { name: '待评价', id: 6 }
            ],
            orderId: null,
            status: -1,
            commentStatus: '', 
            next: true,
            page: 1,
            orderList: [],
            isOnce: true
         };
      },
      async onLoad() {
         await this.$onLaunched;
         /* uni.$on('refresh', (data) => {
            console.log('我的订单页刷新');
            this.status = ''
            this.commentStatus = ''
            this.orderList = []
            this.next = true
            this.page = 1
            this.getOrderList()
         }) */			
			
      },
      onReachBottom() {
         if(this.isLogin){
            this.getOrderList()
         }			
      },
      methods: {
         toLogin() {
            uni.navigateTo({
               url: '/pages/login/login'
            })
         },
         initOrderList() {
            this.commentStatus = ''
            this.orderList = []
            this.next = true
            this.page = 1
            this.getOrderList()
         },
         startJobs(orderId) {
            this.$u.api.begin({ orderId })
               .then(res => {
                  if (res.code === 200) {
                     this.status = ''
                     this.commentStatus = ''
                     this.orderList = []
                     this.next = true
                     this.page = 1
                     this.getOrderList()
                  }
						
               })
         },
         jumpDesc(item,flag) {
            uni.navigateTo({
               url: `/pages/order-details/order-details?id=${item.id}&flag=${flag}`
            })
            this.tempOrderId = item.id
         },
         // 修改
         jumpEdit(item) {
            this.tempOrderId =item.id
            if (item.type === 0 && item.workType === 0) {
               uni.navigateTo({
                  url: `/pages/using-workers/using-workers?id=${item.id}`
               })
            } else if (item.type === 0 && item.workType === 1) {
               uni.navigateTo({
                  url: `/pages/sorting/sorting?id=${item.id}`
               })
            } 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}`
               })
            }
         },
         cancelOrder() {
            this.$u.api.cancelOrder({
               orderId: this.orderId
            }).then(res => {
               if (res.code === 200) {
                  this.show = false
                  this.orderList = []
                  this.next = true
                  this.page = 1
                  this.getOrderList()
               } 
            })
         },
         phoneCall(phoneNumber) {
            uni.makePhoneCall({
               phoneNumber
            });
         },
         getOrderData(){
            var that = this
            var param ={ orderId:that.tempOrderId}
            this.$u.api.getDetail(param).then(res =>{
               if(res.code ===200 && res.data){
                  var isDel = false
                  var tempIndex = -1
                  that.orderList.forEach((item,index) =>{
                     if(item.id == res.data.id){
                        item.status = res.data.status
                        item.isUpdate = res.data.isUpdate
                        item.commentStatus = res.data.commentStatus
                        tempIndex = index
                     }
							
                  })
                  if(tempIndex > -1 ){
                     console.log(tempIndex,that.status,res.data.status,"===================")
                     if(that.status >=0 ){
                        //如果有标签页
                        if(that.status ===6 && res.data.commentStatus == 1){
                           isDel =true
                           console.log(tempIndex,that.status,res.data.status,"==================1")
                        }else if(that.status !=6 && that.status !== res.data.status){
                           isDel =true
                           console.log(tempIndex,that.status,res.data.status,"===================2")
                        }
                     }
                     if(isDel){
                        console.log(tempIndex,that.status,res.data.status,"===================3")
                        that.orderList.splice(tempIndex,1)
                     }
                  }						
               }
             }) 
         },
         // 订单分页
         getOrderList() {
            if (!this.next) return;
            this.$u.api.orderPage({
               capacity: 10,
               page: this.page,
               model: {
                  queryMyOrderType: this.userInfo.useIdentity,
                  status:  this.status === 6 ? 4 : (this.status ==-1?"":this.status),
                  commentStatus: this.status === 6 ? 0 : '',
                  queryLat: this.latitude,
                  queryLgt: this.longitude
               }
            }).then(res => {
               if (res.code !== 200) return;
               this.isOnce = false
               res.data.records.forEach(item => {
                  // 订餐单
                  if (item.type === 2) {
                     item.wayInfoCopy = JSON.parse(item.wayInfo).map(item => {
                        return `${item.name}${item.price / 100}元(${item.num}份)`
                     }).join(' | ')
                  // 运货
                  } else if (item.type === 1) {
                     item.wayInfo = JSON.parse(item.wayInfo)
                  }
               })
               this.orderList = [...this.orderList, ...res.data.records]					
               if (this.orderList.length >= res.data.total) {
                  this.next = false
               } else {
                  this.page += 1
               }
            })
         },
         clickOrderType(id) {				 
            this.commentStatus = ''
            this.status = id
            this.orderList = []
            this.next = true
            this.page = 1
            this.getOrderList()
         }
      }
   }
</script>
@@ -304,6 +504,36 @@
<style lang="scss" scoped>
   .index {
      width: 100%;
      .slot-content {
         width: 100%;
         text-align: center;
         font-weight: 400;
         font-size: 30rpx;
         color: #333333;
         margin: 30rpx 0;
      }
      .btn1 {
         width: 264rpx;
         height: 88rpx;
         line-height: 88rpx;
         text-align: center;
         font-weight: 400;
         font-size: 32rpx;
         color: #666666;
         border-radius: 44rpx;
         border: 1rpx solid #B2B2B2;
      }
      .btn2 {
         width: 264rpx;
         height: 88rpx;
         line-height: 88rpx;
         text-align: center;
         font-weight: 500;
         font-size: 32rpx;
         color: #FFFFFF;
         background: #00BC12;
         border-radius: 44rpx;
      }
      .index-j-head {
         width: 100%;
         background-color: #ffffff;
@@ -328,6 +558,15 @@
         width: 100%;
         padding: 20rpx 30rpx;
         box-sizing: border-box;
         .index-list-wu {
            width: 100%;
            margin-top: 40rpx;
            text-align: center;
            text {
               font-size: 24rpx;
               color: #666666;
            }
         }
         .index-list-item {
            width: 100%;
            padding: 30rpx;
@@ -358,38 +597,48 @@
                     color: #FF0000;
                  }
               }
               .eidt-close {
                  width: 160rpx;
                  height: 64rpx;
                  font-weight: 400;
                  font-size: 28rpx;
                  color: #666666;
                  line-height: 64rpx;
                  text-align: center;
                  border-radius: 34rpx;
                  border: 1rpx solid #B2B2B2;
               }
               .eidt-phone {
                  width: 160rpx;
                  height: 64rpx;
                  line-height: 64rpx;
                  text-align: center;
                  font-weight: 400;
                  font-size: 28rpx;
                  color: #00BC12;
                  border-radius: 34rpx;
                  border: 1rpx solid #00BC12;
               }
               .eidt-btn {
                  width: 160rpx;
                  height: 64rpx;
                  line-height: 64rpx;
                  text-align: center;
                  font-weight: 400;
                  font-size: 28rpx;
                  color: #FFFFFF;
                  background: #00BC12;
                  border-radius: 34rpx;
               .eidt-right {
                  flex: 1;
                  display: flex;
                  align-items: center;
                  justify-content: flex-end;
                  flex-wrap: wrap;
                  .eidt-close {
                     width: 160rpx;
                     height: 64rpx;
                     font-weight: 400;
                     font-size: 28rpx;
                     color: #666666;
                     line-height: 64rpx;
                     text-align: center;
                     border-radius: 34rpx;
                     border: 1rpx solid #B2B2B2;
                     margin-left: 20rpx;
                  }
                  .eidt-phone {
                     width: 160rpx;
                     height: 64rpx;
                     line-height: 64rpx;
                     text-align: center;
                     font-weight: 400;
                     font-size: 28rpx;
                     color: #00BC12;
                     border-radius: 34rpx;
                     border: 1rpx solid #00BC12;
                     margin-left: 20rpx;
                  }
                  .eidt-btn {
                     width: 160rpx;
                     height: 64rpx;
                     line-height: 64rpx;
                     text-align: center;
                     font-weight: 400;
                     font-size: 28rpx;
                     color: #FFFFFF;
                     background: #00BC12;
                     border-radius: 34rpx;
                     margin-left: 20rpx;
                  }
               }
            }
            .index-list-item-price {
@@ -530,6 +779,9 @@
                     border: 2rpx solid #FD9E24;
                  }
               }
               .hui {
                  color: #999999 !important;
               }
               .index-list-item-head-r {
                  font-weight: 400;
                  font-size: 28rpx;
@@ -541,35 +793,43 @@
      .index-labs {
         width: 100%;
         height: 90rpx;
         padding: 0 30rpx;
         box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: space-between;
         background: #FFFFFF;
         position: sticky;
         left: 0;
         .active {
            font-weight: 500 !important;
            font-size: 32rpx !important;
            color: #222222 !important;
         }
         .index-labs-row {
            flex: 1;
         .scroll-view_H {
            width: 100%;
            height: 100%;
            display: flex;
            align-items: center;
            justify-content: center;
            font-weight: 400;
            font-size: 30rpx;
            color: #666666;
            position: relative;
            .index-labs-row-x {
               position: absolute;
               bottom: 0;
               left: 50%;
               width: 40rpx;
               height: 2rpx;
               background-color: #00BC12;
               transform: translate(-50%, 0);
            white-space: nowrap;
            .active {
               font-weight: 500 !important;
               font-size: 32rpx !important;
               color: #00BC12 !important;
            }
            .index-labs-row {
               display: inline-block;
               height: 100%;
               line-height: 90rpx;
               font-weight: 400;
               font-size: 30rpx;
               color: #666666;
               position: relative;
               margin-right: 50rpx;
               &:last-child {
                  margin: 0 !important;
               }
               .index-labs-row-x {
                  position: absolute;
                  bottom: 0;
                  left: 50%;
                  width: 40rpx;
                  height: 4rpx;
                  background-color: #00BC12;
                  transform: translate(-50%, 0);
               }
            }
         }
      }