From fe729234647c83f8029beba4e31dc8d364a6427b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 27 八月 2025 16:04:35 +0800
Subject: [PATCH] 修BUG
---
admin/src/components/business/OperaOrderDetailWindow.vue | 4
admin/src/views/system/dict.vue | 3
small-program/pages/packaging-worker/packaging-worker.vue | 2
server/services/src/main/resources/application-dev.yml | 8 +-
server/startsh/admin_start.sh | 9 +++
small-program/pages/sorting/sorting.vue | 2
admin/src/components/business/OperaIdentityDetailWindow.vue | 2
admin/public/favicon.ico | 0
/dev/null | 0
server/startsh/启动脚本和日志处理脚本说明.txt | 13 ++++
small-program/main.js | 4 +
small-program/pages/employment-certification/employment-certification.vue | 2
small-program/pages/certification-results/certification-results.vue | 2
admin/src/components/business/OperaMemberDetailWindow.vue | 2
admin/src/views/business/orders.vue | 8 +-
small-program/pages/using-workers/using-workers.vue | 2
small-program/pages/index/index.vue | 91 +++++++++++++++++++++---------
admin/src/assets/logo.png | 0
small-program/pages/freight/freight.vue | 12 ++--
19 files changed, 113 insertions(+), 53 deletions(-)
diff --git a/admin/public/favicon.ico b/admin/public/favicon.ico
index cbb8906..834a418 100644
--- a/admin/public/favicon.ico
+++ b/admin/public/favicon.ico
Binary files differ
diff --git a/admin/src/assets/logo.jpg b/admin/src/assets/logo.jpg
deleted file mode 100644
index 3caab7a..0000000
--- a/admin/src/assets/logo.jpg
+++ /dev/null
Binary files differ
diff --git a/admin/src/assets/logo.png b/admin/src/assets/logo.png
index 33f6435..834a418 100644
--- a/admin/src/assets/logo.png
+++ b/admin/src/assets/logo.png
Binary files differ
diff --git a/admin/src/components/business/OperaIdentityDetailWindow.vue b/admin/src/components/business/OperaIdentityDetailWindow.vue
index e7269b4..a314edb 100644
--- a/admin/src/components/business/OperaIdentityDetailWindow.vue
+++ b/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;
diff --git a/admin/src/components/business/OperaMemberDetailWindow.vue b/admin/src/components/business/OperaMemberDetailWindow.vue
index e253099..3fe7341 100644
--- a/admin/src/components/business/OperaMemberDetailWindow.vue
+++ b/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;
diff --git a/admin/src/components/business/OperaOrderDetailWindow.vue b/admin/src/components/business/OperaOrderDetailWindow.vue
index 07d9191..4223ebf 100644
--- a/admin/src/components/business/OperaOrderDetailWindow.vue
+++ b/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;
diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index 037ccd1..ed2d66e 100644
--- a/admin/src/views/business/orders.vue
+++ b/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>
diff --git a/admin/src/views/system/dict.vue b/admin/src/views/system/dict.vue
index 4e054ee..e87bf56 100644
--- a/admin/src/views/system/dict.vue
+++ b/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'}"
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 5c9d0fe..176ee31 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/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---
diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
new file mode 100644
index 0000000..60219c0
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt" "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
new file mode 100644
index 0000000..c8720f2
--- /dev/null
+++ "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
@@ -0,0 +1,13 @@
+1銆佹墍鏈� *_start.sh鑴氭湰鎵ц鍓嶏紝璇锋墜鍔ㄥ仠姝㈠搴攋ava杩涚▼ 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
+#鎸塃sc閿悗鍐嶈緭鍏�:wq锛�,鍥炶溅淇濆瓨
+#鏌ョ湅鏄惁鍒涘缓鎴愬姛
+crontab -l
diff --git a/small-program/main.js b/small-program/main.js
index 19e0ac5..118ee2f 100644
--- a/small-program/main.js
+++ b/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,
diff --git a/small-program/pages/certification-results/certification-results.vue b/small-program/pages/certification-results/certification-results.vue
index f06dd99..5f8d16d 100644
--- a/small-program/pages/certification-results/certification-results.vue
+++ b/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 =>{
diff --git a/small-program/pages/employment-certification/employment-certification.vue b/small-program/pages/employment-certification/employment-certification.vue
index 6f91d16..0f3d126 100644
--- a/small-program/pages/employment-certification/employment-certification.vue
+++ b/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
},
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index 22d39c4..93c0835 100644
--- a/small-program/pages/freight/freight.vue
+++ b/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
}
}
});
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 33003ec..1299158 100644
--- a/small-program/pages/index/index.vue
+++ b/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
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 55137c7..8754687 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/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
}
});
},
diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index 6e86272..770cdaf 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/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
}
});
},
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index 5d98873..1294eec 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/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
}
});
},
--
Gitblit v1.9.3