Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

jiangping

2025-07-18 8fbb2c72179870117ee1e7b3cbfd8d53cbd157a1

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

 small-program/App.vue

@@ -16,26 +16,57 @@
                            that.$store.commit('setToken', res.data.token)
                            that.$store.commit('setOpenid', res.data.openid)
                            that.$store.commit('setUserInfo', res.data.member)
                            uni.getLocation({
                                type: 'wgs84',
                                success: (addr) => {
                                    that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
                            that.$isResolve()
                                },
                                fail: (err) => {
                                    console.error('获取位置失败', err);
                                    that.$isResolve()
                                }
                            });
							
                        }
                    }
                });
            } 
        },
        onShow: function() {
            console.log('App Show')
            } else {
            var that =this
            let res =  this.$u.api.getMemberInfo({}).then(res =>{ 
                if (res && res.code ===200) { 
                    that.$store.commit('setUserInfo', res.data)
                        uni.getLocation({
                            type: 'wgs84',
                            success: (addr) => {
                                that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
                    that.$isResolve()
                            },
                            fail: (err) => {
                                console.error('获取位置失败', err);
                                that.$isResolve()
                            }
                        });
                }else{
                    that.$store.commit('setToken','')
                    that.$store.commit('setUserInfo',{})
                        uni.getLocation({
                            type: 'wgs84',
                            success: (addr) => {
                                that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
                                that.$isResolve()
                            },
                            fail: (err) => {
                                console.error('获取位置失败', err);
                    that.$isResolve()
                }
                        });
                    }
            })
			
            }
        },
        onShow: function() {
            console.log('App Show')
        },
        onHide: function() {
            console.log('App Hide')

 small-program/components/sunui-mverify/sunui-mverify.vue

@@ -1,7 +1,7 @@
<template name='sunui-mverify'>
    <view class="sunui-slider">
        <text style="color: #FFFFFF;">{{ hint }}</text>
        <view class='sunui-slider-bg' :style="{left:-(w + 2)+'px',transform:cssAnimation}">
        <view class='sunui-slider-bg' :style="{left:-(w + 5)+'px',transform:cssAnimation}">
            <text>{{ succeedMsg }}</text>
            <view class='sunui-slider-box' @touchmove='moveStart' @touchend='moveEnd'>
                <image src="/static/icon/ic_huakuai@2x.png" mode="widthFix"></image>

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

@@ -6,278 +6,276 @@
                <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>
		
        <!-- 已登陆 -->
        <template v-else>
            <!-- 发单方 -->
            <view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
                <scroll-view scroll-x class="scroll-view_H">
                    <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :key="index" @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">
                    <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :key="index" @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-item" v-for="(item, index) in orderList" :key="index">
                    <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}}-{{item.carUnit}}</text>
                            <text v-else-if="item.type === 2">订餐单</text>
                        </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" v-if="item.status === 2 && item.isUpdate === 1">已修改，待接单方确认</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 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.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
                        {{item.categoryName}}｜{{item.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 1">
                        {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天
                    </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>{{item.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>预估：</text>
                        <text>¥{{item.estimatedAccount / 100}}</text>
                    </view>
                    <view class="eidt">
                        <view></view>
                        <view class="eidt-right">
                            <view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click="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)" @click="jumpEdit(item)">修改订单</view>
                            <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) ||  (item.type === 2 && item.status === 3)" @click="jumpEdit(item)">继续支付</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="typeViewId === 1">
                <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
                    <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}}-{{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>
                        <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.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
                        {{item.categoryName}}｜{{item.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 1">
                        {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天
                    </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>{{item.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>预估：</text>
                        <text>¥{{item.estimatedAccount / 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="orderId = item.id, show = true">取消订单</view>
                            <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click="phoneCall(item.linkPhone)">联系业主</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>
                    </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>
                    </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 +283,143 @@
    import { mapState } from 'vuex'
    export default {
        computed: {
            ...mapState(['navHeight', 'statusbarHeight'])
            ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
        },
        onShow(options) {
            this.typeViewId = 0
            if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
                this.isLogin = true
            }
            if (this.userInfo && this.userInfo.useIdentity == 1) {
                this.typeViewId = 1
            } else {
                this.typeViewId = 0
            }
        },
        data() {
            return {
                type: 1
                show: false,
                isLogin: false,
                typeViewId: 0,
                list: [
                    { name: '全部', id: '' },
                    { name: '已接单', id: 2 },
                    { name: '进行中', id: 3 },
                    { name: '已完成', id: 4 },
                    { name: '已取消', id: 99 },
                ],
                list1: [
                    { name: '全部', id: '' },
                    { name: '待支付', id: 0 },
                    { name: '待接单', id: 1 },
                    { name: '已接单', id: 2 },
                    { name: '进行中', id: 3 },
                    { name: '已完成', id: 4 },
                    { name: '已取消', id: 99 },
                    { name: '待评价', id: [4, 0] }
                ],
                orderId: null,
                status: '',
                commentStatus: '',
				
                next: true,
                page: 1,
                orderList: []
            };
        },
        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()
            })
            this.getOrderList()
        },
        onReachBottom() {
            this.getOrderList()
        },
        methods: {
            // 修改
            jumpEdit(item) {
                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}`
                    })
                }
            },
            cancelOrder() {
                this.$u.api.receiveCancelOrder({
                    orderId: this.orderId
                }).then(res => {
                    this.show = false
                    this.orderList = []
                    this.next = true
                    this.page = 1
                    this.getOrderList()
                })
            },
            phoneCall(phoneNumber) {
                uni.makePhoneCall({
                    phoneNumber
                });
            },
            // 订单分页
            getOrderList() {
                if (!this.next) return;
                this.$u.api.orderPage({
                    capacity: 10,
                    page: this.page,
                    model: {
                        queryMyOrderType: this.userInfo.useIdentity,
                        status: this.status,
                        queryLat: this.latitude,
                        queryLgt: this.longitude
                    }
                }).then(res => {
                    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
                    }
                })
            },
            clickOrderType(id) {
                if (typeof id === 'object') {
                    this.status = id[0]
                    this.commentStatus = id[1]
                } else {
                    this.commentStatus = ''
                    this.status = id
                }
                this.orderList = []
                this.next = true
                this.page = 1
                this.getOrderList()
            }
        }
    }
</script>
@@ -304,6 +433,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;
@@ -358,6 +517,11 @@
                            color: #FF0000;
                        }
                    }
                    .eidt-right {
                        flex: 1;
                        display: flex;
                        align-items: center;
                        justify-content: flex-end;
                    .eidt-close {
                        width: 160rpx;
                        height: 64rpx;
@@ -368,6 +532,7 @@
                        text-align: center;
                        border-radius: 34rpx;
                        border: 1rpx solid #B2B2B2;
                            margin-left: 20rpx;
                    }
                    .eidt-phone {
                        width: 160rpx;
@@ -379,6 +544,7 @@
                        color: #00BC12;
                        border-radius: 34rpx;
                        border: 1rpx solid #00BC12;
                            margin-left: 20rpx;
                    }
                    .eidt-btn {
                        width: 160rpx;
@@ -390,6 +556,8 @@
                        color: #FFFFFF;
                        background: #00BC12;
                        border-radius: 34rpx;
                            margin-left: 20rpx;
                        }
                    }
                }
                .index-list-item-price {
@@ -530,6 +698,9 @@
                            border: 2rpx solid #FD9E24;
                        }
                    }
                    .hui {
                        color: #999999 !important;
                    }
                    .index-list-item-head-r {
                        font-weight: 400;
                        font-size: 28rpx;
@@ -541,27 +712,34 @@
        .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;
            .scroll-view_H {
                width: 100%;
                height: 100%;
                white-space: nowrap;
            .active {
                font-weight: 500 !important;
                font-size: 32rpx !important;
                color: #222222 !important;
            }
            .index-labs-row {
                flex: 1;
                    display: inline-block;
                height: 100%;
                display: flex;
                align-items: center;
                justify-content: center;
                    line-height: 90rpx;
                font-weight: 400;
                font-size: 30rpx;
                color: #666666;
                position: relative;
                    margin-right: 62rpx;
                    &:last-child {
                        margin: 0 !important;
                    }
                .index-labs-row-x {
                    position: absolute;
                    bottom: 0;
@@ -573,6 +751,7 @@
                }
            }
        }
        }
        .index-wu {
            width: 100%;
            margin-top: 286rpx;

 small-program/pages/employment-certification/employment-certification.vue

@@ -60,11 +60,13 @@
                    </view>
                    <view class="item-upload">
                        <view class="item-upload-item" @click="uploadImg(11)">
                            <image v-if="form.img11Full && form.img11Full !=''" :src="form.img11Full" mode="widthFix"></image>
                            <image v-if="form.img11Full && form.img11Full !=''" :src="form.img11Full" mode="widthFix">
                            </image>
                            <image  v-else src="/static/image/btn_renxiang@2x.png" mode="widthFix"></image>
                        </view>
                        <view class="item-upload-item"  @click="uploadImg(21)">
                            <image v-if="form.img21Full && form.img21Full !=''" :src="form.img21Full" mode="widthFix"></image>
                            <image v-if="form.img21Full && form.img21Full !=''" :src="form.img21Full" mode="widthFix">
                            </image>
                            <image v-else  src="/static/image/btn_guohui@2x.png" mode="widthFix"></image>
                        </view>
                    </view>
@@ -77,7 +79,8 @@
                    <view class="item-upload" v-if="flag==0">
                        <view class="item-upload-item1"  @click="uploadImg(1)">
                            <view class="image">
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -88,7 +91,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(2)">
                            <view class="image">
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -100,7 +104,8 @@
                    <view class="item-upload" v-if="flag==1">
                        <view class="item-upload-item1"  @click="uploadImg(1)">
                            <view class="image">
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -111,7 +116,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(2)">
                            <view class="image">
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -122,7 +128,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(3)">
                            <view class="image">
                                <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix"></image>
                                <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -134,7 +141,8 @@
                    <view class="item-upload" v-if="flag==2">
                        <view class="item-upload-item1"  @click="uploadImg(1)">
                            <view class="image">
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
                                <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -145,7 +153,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(2)">
                            <view class="image">
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
                                <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -156,7 +165,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(3)">
                            <view class="image">
                                <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix"></image>
                                <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -167,7 +177,8 @@
                        </view>
                        <view class="item-upload-item1"  @click="uploadImg(4)">
                            <view class="image">
                                <image v-if="form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix"></image>
                                <image v-if="form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix">
                                </image>
                                <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
                                <text>点击上传</text>
                            </view>
@@ -185,7 +196,9 @@
</template>

<script>
    import { mapState } from 'vuex'
    import {
        mapState
    } from 'vuex'
    export default {
        computed: {
            ...mapState( ['userInfo'])
@@ -195,9 +208,14 @@
                bgImg: require('@/static/image/bg_renzheng_yonggong@2x.png'),
                title: '用户认证',
                flag: null,
<<<<<<< HEAD
                isCompany: false,
                loading: false,
=======
                isCompany:false,
                loading:false,
                info: {},
>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
                form: {
                    "companyName": "",
                    authType:0,
@@ -228,8 +246,12 @@
            var flag = options.flag
            this.flag = flag 
            this.initFormData()
<<<<<<< HEAD
            switch (flag) {
=======
            this.getApplyData()
            switch(flag){
>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
                case '1':
                    this.title = '货运认证'
                    this.bgImg = require('@/static/image/bg_renzheng_huoyun@2x.png')
@@ -267,45 +289,67 @@
                }
                 console.log('表单参数：',this.form)
                this.loading =true
                if(this.inNullParam(this.form.linkName)
                    ||this.inNullParam(this.form.lat)
                    ||this.inNullParam(this.form.lgt)
                    ||this.inNullParam(this.form.location)
                    ||this.inNullParam(this.form.telephone)){
                      uni.showToast({title: '对不起，请按要求填写申请信息1！',icon: "none",duration: 2000});
                if (this.inNullParam(this.form.linkName) ||
                    this.inNullParam(this.form.lat) ||
                    this.inNullParam(this.form.lgt) ||
                    this.inNullParam(this.form.location) ||
                    this.inNullParam(this.form.telephone)) {
                    uni.showToast({
                        title: '对不起，请按要求填写申请信息1！',
                        icon: "none",
                        duration: 2000
                    });
                      this.loading =false
                      return
                }
              if( this.form.authType == 0){
                  if(this.inNullParam(this.form.img11)||this.inNullParam(this.form.img21)){
                    uni.showToast({title: '对不起，请按要求填写申请信息3！',icon: "none",duration: 2000});
                        uni.showToast({
                            title: '对不起，请按要求填写申请信息3！',
                            icon: "none",
                            duration: 2000
                        });
                     this.loading =false
                    return
                  }
              }else{
                  if(this.inNullParam(this.form.img1) || this.inNullParam(this.form.companyName)){
                        uni.showToast({title: '对不起，请按要求填写申请信息4！',icon: "none",duration: 2000});
                        uni.showToast({
                            title: '对不起，请按要求填写申请信息4！',
                            icon: "none",
                            duration: 2000
                        });
                         this.loading =false
                        return
                  }
              }
              if(this.form.type != 0 && this.form.authType == 1 && this.inNullParam(this.form.img2)){
                    uni.showToast({title: '对不起，请按要求填写申请信息！',icon: "none",duration: 2000});
                    uni.showToast({
                        title: '对不起，请按要求填写申请信息！',
                        icon: "none",
                        duration: 2000
                    });
                     this.loading =false
                    return
              }
              if(this.form.type == 1 && this.form.authType == 1 && this.inNullParam(this.form.img2)){
                    uni.showToast({title: '对不起，请按要求填写申请信息5！',icon: "none",duration: 2000});
                    uni.showToast({
                        title: '对不起，请按要求填写申请信息5！',
                        icon: "none",
                        duration: 2000
                    });
                     this.loading =false
                    return
              }
					
              var that = this
              var param =this.form;
              if(this.form.authType == 0){
                  param.img1 = this.form.img11,
                  param.img2 = this.form.img21
              }
                uni.requestSubscribeMessage({
                    tmplIds: ['4H9ztG4E9BxJLwMuYSZ6oiM7yb4KX7u7bYhkhYJP0-Y'],
                    success(res) {
              console.log('提交参数：',param)
              this.$u.api.applyForIdentity(param).then(res =>{
                  if(res.code ===200){
@@ -314,10 +358,14 @@
                          icon: "none",
                          duration: 2000
                       });
                    uni.navigateBack({ delta: 1 });
                                uni.navigateBack({
                                    delta: 1
                                });
                  }
               }).finally(()=>{
                    that.loading =false
                        })
                    }
               })
            } ,
            chooseMPLoaction(){
@@ -346,7 +394,11 @@
                                                uni.openSetting({
                                                    success:(data)=>{
                                                    // 如果用户授权了地理信息在，则提示授权成功
                                                        if(data.authSetting['scope.userLocation']===true){
                                                        if (data
                                                            .authSetting[
                                                                'scope.userLocation'
                                                                ] === true
                                                            ) {
                                                            uni.showToast({
                                                                title:"授权成功",
                                                                icon:"success",
@@ -354,8 +406,14 @@
                                                            })
                                                            // 授权成功后，然后再次chooseLocation获取信息
                                                            uni.chooseLocation({
                                                                success: (res) => {
                                                                    console.log("详细地址",res);
                                                                success: (
                                                                    res
                                                                    ) => {
                                                                    console
                                                                        .log(
                                                                            "详细地址",
                                                                            res
                                                                            );
                                                                    // this.getRegionFn(res);
                                                                }
                                                            })
@@ -384,6 +442,10 @@
                    }
                })
            },
<<<<<<< HEAD
            uploadImg(index) {
                var that = this
=======
            getApplyData(){
                var that = this 
                var param ={ type:that.flag}
@@ -416,6 +478,7 @@
            },
            uploadImg(index){
                var that =this
>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
                uni.chooseImage({
                    count: 1, // 默认9
                    sizeType: ['original', 'compressed'],
@@ -523,6 +586,7 @@
<style lang="scss" scoped>
    .box {
        width: 100%;

        .box-head {
            width: 100%;
            height: 300rpx;
@@ -530,6 +594,7 @@
            box-sizing: border-box;
            background-repeat: no-repeat;
            background-size: 100% 100%;

            .box-head-botton {
                width: 100%;
                height: 88rpx;
@@ -542,16 +607,19 @@
                border-radius: 44rpx;
                margin-top: 30rpx;
            }

            .box-head-info {
                width: 100%;
                display: flex;
                flex-direction: column;

                text {
                    &:nth-child(1) {
                        font-weight: bold;
                        font-size: 48rpx;
                        color: #FFFFFF;
                    }

                    &:nth-child(2) {
                        font-weight: 400;
                        font-size: 26rpx;
@@ -560,6 +628,7 @@
                    }
                }
            }

            .box-head-content {
                width: 100%;
                padding: 40rpx 30rpx;
@@ -567,14 +636,17 @@
                background-color: #FFFFFF;
                border-radius: 20rpx;
                margin-top: 30rpx;

                .item {
                    width: 100%;
                    display: flex;
                    flex-direction: column;
                    margin-bottom: 30rpx;

                    &:last-child {
                        margin: 0 !important;
                    }

                    .item-cate {
                        width: 100%;
                        display: flex;
@@ -582,10 +654,12 @@
                        padding: 30rpx 0;
                        box-sizing: border-box;
                        border-bottom: 1rpx solid #E5E5E5;

                        .active {
                            background: #00BC12 !important;
                            color: #FFFFFF !important;
                        }

                        .item-cate-row {
                            width: 208rpx;
                            height: 72rpx;
@@ -594,20 +668,24 @@
                            background: #EEEEEE;
                            border-radius: 36rpx;
                            margin-right: 20rpx;

                            &:last-child {
                                margin: 0 !important;
                            }
                        }
                    }

                    .item-label {
                        display: flex;
                        align-items: center;

                        text {
                            &:nth-child(1) {
                                font-weight: 500;
                                font-size: 32rpx;
                                color: #222222;
                            }

                            &:nth-child(2) {
                                font-weight: 500;
                                font-size: 32rpx;
@@ -615,6 +693,7 @@
                            }
                        }
                    }

                    .item-upload {
                        width: 100%;
                        padding: 30rpx 0;
@@ -623,6 +702,7 @@
                        align-items: center;
                        justify-content: space-between;
                        flex-wrap: wrap;

                        .item-upload-item {
                            width: 300rpx;
                            border-radius: 10px;
@@ -632,15 +712,18 @@
                            justify-content: content;
                            overflow: hidden;
                            border:1px solid #c2c2c2;

                            image {
                                width: 100%;
                                height: 100%;
                            }
                        }

                        .item-upload-item1 {
                            width: 45%;
                            padding-bottom: 40px;
                            border-radius: 10px;

                            .image {
                                width: 100%;
                                height: 196rpx;
@@ -651,10 +734,12 @@
                                align-items: center;
                                justify-content: center;
                                flex-direction: column;

                                image {
                                    width: 48rpx;
                                    height: 48rpx;
                                }

                                text {
                                    font-weight: 400;
                                    font-size: 28rpx;
@@ -662,18 +747,21 @@
                                    margin-top: 12rpx;
                                }
                            }

                            .info {
                                width: 100%;
                                display: flex;
                                align-items: center;
                                justify-content: center;
                                margin-top: 16rpx;

                                text {
                                    &:nth-child(1) {
                                        font-weight: 400;
                                        font-size: 26rpx;
                                        color: #333333;
                                    }

                                    &:nth-child(2) {
                                        font-weight: 400;
                                        font-size: 26rpx;
@@ -683,6 +771,7 @@
                            }
                        }
                    }

                    .item-val {
                        width: 100%;
                        padding: 30rpx 0;
@@ -692,17 +781,20 @@
                        align-items: center;
                        justify-content: space-between;
                        border-bottom: 1rpx solid #E5E5E5;

                        input {
                            width: 100%;
                            font-weight: 400;
                            font-size: 30rpx;
                            color: #222222;
                        }

                        text {
                            font-weight: 400;
                            font-size: 30rpx;
                            color: #666666;
                        }

                        button {
                            width: 100%;
                            height: 100%;

 small-program/pages/index/index.vue

@@ -11,14 +11,12 @@
            <view class="search" :style="{ top: statusbarHeight + navHeight + 'px' }">
                <view class="index-j-cate">
                    <view class="index-j-cate-item" v-for="(item, index) in searchType" :key="index" @click="clickCate(item.id)">
                        <text :style="{ color: typeVal === item.id ? '##222222' : '' }">{{item.name}}</text>
                        <text :style="{ color: typeVal === item.id ? '#222222' : '', fontSize: typeVal === item.id ? '36rpx' : '', fontWeight: typeVal === item.id ? '600' : '' }">{{item.name}}</text>
                        <view class="index-j-cate-item-x" v-if="typeVal === item.id"></view>
                    </view>
                </view>
                <view class="index-j-search">
                    <view class="index-j-search-item active">最新发布</view>
                    <view class="index-j-search-item">距离优先</view>
                    <view class="index-j-search-item">价格从高到低</view>
                    <view :class="sortType === item.id ? 'index-j-search-item active' : 'index-j-search-item'" v-for="(item, index) in sortList" :key="index" @click="clickSort(item.id)">{{item.name}}</view>
                </view>
            </view>
            <view class="index-j-list">
@@ -40,17 +38,28 @@
                        {{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.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
                        {{item.categoryName}}｜{{item.priceNum1}}斤
                        {{item.categoryName}}｜{{item.priceNum1}}人
                    </view>
                    <view class="index-list-item-info" v-if="item.type === 1">
                        {{item.categoryName}}｜{{item.priceNum1}}斤
                        {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天
                    </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>{{item.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>
@@ -59,12 +68,13 @@
                        <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>预估：</text>
                        <text>¥{{item.estimatedAccount / 100}}</text>
                    </view>
                    <view class="eidt">
                        <sunui-mverify @change="mverify($event, item.id)"></sunui-mverify>
                        <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify>
                    </view>
                </view>
            </view>
@@ -311,7 +321,7 @@
    export default {
        components: { sunuiMverify },
        computed: {
            ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid']),
            ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude']),
            totalPrice() {
                return this.form.estimatedAccount / 100
            }
@@ -346,6 +356,11 @@
                    { name: '分拣工', id: 1 },
                    { name: '包装工', id: 2 }
                ],
                sortList: [
                    { name: '最新发布', id: 0 },
                    { name: '距离优先', id: 1 },
                    { name: '价格从高到低', id: 2 }
                ],
                car: [],
                btn: require('@/static/image/btn.png'),
                typeViewId: 0,
@@ -375,13 +390,15 @@
                    estimatedAccount: '',
                    price: ''
                },
				
                sortType: 0,
                orderList: [],
                typeVal: '',
                page: 1
                page: 1,
                next: true
            }
        },
        onLoad() {
        async onLoad() {
            await this.$onLaunched;
            this.getCategoryLists()
            this.getOrderList()
            this.form.linkPhone = this.userInfo.telephone
@@ -389,29 +406,23 @@
        watch: {
            typeId: {
                handler(news, old) {
                    this.form = {
                        startDate: '',
                        endDate: '',
                        latitude: '',
                        longitude: '',
                        location: '',
                        locationEnd: '',
                        wayInfoDTOList: [],
                        workType: 0,
                        categoryId: '',
                        categoryName: '',
                        days: '',
                        locationRemark: '',
                        supplement: '',
                        multifileList: [],
                        linkName: '',
                        linkPhone: '',
                        estimatedAccount: '',
                        price: ''
                    }
                    this.form.startDate = ''
					
                    this.form.endDate = ''
                    this.form.latitude = ''
                    this.form.longitude = ''
                    this.form.location = ''
                    this.form.locationEnd = ''
                    this.form.wayInfoDTOList = ''
                    this.form.workType = ''
                    this.form.days = ''
                    this.form.locationRemark = ''
                    this.form.supplement = ''
                    this.form.multifileList = []
                    this.form.linkName = ''
                    this.form.estimatedAccount = ''
                    this.form.price = ''
                    this.viewStatus = false
                    this.carImage = ''
                    this.carRemark = ''
                }
            },
            orderFood: {
@@ -440,21 +451,49 @@
                }
            }
        },
        onReachBottom() {
            this.getOrderList()
        },
        methods: {
            // 手动接单
            getaccept(e, orderId, index) {
                this.$u.api.accept({ orderId })
                    .then(res => {
                        uni.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 })
                        setTimeout(() => {
                            this.page = 1
                            this.next = true
                            this.orderList = []
                            this.getOrderList()
                        }, 2000)
                    })
            },
            clickSort(id) {
                this.sortType = id
                this.page = 1
                this.next = true
                this.orderList = []
                this.getOrderList()
            },
            clickCate(id) {
                this.typeVal = id
                this.page = 1
                this.list = []
                this.next = true
                this.orderList = []
                this.getOrderList()
            },
            // 订单分页
            getOrderList() {
                if (!this.next) return;
                this.$u.api.orderPage({
                    capacity: 10,
                    page: this.page,
                    model: {
                        queryMyOrderType: 2,
                        type: this.typeVal
                        type: this.typeVal,
                        sortType: this.sortType,
                        queryLat: this.latitude,
                        queryLgt: this.longitude
                    }
                }).then(res => {
                    res.data.records.forEach(item => {
@@ -463,10 +502,16 @@
                            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)
                        }
                    })
                    console.log(res.data.records)
                    this.orderList = [...this.orderList, ...res.data.records]
					
                    if (this.orderList.length === res.data.total) {
                        this.next = false
                    }
                })
            },
            // 提交订单
@@ -604,6 +649,12 @@
            },
            clickType(e) {
                this.typeId = e
                if (e === 2) {
                    this.form.categoryId = this.car[0].id
                    this.form.categoryName = this.car[0].name
                    this.carRemark = this.car[0].remark
                    this.carImage = this.car[0].iconFull
                }
            },
            clickTypeWork(e) {
                this.form.workType = e
@@ -681,9 +732,6 @@
                        url: `/pages/freight/freight`
                    })
                }
            },
            mverify(e, id){
                console.log('验证结果:', e, id);
            },
            // 选择套餐
            selectMenu(a, b) {

 small-program/pages/mine/mine.vue

@@ -260,6 +260,7 @@
                    console.log(222,res)
                    if(res.code ===200){
                        that.userInfo.useIdentity = param.useIdentity
                        uni.$emit('refresh')
                    } 
               }).finally(() => {
                    that.changing1 = false

 small-program/store/index.js

@@ -16,7 +16,10 @@
        statusbarHeight: statusbarHeight || '',
        userInfo: userInfo || {},
        token: token || '',
        openid:token || ''
        openid: token || '',
		
        latitude: '',
        longitude: ''
    },
    mutations: {
        // 设置导航栏高度
@@ -41,6 +44,12 @@
            state.userInfo = val
            uni.setStorageSync('userInfo', val);
        },
        // 设置经纬度
        setPosition(state, obj) {
            console.log(obj)
            state.latitude = obj.latitude
            state.longitude = obj.longitude
        },
        // 清除缓存数据
        empty(state) {
            state.userInfo = ''

 small-program/utils/http.interceptor.js

@@ -13,7 +13,7 @@
    
    // 响应拦截器
    uni.$u.http.interceptors.response.use((response) => {
        console.log(response.data)
        // console.log(response.data)
        if (response.data.code === 5113) {
            uni.switchTab({
                url: '/pages/index/index'