修BUG

doum

2025-08-27 fe729234647c83f8029beba4e31dc8d364a6427b

修BUG

 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/main.js

@@ -15,8 +15,10 @@
})

// 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/'
// 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/employment-certification/employment-certification.vue

@@ -376,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
                    },

 small-program/pages/freight/freight.vue

@@ -532,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

@@ -120,7 +120,7 @@
                                    <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 style="flex-shrink: 0;">份数：</text>
@@ -196,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>
@@ -258,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">
@@ -306,7 +306,7 @@
                    
                    <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>
@@ -461,7 +461,7 @@
                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 = ''
@@ -469,6 +469,7 @@
                this.form.estimatedAccount = ''
                this.form.price = ''
                this.form.address = ''
                this.clearAll()
            })
            // åˆ·æ–°é¦–页数据
            uni.$on('refresh', () => {
@@ -483,6 +484,23 @@
        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('已登陆')
@@ -523,6 +541,7 @@
                    this.form.estimatedAccount = ''
                    this.form.price = ''
                    this.viewStatus = false
                    this.clearAll()
                }
            },
            orderFood: {
@@ -562,6 +581,14 @@
                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;
@@ -664,9 +691,31 @@
                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' })
@@ -676,20 +725,7 @@
                }
                uni.requestSubscribeMessage({
                    tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
                    success(res) {
                        let cateringDTOList = []
                        that.orderFood.forEach(item => {
                            item.list.forEach(child => {
                                if (child.active) {
                                    // (Number(child.price) * Number(item.num))
                                    cateringDTOList.push({
                                        name: item.name,
                                        num: item.num,
                                        price: child.price * 100
                                    })
                                }
                            })
                        })
                    success(res) { 
                        that.$u.api.release({
                            ...that.form,
                            type: 2,
@@ -792,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

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

@@ -315,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
                    }
                });
            },

 small-program/pages/sorting/sorting.vue

@@ -294,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

@@ -307,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
                    }
                });
            },