Merge remote-tracking branch 'origin/master'

rk

2025-08-27 58d63637b67a7c565618379268da604e6231fc4c

Merge remote-tracking branch 'origin/master'

 admin/.env.production

@@ -5,4 +5,4 @@
VUE_APP_DEBUG = 'off'

# VUE_APP_API_URL  = 'https://test.doumee.cn/jinkuai_admin'
VUE_APP_API_URL  = 'http://192.168.0.212/jinkuai_admin'
VUE_APP_API_URL = 'https://jinkuai.832smartfarm.com/jinkuai_admin'

 admin/public/favicon.ico

 admin/src/assets/logo.jpg

Binary files differ

 admin/src/assets/logo.png

 admin/src/components/business/OperaIdentityDetailWindow.vue

@@ -204,7 +204,7 @@
  padding: 16px;
}
.renzheng{
  margin: 0px 0px 50px 20px;
  margin: 0px 0px 30px 20px;
  width: calc(100% - 60px);
  .detail{
    font-size: 14px;

 admin/src/components/business/OperaMemberDetailWindow.vue

@@ -384,7 +384,7 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
.renzheng{
  margin: 0px 0px 50px 20px;
  margin: 0px 0px 30px 20px;
  width: calc(100% - 60px);
  .detail{
    font-size: 14px;

 admin/src/components/business/OperaOrderDetailWindow.vue

@@ -192,7 +192,7 @@
          <div class="line">
            <div class="cont"><span class="label">昵称：</span> <span class="txt">{{ info.releaseName||'' }}</span></div>
            <div  class="cont"  ><span class="label">联系方式：</span> <span class="txt ">{{ info.releasePhone||'' }}</span></div>
            <div  class="cont" ><span class="label">其他联系人：</span> <span class="txt ">{{ info.linkName||'匿名' }}-{{ info.linkPhone||'未设置' }}</span></div>
            <div  class="cont" ><span class="label">其他联系人：</span> <span class="txt ">{{ info.linkName||'' }}-{{ info.linkPhone||'未设置' }}</span></div>
          </div>
        </div>
      </div>
@@ -334,7 +334,7 @@
  color: #ff4d00 !important;
}
.renzheng{
  margin: 0px 0px 50px 20px;
  margin: 0px 0px 30px 20px;
  width: calc(100% - 60px);
  .detail{
    font-size: 14px;

 admin/src/views/business/orders.vue

@@ -89,14 +89,14 @@
          </template>
        </el-table-column>
        <el-table-column prop="orderContent" label="订单内容"  width="200px" :show-overflow-tooltip='true'></el-table-column>
        <el-table-column prop="releaseName" label="发单方"  width="200px">
        <el-table-column prop="releaseName" label="发单方"  min-width="100px" :show-overflow-tooltip='true'>
          <template slot-scope="{row}">
            {{(row.releaseName||'匿名') +' - ' +(row.releasePhone||'无')  }}
           <span v-if="row.releaseName || row.releasePhone">{{(row.releaseName||'') +' - ' +(row.releasePhone||'')  }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="acceptName" label="接单方" width="200px">
        <el-table-column prop="acceptName" label="接单方" min-width="100px" :show-overflow-tooltip='true'>
          <template slot-scope="{row}">
            {{(row.acceptName||'匿名') +' - ' +(row.acceptPhone ||'无')  }}
            <span v-if="row.acceptName || row.acceptPhone">{{(row.acceptName||'') +' - ' +(row.acceptPhone ||'')  }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="createTime" label="发布时间" min-width="150px"></el-table-column>

 admin/src/views/system/dict.vue

@@ -19,8 +19,7 @@
        <li><el-button type="primary" @click="$refs.operaDictWindow.open('新建字典')" icon="el-icon-plus" v-permissions="['system:dict:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:dict:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
      <el-table :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 server/services/src/main/resources/application-dev.yml

@@ -92,10 +92,10 @@
    #mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
    notifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxPayNotify
    refundNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxRefundNotify
    keyPath: d://jinkuai/apiclient_cert.p12
    privateCertPath: d://jinkuai/apiclient_cert.pem
    privateKeyPath: d://jinkuai/apiclient_key.pem
    pubKeyPath: d://jinkuai/pub_key.pem #商户支付公钥
    keyPath: D://jinkuai/apiclient_cert.p12
    privateCertPath: D://jinkuai/apiclient_cert.pem
    privateKeyPath: D://jinkuai/apiclient_key.pem
    pubKeyPath: D://jinkuai/pub_key.pem #商户支付公钥

    #服务商-------------end---


 server/startsh/admin_start.sh

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
#!/bin/bash

killall java

nohup java -jar /usr/local/jars/jinkuai/jinkuai_admin.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/jinkuai/jinkuai_web.jar > /dev/null 2>&1 &

cd  /data/jars/lianhelihua/logs
tail -f /data/jars/lianhelihua/logs/info.2025-05-19.1.log

 server/startsh/Æô¶¯½Å±¾ºÍÈÕÖ¾´¦Àí½Å±¾ËµÃ÷.txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
1、所有 *_start.sh脚本执行前，请手动停止对应java进程 ps -ef grep java æŸ¥è¯¢pid，执行 kill -9 pid

2、日志清理脚本 logByDate.sh执行命令：
#执行启动命令
sh /usr/local/jars/startsh/logByDate.sh

#执行
crontab -e
#加入执行任务 æ¯å¤©å‡Œæ™¨æ‰§è¡Œ
0 0 * * * /usr/local/jars/startsh/logByDate.sh
#按Esc键后再输入:wq！,回车保存
#查看是否创建成功
crontab -l

 small-program/App.vue

@@ -46,7 +46,8 @@
                uni.getLocation({
                    type: 'wgs84',
                    success: (addr) => {
                        const locParam = { latitude: addr.latitude, longitude: addr.longitude ,address:'获取地址失败'};
                        const locParam = { latitude: addr.latitude, longitude: addr.longitude };
                        uni.setStorageSync('address', locParam);
                        var address =null
                        const qqmapsdk = new QQMapWX({
                             key: '4PXBZ-JLBC7-LCLXG-P2SZX-C4HYE-LDBLQ' //腾讯地图申请的key（后续需要公司提供，个人开发者额度有限）

 small-program/main.js

@@ -14,8 +14,11 @@
    Vue.prototype.$isResolve = resolve;
})

// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'

// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
// Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'

const app = new Vue({
    store,

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

@@ -128,7 +128,7 @@
                        var param ={
                            id:that.info.id,
                            lat:res.latitude,
                            location:res.address,
                            location:res.name || res.address,
                            lgt:res.longitude
                        }
                        that.$u.api.updateLocation(param).then(res1 =>{

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

@@ -102,16 +102,20 @@
                            <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" @click.stop="jumpEdit(item)">修改订单</view>
                            <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) ||  (item.type === 2 && item.status === 3)" @click.stop="jumpEdit(item)">继续支付</view>
                            <view class="eidt-btn" v-if="(item.type !== 2 && item.status === 0) ||  (item.type !== 2 && item.status === 3)" @click.stop="jumpEdit(item)">继续支付</view>
                            <!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">开始作业</view> -->
                            <view class="eidt-btn" v-if="item.status === 3" @click.stop="jumpDesc(item)">完成并支付</view>
                            <view class="eidt-btn" v-if="item.type != 2 && item.status === 3" @click.stop="jumpDesc(item)">完成并支付</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-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
                <view class="index-list-wu" v-if="orderList.length === 0">
                    <text>已加载全部数据</text>
                </view>
                <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
                    <view class="index-list-item-head">
                        <view class="index-list-item-head-l">
                            <view class="xoam"></view>
@@ -236,7 +240,7 @@
                    { name: '已接单', id: 2 },
                    { name: '进行中', id: 3 },
                    { name: '已完成', id: 4 },
                    { name: '已取消', id: 99 },
                    // { name: '已取消', id: 99 },
                ],
                list1: [
                    { name: '全部', id: '' },
@@ -246,7 +250,7 @@
                    { name: '进行中', id: 3 },
                    { name: '已完成', id: 4 },
                    { name: '已取消', id: 99 },
                    { name: '待评价', id: [4, 0] }
                    { name: '待评价', id: 5 }
                ],
                orderId: null,
                status: '',
@@ -346,7 +350,8 @@
                    page: this.page,
                    model: {
                        queryMyOrderType: this.userInfo.useIdentity,
                        status: this.status,
                        status: this.status === 5 ? 4 : this.status,
                        commentStatus: this.status === 5 ? 0 : '',
                        queryLat: this.latitude,
                        queryLgt: this.longitude
                    }
@@ -374,13 +379,13 @@
                })
            },
            clickOrderType(id) {
                if (typeof id === 'object') {
                    this.status = id[0]
                    this.commentStatus = id[1]
                } else {
                // if (typeof id === 5) {
                //     this.status = 5
                //     // this.commentStatus = 0
                // } else {
                    this.commentStatus = ''
                    this.status = id
                }
                // }
                this.orderList = []
                this.next = true
                this.page = 1

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

@@ -1,6 +1,12 @@
<template>
    <view class="box">
        <view class="box-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
        <view class="box-head">
            <!-- ç”¨å·¥ -->
            <image class="box-head-bg" src="@/static/image/bg_renzheng_yonggong@2x.png" mode="widthFix" v-if="title === '用工认证'"></image>
            <!-- è´§è¿ -->
            <image class="box-head-bg" src="@/static/image/bg_renzheng_huoyun@2x.png" mode="widthFix" v-if="title === '货运认证'"></image>
            <!-- ç”¨é¤ -->
            <image class="box-head-bg" src="@/static/image/bg_renzheng_gongcan@2x.png" mode="widthFix" v-if="title === '供餐认证'"></image>
            <view class="box-head-info">
                <text>{{title}}</text>
                <text>请按要求填写认证信息</text>
@@ -205,7 +211,7 @@
        },
        data() {
            return {
                bgImg: require('@/static/image/bg_renzheng_yonggong@2x.png'),
                bgImg: null,
                title: '用户认证',
                flag: null,
 
@@ -276,6 +282,7 @@
                return false
            },
            applySubmit() {
                console.log(this.loading)
                if (this.loading) {
                    return
                }
@@ -286,6 +293,7 @@
                    this.inNullParam(this.form.lgt) ||
                    this.inNullParam(this.form.location) ||
                    this.inNullParam(this.form.telephone)) {
						
                    uni.showToast({
                        title: '对不起，请按要求填写申请信息1！',
                        icon: "none",
@@ -340,7 +348,7 @@
                    param.img2 = this.form.img21
                }
                uni.requestSubscribeMessage({
                    tmplIds: ['4H9ztG4E9BxJLwMuYSZ6oiM7yb4KX7u7bYhkhYJP0-Y'],
                    tmplIds: ['VJho7-lf-4_WZFfOzenDndgwNDIA0EvCiE6vqBnExpQ'],
                    success(res) {
                        console.log('提交参数：', param)
                        that.$u.api.applyForIdentity(param).then(res => {
@@ -357,6 +365,9 @@
                        }).finally(() => {
                            that.loading = false
                        })
                    },
                    fail(err) {
                        console.log(err)
                    }
                })
            },
@@ -365,7 +376,7 @@
                uni.chooseLocation({
                    success: (res) => {
                        console.log(res);
                        this.form.location = res.address
                        this.form.location = res.name || res.address
                        this.form.lat = res.latitude
                        this.form.lgt = res.longitude
                    },
@@ -578,8 +589,18 @@
            height: 300rpx;
            padding: 34rpx 40rpx 0 40rpx;
            box-sizing: border-box;
            background-repeat: no-repeat;
            background-size: 100% 100%;
            // background-repeat: no-repeat;
            // background-size: 100% 100%;
            position: relative;
			
            .box-head-bg {
                width: 100%;
                height: 300rpx;
                position: absolute;
                top: 0;
                left: 0;
                z-index: -1;
            }

            .box-head-botton {
                width: 100%;

 small-program/pages/freight/freight.vue

@@ -91,8 +91,8 @@
                    <view class="list-item-row">
                        <view class="list-item-row-label">运输重量/数量<b>*</b></view>
                        <view class="list-item-row-val">
                            <input type="text" v-model="form.transportNum" placeholder="请输入" />
                            <view @click="show4 = true" style="width: 100%; flex-shrink: 0; display: flex; align-items: center; justify-content: flex-end;">
                            <input type="text" style="flex: 1;" v-model="form.transportNum" placeholder="请输入" />
                            <view @click="show4 = true" style="width: 100rpx; flex-shrink: 0; display: flex; align-items: center; justify-content: flex-end;">
                                <text>{{form.transportUnit}}</text>
                                <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
                            </view>
@@ -222,6 +222,7 @@
        <u-calendar
            :show="show2"
            color="#00BC12"
             :allowSameDay="true"
            mode="range"
            @close="show2 = false"
            @confirm="confirmDate" />
@@ -320,7 +321,9 @@
                })
            } else {
                const res = uni.getStorageSync('carData');
                console.log(res)
                this.form.linkPhone = this.userInfo.telephone
                this.form.linkName = this.userInfo.name
                this.form.startDate = res.startDate
                this.form.endDate = res.endDate
                this.form.lat = res.lat
@@ -344,6 +347,7 @@
            },
            // æäº¤è®¢å•
            submit() {
                var that = this;
                if (!this.form.carUnit) {
                    return uni.showToast({ title: '请选择货车型号', icon: 'none' })
                }
@@ -362,60 +366,69 @@
                if (!this.form.linkPhone) {
                    return uni.showToast({ title: '请输入联系电话', icon: 'none' })
                }
                if (!this.form.id) {
                    this.$u.api.release({
                        ...this.form,
                        price: Number(this.form.price) * 100,
                        wayInfoDTOList: [
                            {
                                lat: this.form.lat,
                                lgt: this.form.lgt,
                                location: this.form.location
                            },
                            ...this.form.wayInfoDTOList,
                            {
                                lat: this.form.latEnd,
                                lgt: this.form.lgtEnd,
                                location: this.form.locationEnd
                            }
                        ]
                    }).then(res => {
                        if (res.code == 200) {
                            uni.navigateTo({
                                url: `/pages/success/success?orderId=${res.data.id}`
                if (!that.form.id) {
                    uni.requestSubscribeMessage({
                        tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
                        success(res) {
                            that.$u.api.release({
                                ...that.form,
                                price: Number(that.form.price) * 100,
                                wayInfoDTOList: [
                                    {
                                        lat: that.form.lat,
                                        lgt: that.form.lgt,
                                        location: that.form.location
                                    },
                                    ...that.form.wayInfoDTOList,
                                    {
                                        lat: that.form.latEnd,
                                        lgt: that.form.lgtEnd,
                                        location: that.form.locationEnd
                                    }
                                ]
                            }).then(res => {
                                if (res.code == 200) {
                                    uni.navigateTo({
                                        url: `/pages/success/success?orderId=${res.data.id}`
                                    })
                                }
                            })
                        }
                    })
                } else {
                    this.$u.api.updateOrder({
                        ...this.form,
                        price: Number(this.form.price) * 100,
                        wayInfoDTOList: [
                            {
                                lat: this.form.lat,
                                lgt: this.form.lgt,
                                location: this.form.location
                            },
                            ...this.form.wayInfoDTOList,
                            {
                                lat: this.form.latEnd,
                                lgt: this.form.lgtEnd,
                                location: this.form.locationEnd
                            }
                        ]
                    }).then(res => {
                        if (res.code == 200) {
                            uni.showToast({
                                title: '编辑成功',
                                icon: 'success',
                                mask: true,
                                duration: 2000
                    uni.requestSubscribeMessage({
                        tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
                        success(res) {
                            that.$u.api.updateOrder({
                                ...that.form,
                                price: Number(that.form.price) * 100,
                                wayInfoDTOList: [
                                    {
                                        lat: that.form.lat,
                                        lgt: that.form.lgt,
                                        location: that.form.location
                                    },
                                    ...that.form.wayInfoDTOList,
                                    {
                                        lat: that.form.latEnd,
                                        lgt: that.form.lgtEnd,
                                        location: that.form.locationEnd
                                    }
                                ]
                            }).then(res => {
                                if (res.code == 200) {
                                    uni.showToast({
                                        title: '编辑成功',
                                        icon: 'success',
                                        mask: true,
                                        duration: 2000
                                    })
                                    setTimeout(() => {
                                        uni.navigateBack({ delta: 1 });
                                        // uni.$emit('refresh')
                                    }, 1500)
                                }
                            })
                            setTimeout(() => {
                                uni.navigateBack({ delta: 1 });
                                // uni.$emit('refresh')
                            }, 1500)
							
                        }
                    })
                }
@@ -502,7 +515,8 @@
            confirmDate(e) {
                this.form.startDate = e[0]
                this.form.endDate = e[e.length - 1]
                this.form.priceNum1 = e.length;
                let time = this.form.startDate == this.form.endDate ? 1 : 0
                this.form.priceNum1 = e.length - time;
                this.show2 = false
            },
            addAddr() {
@@ -518,15 +532,15 @@
                        if ([2].includes(type)) {
                            this.form.latitude = res.latitude
                            this.form.longitude = res.longitude
                            this.form.address = res.address
                            this.form.address = res.name || res.address
                        } else if (type === 3) {
                            this.form.locationEnd = res.address
                            this.form.locationEnd = res.name || res.address
                            this.form.latEnd = res.latitude
                            this.form.lgtEnd = res.longitude
                        } else if (type === 4) {
                            this.form.wayInfoDTOList[0].lat = res.latitude
                            this.form.wayInfoDTOList[0].lgt = res.longitude
                            this.form.wayInfoDTOList[0].location = res.address
                        } else if (type === 4) { 
                            this.form.wayInfoDTOList[index].lat = res.latitude
                            this.form.wayInfoDTOList[index].lgt = res.longitude
                            this.form.wayInfoDTOList[index].location = res.name || res.address
                        }
                    }
                });

 small-program/pages/index/index.vue

@@ -1,7 +1,7 @@
<template>
    <view class="index">
        <!-- æŽ¥å•æ–¹ -->
        <view class="index-j" v-if="typeViewId === 1">
        <view class="index-j" v-if="userInfo && userInfo.useIdentity === 1">
            <view class="index-j-head">
                <view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
                <view class="index-c-title" :style="{ height: navHeight + 'px' }">
@@ -74,14 +74,15 @@
                        <text>Â¥{{item.estimatedAccount / 100}}</text>
                    </view>
                    <view class="eidt">
                        <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify>
                        <!-- <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify> -->
                        <view class="eidt-btn" @click="show1 = true, orderId = item.id">抢单</view>
                    </view>
                </view>
            </view>
        </view>
        
        <!-- å‘单方 -->
        <view class="index-c" v-if="typeViewId === 0">
        <!-- å‘单方  -->
        <view class="index-c" v-if="!userInfo || userInfo.useIdentity === 0">
            <view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
            <view class="index-c-title" :style="{ height: navHeight + 'px' }" @click="selectAddress(-1)">
                <text class="index-c-title-logo">近快</text>
@@ -119,12 +120,13 @@
                                    <view class="radio-item-label">{{item.name}}</view>
                                    <view class="radio-item-list">
                                        <view class="radio-item-list-l">
                                            <view :class="child.active ? 'radio-item-list-item active' : 'radio-item-list-item'" v-for="(child, childIndex) in item.list" :key="childIndex" @click="selectMenu(index, childIndex)">{{child.price}}元</view>
                                            <view v-if="child.price" :class="child.active ? 'radio-item-list-item active' : 'radio-item-list-item'" v-for="(child, childIndex) in item.list" :key="childIndex" @click="selectMenu(index, childIndex)">{{child.price||0}}元</view>
                                        </view>
                                        <view class="radio-item-list-data">
                                            <text>份数：</text>
                                            <text style="flex-shrink: 0;">份数：</text>
                                            <input type="number" v-model="item.num" placeholder="请输入">
                                            <text style="color: #999999;">份</text>
                                            <view class="radio-item-list-data-btn" @click="clear(index)">取消</view>
                                        </view>
                                    </view>
                                </view>
@@ -194,7 +196,7 @@
                    </view>
                    <view class="box-hz-btn" :style="{ backgroundImage: 'url(' + btn + ')' }">
                        <view class="box-hz-btn-kf" @click="contactPhone()">客服</view>
                        <view class="box-hz-btn-next" @click="submit">下一步</view>
                        <view class="box-hz-btn-next" @click="submit">立即下单</view>
                    </view>
                </view>
            </template>
@@ -256,14 +258,14 @@
                                <view :class="form.startDate ? 'box-hz-list-item-val active' : 'box-hz-list-item-val'">
                                    <view class="box-hz-list-item-val-left">
                                        <image class="icon" src="/static/icon/ic_time@2x.png" mode="widthFix"></image>
                                        <text>{{ form.startDate ? form.startDate + ' è‡³ ' + form.endDate : '请选择用工时间'}}</text>
                                        <text>{{ form.startDate ? form.startDate + ' è‡³ ' + form.endDate : '请选择用车时间'}}</text>
                                    </view>
                                    <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
                                </view>
                            </view>
                            <view class="box-hz-list-item">
                                <view class="box-hz-list-item-label">
                                    <text>用车时间：</text>
                                    <text>用车地点：</text>
                                    <text @click="addAddr">+增加途经点</text>
                                </view>
                                <view class="item-d">
@@ -304,15 +306,16 @@
                    
                    <view class="box-hz-btn" :style="{ backgroundImage: 'url(' + btn + ')' }">
                        <view class="box-hz-btn-kf"  @click="contactPhone()" >客服</view>
                        <view class="box-hz-btn-next" @click="jump()">下一步</view>
                        <view class="box-hz-btn-next" @click="jump()">立即下单</view>
                    </view>
                </view>
            </view>
        </view>
        
        <!-- é€‰æ‹©æ—¥æœŸèŒƒå›´ -->
        <u-calendar :show="show" color="#00BC12" mode="range" @close="show = false" @confirm="confirmDate"></u-calendar>
        <u-popup :show="showPhone" round="15" mode="bottom"   @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
        <u-calendar :show="show" color="#00BC12" :allowSameDay="true" mode="range" @close="show = false" @confirm="confirmDate"></u-calendar>
		
        <u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true"  @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
            <view class="phone">
                <view class="phone-head">
                    <view></view>
@@ -322,9 +325,25 @@
                     <view></view>
                     <text>{{item}}</text> 
                 </view>  
                 <view style="width: 100%; height: 30rpx;"></view>
                <!-- <view class="phone-botton"  @click="contactPhone()" >关闭</view> -->
            </view>
        </u-popup>
		
        <u-modal
            title="温馨提示"
            :show="show1"
            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="show1 = false">取消</view>
                <view class="btn2" @click="getaccept1">确认</view>
            </view>
        </u-modal>
    </view>
</template>

@@ -401,7 +420,8 @@
                    linkName: '',
                    linkPhone: '',
                    estimatedAccount: '',
                    price: ''
                    price: '',
                    address: ''
                },
                sortType: 0,
                orderList: [],
@@ -409,21 +429,24 @@
                page: 1,
                next: true,
                
                isOnce: true
                isOnce: true,
                show1: false,
                orderId: null
            }
        },
        async onLoad() { 
            await this.$onLaunched;
			
            if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
                this.getOrderList()
            }
            console.log('2')
            // if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
            //     this.getOrderList()
            // }
            
            this.getCategoryLists()
            this.getDictInfo()
            
            if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
                this.form.linkPhone = this.userInfo.telephone
                this.form.linkPhone = this.userInfo.telephone || ''
                this.form.linkName = this.userInfo.name || ''
            }
            
            this.qqmapsdk = new QQMapWX({
@@ -438,16 +461,15 @@
                this.form.location = ''
                this.form.locationEnd = ''
                this.form.wayInfoDTOList = []
                this.form.workType = 0
                this.form.workType = 0 
                this.form.days = ''
                this.form.locationRemark = ''
                this.form.supplement = ''
                this.form.multifileList = []
                this.form.linkName = ''
                this.form.estimatedAccount = ''
                this.form.price = ''
                this.form.address = ''
                this.orderFood = []
                this.clearAll()
            })
            // åˆ·æ–°é¦–页数据
            uni.$on('refresh', () => {
@@ -459,13 +481,35 @@
                }
            })
        },
        onShow(options) {
            this.typeViewId = 0
        async onShow(options) {
            await this.$onLaunched;
            console.log('2')
            this.form.startDate = ''
            this.form.address = ''
            this.form.endDate = ''
            this.form.latitude = ''
            this.form.longitude = ''
            this.form.location = ''
            this.form.locationEnd = ''
            this.form.wayInfoDTOList = []
            this.form.workType = 0
            this.form.days = '' 
            this.form.locationRemark = ''
            this.form.supplement = ''
            this.form.multifileList = []
            this.form.estimatedAccount = ''
            this.form.price = ''
            this.viewStatus = false
            this.clearAll()
			
            if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
                console.log('已登陆')
                this.isLogin = true
                
                if (!this.isOnce && this.userInfo.useIdentity == 1) {
                // this.typeViewId = this.userInfo.useIdentity
                // !this.isOnce && 
                if (this.userInfo.useIdentity === 1) {
                    console.log('已登陆111')
                    this.page = 1
                    this.next = true
                    this.orderList = []
@@ -476,16 +520,13 @@
                this.isLogin = false
                console.log('未登陆')
            }
			
            if (this.userInfo && this.userInfo.useIdentity == 1) {
                this.typeViewId = 1
            }
        },
        watch: {
            typeId: {
                handler(news, old) {
                    console.log('typeId')
                    this.form.startDate = ''
					
                    this.form.address = ''
                    this.form.endDate = ''
                    this.form.latitude = ''
                    this.form.longitude = ''
@@ -497,10 +538,10 @@
                    this.form.locationRemark = ''
                    this.form.supplement = ''
                    this.form.multifileList = []
                    this.form.linkName = ''
                    this.form.estimatedAccount = ''
                    this.form.price = ''
                    this.viewStatus = false
                    this.clearAll()
                }
            },
            orderFood: {
@@ -535,6 +576,20 @@
            }
        },
        methods: {
            clear(index) {
                this.orderFood[index].num = ''
                this.orderFood[index].list.forEach(item => {
                    item.active = false
                })
            },
            clearAll() { 
                this.orderFood.forEach(p=>{
                    p.num=null
                    p.list.forEach(item => {
                        item.active = false
                    })
                })				
            },
            getDictInfo(){
                var that = this;
                this.$u.api.getPlatformAboutUs({}).then(res =>{ 
@@ -553,20 +608,33 @@
                }
            },
            // æ‰‹åŠ¨æŽ¥å•
            getaccept(e, orderId, index) {
                if (!e.msg) return;
                this.$u.api.accept({ orderId })
                    .then(res => {
                        if (res.code === 200) {
            getaccept() {
                var that = this;
                that.$u.api.accept({ orderId: this.orderId })
                    .then(res1 => {
                        if (res1.code === 200) {
                            uni.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 })
                            setTimeout(() => {
                                this.page = 1
                                this.next = true
                                this.orderList = []
                                this.getOrderList()
                                that.page = 1
                                that.next = true
                                that.orderList = []
                                that.getOrderList()
                            }, 2000)
                        }
                    })
            },
            getaccept1() {
                var that = this;
                this.show1 = false
                uni.requestSubscribeMessage({
                    tmplIds: ['tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
                    success(res) {
                        that.getaccept()
                    },
                    fail(err) {
                        that.getaccept()
                    }
                })
            },
            clickSort(id) {
                this.sortType = id
@@ -592,8 +660,8 @@
                        queryMyOrderType: 2,
                        type: this.typeVal,
                        sortType: this.sortType,
                        queryLat: this.latitude,
                        queryLgt: this.longitude
                        queryLat: uni.getStorageSync('address').latitude,
                        queryLgt: uni.getStorageSync('address').longitude
                    }
                }).then(res => {
                    if (res.code !== 200) return;
@@ -620,11 +688,34 @@
            },
            // æäº¤è®¢å•
            submit() {
                var that = this
                if (!this.form.startDate) {
                    return uni.showToast({ title: '请选择用餐时间', icon: 'none' })
                } 
                let cateringDTOList = []
                let valid = true
                let msg ='请选择'
                that.orderFood.forEach(item => {
                    item.list.forEach(child => {
                        if (child.active) {
                            // (Number(child.price) * Number(item.num))
                            if( !item.num){								 
                                msg =msg +'【'+item.name+'】';
                                valid =false  		 
                            }
                            cateringDTOList.push({
                                name: item.name,
                                num: item.num,
                                price: child.price * 100
                            })
                        }
                    })
                })
                if(!valid){
                    return uni.showToast({ title: msg+'用餐份数', icon: 'none' })
                }
                if (this.form.price === 0) {
                    return uni.showToast({ title: '请选择用餐时间', icon: 'none' })
                if (cateringDTOList.length === 0) {
                    return uni.showToast({ title: '请选择用餐标准', icon: 'none' })
                }
                if (!this.form.address) {
                    return uni.showToast({ title: '请选择用餐地点', icon: 'none' })
@@ -632,52 +723,48 @@
                if (!this.form.linkPhone) {
                    return uni.showToast({ title: '请输入联系电话', icon: 'none' })
                }
                let cateringDTOList = []
                this.orderFood.forEach(item => {
                    item.list.forEach(child => {
                        if (child.active) {
                            cateringDTOList.push({
                                name: item.name,
                                num: item.num,
                                price: (Number(child.price) * Number(item.num)) * 100
                            })
                        }
                    })
                })
                this.$u.api.release({
                    ...this.form,
                    type: 2,
                    price: Number(this.form.price) * 100,
                    priceNum1: this.form.days,
                    location: this.form.address,
                    lat: this.form.latitude,
                    lgt: this.form.longitude,
                    cateringDTOList
                }).then(res => {
                    if (res.code == 200) {
                        wx.requestPayment({
                            timeStamp: res.data.object.timeStamp,
                            nonceStr: res.data.object.nonceStr,
                            package: res.data.object.packageVal,
                            signType: res.data.object.signType,
                            paySign: res.data.object.paySign,
                            success (res1) {
                                if (res1.errMsg = 'requestPayment:ok') {
                                    uni.showToast({ title: '支付成功', icon: 'success', duration: 2000 });
                                    setTimeout(() => {
                                        uni.navigateTo({
                                            url: `/pages/success/success?orderId=${res.data.id}`
                                        })
                                    }, 1500)
                                }
                            },
                            fail(err) {
                                console.log(err)
                uni.requestSubscribeMessage({
                    tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
                    success(res) { 
                        that.$u.api.release({
                            ...that.form,
                            type: 2,
                            price: Number(that.form.price) * 100,
                            priceNum1: that.form.days,
                            location: that.form.address,
                            lat: that.form.latitude,
                            lgt: that.form.longitude,
                            cateringDTOList
                        }).then(res => {
                            if (res.code == 200) {
                                wx.requestPayment({
                                    timeStamp: res.data.object.timeStamp,
                                    nonceStr: res.data.object.nonceStr,
                                    package: res.data.object.packageVal,
                                    signType: res.data.object.signType,
                                    paySign: res.data.object.paySign,
                                    success (res1) {
                                        if (res1.errMsg = 'requestPayment:ok') {
                                            uni.showToast({ title: '支付成功', icon: 'success', duration: 2000 });
                                            setTimeout(() => {
                                                uni.navigateTo({
                                                    url: `/pages/success/success?orderId=${res.data.id}`
                                                })
                                            }, 1500)
                                        }
                                    },
                                    fail(err) {
                                        console.log(err)
                                    }
                                })
                            }
                        })
                        console.log(cateringDTOList)
                    },
                    fail(err) {
                        console.log(err)
                    }
                })
                console.log(cateringDTOList)
            },
            uploadImg() {
                uni.chooseImage({
@@ -729,7 +816,10 @@
            confirmDate(e) {
                this.form.startDate = e[0]
                this.form.endDate = e[e.length - 1]
                this.form.days = e.length;
				
                let time = this.form.startDate == this.form.endDate ? 1 : 0
				
                this.form.days = e.length - time;
                this.show = false
                if (this.typeId === 2) {
                    this.getPrice()
@@ -738,18 +828,19 @@
            selectAddress(type, index) {
                uni.chooseLocation({
                    success: (res) => { 
                        console.log("==================",res)
                        if ([1,2].includes(type)) {
                            this.form.latitude = res.latitude
                            this.form.longitude = res.longitude
                            this.form.address = res.address
                            this.form.address = res.name ||res.address
                        } else if (type === 3) {
                            this.form.locationEnd = res.address
                            this.form.locationEnd = res.name ||res.address
                            this.form.latEnd = res.latitude
                            this.form.lgtEnd = res.longitude
                        } else if (type === 4) {
                            this.form.wayInfoDTOList[0].lat = res.latitude
                            this.form.wayInfoDTOList[0].lgt = res.longitude
                            this.form.wayInfoDTOList[0].location = res.address
                            this.form.wayInfoDTOList[index].lat = res.latitude
                            this.form.wayInfoDTOList[index].lgt = res.longitude
                            this.form.wayInfoDTOList[index].location = res.name||  res.address
                        }else if (type == -1) {
                            console.log(res)
                            this.location.latitude = res.latitude
@@ -760,6 +851,12 @@
                });
            },
            clickType(e) {
                if (!this.token) {
                    uni.navigateTo({
                        url: '/pages/login/login'
                    })
                    return
                }
                this.typeId = e
                if (e === 2) {
                    this.form.categoryId = this.car[0].id
@@ -895,6 +992,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 {
            width: 100%;
            .index-j-head {
@@ -1001,6 +1128,17 @@
                        display: flex;
                        align-items: center;
                        justify-content: center;
                        .eidt-btn {
                            width: 100%;
                            height: 88rpx;
                            line-height: 88rpx;
                            text-align: center;
                            background: #00BC12;
                            border-radius: 44rpx;
                            font-weight: 500;
                            font-size: 32rpx;
                            color: #FFFFFF;
                        }
                        // background: #00BC12;
                        // border-radius: 50rpx;
                        // text {
@@ -1270,7 +1408,7 @@
                            .radio-item {
                                width: 100%;
                                display: flex;
                                align-items: self-end;
                                align-items: flex-start;
                                margin-bottom: 30rpx;
                                border-bottom: 1rpx solid #E5E5E5;
                                &:last-child {
@@ -1329,6 +1467,18 @@
                                        justify-content: flex-end;
                                        margin-top: 42rpx;
                                        margin-bottom: 34rpx;
                                        .radio-item-list-data-btn {
                                            width: 110rpx;
                                            height: 64rpx;
                                            line-height: 64rpx;
                                            margin-left: 20rpx;
                                            font-weight: 400;
                                            font-size: 24rpx;
                                            color: #666666;
                                            text-align: center;
                                            border: 1rpx solid #B2B2B2;
                                            border-radius: 34rpx;
                                        }
                                        text {
                                            font-weight: 400;
                                            font-size: 30rpx;

 small-program/pages/mine/mine.vue

@@ -10,7 +10,7 @@
                    <view class="info-box-head" >
                        <view class="info-box-head-image" @click="jump(isLogin?1:5)">
                            <image v-if="userInfo.fullCoverImage&&userInfo.fullCoverImage !=''" :src="userInfo.fullCoverImage" mode="widthFix"></image>
                            <image v-else src="/static/logo.png" mode="widthFix"></image>
                            <image v-else src="/static/icon/img@2x.png" mode="widthFix"></image>
                        </view>
                        <view class="info-box-head-info" v-if="isLogin">
                            <view class="info-box-head-info-name"  @click="jump(1)">{{userInfo.nickName||'匿名'}}</view>
@@ -260,6 +260,7 @@
                    console.log(222,res)
                    if(res.code ===200){
                        that.userInfo.useIdentity = param.useIdentity
                        that.$store.commit('setUserInfo', that.userInfo)
                        uni.$emit('refresh')
                    } 
               }).finally(() => {

 small-program/pages/order-details/order-details.vue

@@ -7,12 +7,12 @@
            <view class="order-head-status">{{info.statusName || ''}}</view>
            <view class="order-head-info">{{getStatusInfo()}}</view> 
        </view>
        <view class="order-quxiao" v-if="userInfo.useIdentity != 0">
        <view class="order-quxiao">
            <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">取消订单</view>
            <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)">取消订单</view>
            <view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">修改订单</view>
        </view>
        <view class="order-user"  v-if="userInfo.id === info.releaseMemberId && userInfo.useIdentity != 0">
        <view class="order-user"  v-if="userInfo.id === info.releaseMemberId && info.acceptMemberId">
            <view class="order-user-info">
                <view class="user-info-l">
                    <view class="user-info-l-image">
@@ -31,7 +31,7 @@
                            </view>
                            <view class="user-info-l-i-bottom-item">
                                <text>单数：</text>
                                <text>{{info.publishNum || 0}}</text>
                                <text>{{info.receiveNum ? info.receiveNum : 0}}</text>
                            </view>
                        </view>
                    </view>
@@ -98,8 +98,15 @@
                </view>
                <view class="price-row">
                    <view class="price-row-label">预估总费用(元)</view>
                    <view class="price-row-val" style="color: #FF0000;">
                    <view class="price-row-val" :style="{color: userInfo.id !== info.acceptMemberId ? '#FF0000' : ''}">
                        Â¥{{((info.estimatedAccount||0)/100).toFixed(2) }}
                    </view>
                </view>
				
                <view class="price-row" v-if="userInfo.id === info.acceptMemberId">
                    <view class="price-row-label">实际到账(元)</view>
                    <view class="price-row-val" style="color: #FF0000;">
                        Â¥{{((info.estimatedAccount * (1 - (info.platformRata || 0))) / 100).toFixed(2) }}
                    </view>
                </view>
            </view>
@@ -108,7 +115,7 @@
            <view class="order-info-title">
                <text>评价</text>
            </view>
            <u-rate :count="count" activeColor="#FFC331" size="26" v-model="info.commentLevel"></u-rate>
            <u-rate :count="count" readonly activeColor="#FFC331" size="26" v-model="info.commentLevel"></u-rate>
            <view class="order-info-remark">
                {{ info.commentInfo || '-'}}
            </view>
@@ -176,7 +183,10 @@
                <view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">取消订单</view>
                <view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)">取消订单</view>
                <view class="order-footer-btn-b" @click="show2=true" v-if="userInfo.id === info.releaseMemberId && (info.status ===4 && info.commentStatus!=1)">去评价</view>
                <view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId &&((info.status ===3 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">完成并支付</view>
                <view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId &&((info.status ===3 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '继续支付' : '完成并支付'}}</view>
				
                <view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && ((info.status ===3 && info.type===2))" @click="payment1">完成作业</view>
				
                <view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">修改订单</view>
                <view class="order-footer-btn-b" @click="show5 =true" v-if="userInfo.id === info.acceptMemberId && (info.isUpdate==1 && info.status ===2)">修改确认</view>
                <view class="order-footer-btn-b" @click="startJobs()" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">开始作业</view>
@@ -362,6 +372,16 @@
                    })
                }
            },
            payment1() {
                var that = this
                this.$u.api.doneOrder({
                    orderId: this.info.id
                }).then(res => {
                    if (res.code === 200) {
                        that.getOrderData()
                    }
                })
            },
            payment() {
                var that = this
                // è®¢é¤
@@ -466,18 +486,27 @@
            },
            cancelDo(){
                var that = this
                var param ={ orderId:that.id}
                this.$u.api.cancelOrder(param).then(res =>{
                    if(res.code ===200){
                        that.show=false
                        uni.showToast({ title: '订单取消成功', icon: 'error', duration: 2000 });
                        if(that.userInfo.id !== that.info.releaseMemberId){
                            uni.navigateBack({ delta: 1 })
                        }else{
                            that.getOrderData()
                        } 
                uni.requestSubscribeMessage({
                    tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
                    success(res) {
                        var param ={ orderId:that.id}
                        that.$u.api.cancelOrder(param).then(res =>{
                            if(res.code ===200){
                                that.show=false
                                uni.showToast({ title: '订单取消成功', icon: 'error', duration: 2000 });
                                if(that.userInfo.id !== that.info.releaseMemberId){
                                    uni.navigateBack({ delta: 1 })
                                }else{
                                    that.getOrderData()
                                } 
                            }
                         }) 
                    },
                    fail(err) {
                        console.log(err)
                    }
                 }) 
                })
				
            },
            previemImg(src){
                uni.previewImage({

 small-program/pages/packaging-worker/packaging-worker.vue

@@ -84,10 +84,14 @@
                        <view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
                    </view>
                    <view class="list-item-row">
                        <view class="list-item-row-label">天数</view>
                        <view class="list-item-row-label" v-if="form.carType === 0">天数</view>
                        <view class="list-item-row-label" v-if="form.carType === 1">小时数</view>
                        <view class="list-item-row-label" v-if="form.carType === 2">重量</view>
                        <view class="list-item-row-val">
                            <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="请输入" />
                            <text>天</text>
                            <input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="请输入" />
                            <text v-if="form.carType === 0">天</text>
                            <text v-if="form.carType === 1">小时</text>
                            <text v-if="form.carType === 2">斤</text>
                        </view>
                    </view>
                    <view class="list-item-row">
@@ -143,6 +147,7 @@
            :show="show"
            color="#00BC12"
            mode="range"
             :allowSameDay="true"
            @close="show = false"
            @confirm="confirmDate" />
        
@@ -198,11 +203,12 @@
                },
                settlementType: [
                    { name: '按天付费', id: 0 },
                    { name: '按次付费', id: 1 },
                    { name: '按小时付费', id: 1 },
                    { name: '按重量付费', id: 2 }
                ],
                cateList: [],
                viewStatus: false
                viewStatus: false,
                workDays: 0
            };
        },
        onLoad(option) {
@@ -296,7 +302,11 @@
            confirmDate(e) {
                this.form.startDate = e[0]
                this.form.endDate = e[e.length - 1]
                this.form.priceNum1 = e.length;
                let time = this.form.startDate == this.form.endDate ? 1 : 0
                this.workDays = e.length - time;
                if (this.form.carType === 0) {
                    this.form.priceNum1 = e.length - time;
                }
                this.show = false
                this.getPrice()
            },
@@ -305,7 +315,7 @@
                    success: (res) => {
                        this.form.lat = res.latitude
                        this.form.lgt = res.longitude
                        this.form.address = res.address
                        this.form.address =res.name ||  res.address
                    }
                });
            },
@@ -313,10 +323,13 @@
                this.form.carType = id
                if (id === 0) {
                    this.form.priceUnit = '元/人/天'
                    this.form.priceNum1 = this.workDays
                } else if (id === 1) {
                    this.form.priceUnit = '元/人/小时'
                    this.form.priceNum1 = ''
                } else {
                    this.form.priceUnit = '元/斤'
                    this.form.priceNum1 = ''
                }
            },
            confirmCategary(e) {

 small-program/pages/sorting/sorting.vue

@@ -139,6 +139,7 @@
            :show="show"
            color="#00BC12"
            mode="range"
             :allowSameDay="true"
            @close="show = false"
            @confirm="confirmDate" />
        
@@ -293,7 +294,7 @@
                    success: (res) => {
                        this.form.lat = res.latitude
                        this.form.lgt = res.longitude
                        this.form.address = res.address
                        this.form.address = res.name || res.address
                    }
                });
            },

 small-program/pages/using-workers/using-workers.vue

@@ -135,6 +135,7 @@
            :show="show"
            color="#00BC12"
            mode="range"
             :allowSameDay="true"
            @close="show = false"
            @confirm="confirmDate" />
        
@@ -227,6 +228,7 @@
        methods: {
            // æäº¤è®¢å•
            submit() {
                var that = this;
                if (!this.form.categoryId) {
                    return uni.showToast({ title: '请选择采摘品种', icon: 'none' })
                }
@@ -239,32 +241,41 @@
                if (!this.form.linkPhone) {
                    return uni.showToast({ title: '请输入联系电话', icon: 'none' })
                }
                if (!this.form.id) {
                    this.$u.api.release({ ...this.form, price: Number(this.form.price) * 100 })
                        .then(res => {
                            if (res.code == 200) {
                                uni.navigateTo({
                                    url: `/pages/success/success?orderId=${res.data.id}`
                if (!that.form.id) {
                    uni.requestSubscribeMessage({
                        tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
                        success(res) {
                            that.$u.api.release({ ...that.form, price: Number(that.form.price) * 100 })
                                .then(res => {
                                    if (res.code == 200) {
                                        uni.navigateTo({
                                            url: `/pages/success/success?orderId=${res.data.id}`
                                        })
                                    }
                                })
                            }
                        })
                        }
                    })
                } else {
                    this.$u.api.updateOrder({ ...this.form, price: Number(this.form.price) * 100  })
                        .then(res => {
                            if (res.code == 200) {
                                uni.showToast({
                                    title: '编辑成功',
                                    icon: 'success',
                                    mask: true,
                                    duration: 2000
                    uni.requestSubscribeMessage({
                        tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
                        success(res) {
                            that.$u.api.updateOrder({ ...that.form, price: Number(that.form.price) * 100  })
                                .then(res => {
                                    if (res.code == 200) {
                                        uni.showToast({
                                            title: '编辑成功',
                                            icon: 'success',
                                            mask: true,
                                            duration: 2000
                                        })
                                        setTimeout(() => {
                                            uni.navigateBack({ delta: 1 });
                                            // uni.$emit('refresh')
                                        }, 1500)
                                    }
                                })
                                setTimeout(() => {
                                    uni.navigateBack({ delta: 1 });
                                    // uni.$emit('refresh')
                                }, 1500)
								
                            }
                        })
                        }
                    })
                }
            },
            // è®¡ç®—金额
@@ -296,7 +307,7 @@
                    success: (res) => {
                        this.form.lat = res.latitude
                        this.form.lgt = res.longitude
                        this.form.address = res.address
                        this.form.address = res.name || res.address
                    }
                });
            },

 small-program/pages/withdrawal/withdrawal.vue

@@ -102,7 +102,8 @@
                    fail: (res) => {
                      console.log("22222222222222",res)
                      uni.showToast({
                          title:'对不起，提现失败。'+res.err_msg
                          title:'对不起，提现失败。',
                        icon: 'none'
                      })
                    },
                  });
@@ -122,6 +123,7 @@
                );     */                  
            },
            submit() {
                var that = this;
                  if(!this.canTransfer){
                      uni.showToast({
                          title:'您的微信版本过低，请更新至最新版本使用该功能。'
@@ -142,22 +144,26 @@
                      this.changing1 = false
                      return
                  }
                  this.changing1 = true
                  var that = this
                  var param ={amount:this.amount,name:this.name }
                  that.$u.api.applyWithdrawal(param)
                  .then(res =>{
                        if(res.code ===200){
                            that.wxMerchantTransfer(res.data);
                            // uni.navigateTo({
                            //     url: '/pages/withdrawal-successful/withdrawal-successful'
                            // })
                        } 
                   }).finally(() => {
                        that.changing1 = false
                        that.tips=''
                        that.amount =null
                    })
                  uni.requestSubscribeMessage({
                      tmplIds: ['fNJy4545hcrH83bP3a1vszs7XEKWjXMsrfr2XCNsql0'],
                      success(res) {
                          this.changing1 = true
                          var param ={amount:that.amount,name:that.name }
                          that.$u.api.applyWithdrawal(param)
                          .then(res =>{
                            if(res.code ===200){
                                that.wxMerchantTransfer(res.data);
                                // uni.navigateTo({
                                //     url: '/pages/withdrawal-successful/withdrawal-successful'
                                // })
                            } 
                           }).finally(() => {
                            that.changing1 = false
                            that.tips=''
                            that.amount =null
                        })
                      }
                  })
            },
            
        }

 small-program/store/index.js

@@ -47,11 +47,10 @@
        },
        // è®¾ç½®ç»çº¬åº¦
        setPosition(state, obj) {
            console.log(obj)
            state.latitude = obj.latitude
            state.longitude = obj.longitude
            state.address = obj.address  
            console.log("=====================",obj)
            console.log("地址设置完成")
        },
        // æ¸…除缓存数据
        empty(state) {