productDev/jinkuai.git

			@@ -50,7 +50,7 @@
			</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&& item.isUpdate != 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>
			@@ -60,13 +60,19 @@
			{{item.categoryName}}｜{{item.priceNum1}}斤
			</view>
			<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
			{{item.categoryName}}｜{{item.priceNum1}}人
			{{item.categoryName}}｜{{item.priceNum2}}人
			</view>
			<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
			{{item.categoryName}}｜{{item.priceNum1}}人
			<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.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}}
			@@ -90,9 +96,10 @@
			<text>{{item.startDate}} 至 {{item.endDate}}（{{item.totalDays}}天）</text>
			</view>
			</template>
			<view class="index-list-item-price">
			<text>预估：</text>
			<text>¥{{item.estimatedAccount / 100}}</text>
			<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>
			@@ -107,9 +114,9 @@
			<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="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)">立即支付</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>
			@@ -127,7 +134,7 @@
			<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">运货单</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>
			@@ -152,12 +159,9 @@
			</view>
			<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
			{{item.categoryName}}｜{{item.priceNum1}}斤
			</view>
			</view>
			<view class="index-list-item-info" v-if="item.type === 1">
			{{item.categoryName}}-{{item.carUnit}}
			</view>
			<view class="index-list-item-info" v-if="item.type === 1">
			{{item.transportTypeName}} \| {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天
			{{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}}
			@@ -182,8 +186,9 @@
			</view>
			</template>
			<view class="index-list-item-price">
			<text>预估：</text>
			<text>¥{{item.estimatedAccount / 100}}</text>
			<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">
			@@ -228,8 +233,8 @@
			async onShow(options) {
			var flag = getApp().globalData.orderStatus
			console.log(getApp().globalData,"=====================================")
			this.status = ''
			this.commentStatus=''
			// this.status = ''
			// this.commentStatus=''
			// status: this.status === 5 ? 4 : this.status,
			// commentStatus: this.status === 5 ? 0 : '',
			if(flag =='1'){//发单方待接单
			@@ -273,6 +278,7 @@
			{ name: '全部', id: '' },
			{ name: '已接单', id: 2 },
			{ name: '进行中', id: 3 },
			{ name: '待支付', id: 5 },
			{ name: '已完成', id: 4 },
			// { name: '已取消', id: 99 },
			],
			@@ -332,9 +338,9 @@

			})
			},
			jumpDesc(item) {
			jumpDesc(item,flag) {
			uni.navigateTo({
			url: `/pages/order-details/order-details?id=${item.id}`
			url: `/pages/order-details/order-details?id=${item.id}&flag=${flag}`
			})
			},
			// 修改