From e77f004dcccf3b86e16f93310d33e3db33e1af39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= Date: Fri, 28 Nov 2025 16:38:46 +0800 Subject: [PATCH] 1 --- admin/config/index.js | 8 ++--- .../src/views/account/pla_account_detail.vue | 32 +++++++++++++++++-- admin/src/views/account/pla_account_edit.vue | 30 +++++++++++++++++ package.json | 2 +- 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/admin/config/index.js b/admin/config/index.js index ff14a7b..34f2d94 100644 --- a/admin/config/index.js +++ b/admin/config/index.js @@ -29,8 +29,8 @@ const developmentConfig = { // apiUrl: 'http://localhost:9097/admin_api/', // uploadUrl: 'http://localhost:9097/admin_api/upload', - apiUrl: 'http://work.light120.com/admin_api/', - uploadUrl: 'http://work.light120.com/admin_api/upload', + apiUrl: 'https://work.light120.com/admin_api/', + uploadUrl: 'https://work.light120.com/admin_api/upload', // 开发环境显示更多调试信息 debug: true } @@ -38,8 +38,8 @@ const developmentConfig = { // 生产环境配置 const productionConfig = { ...baseConfig, - apiUrl: 'http://work.light120.com/admin_api/', - uploadUrl: 'http://work.light120.com/admin_api/upload', + apiUrl: 'https://work.light120.com/admin_api/', + uploadUrl: 'https://work.light120.com/admin_api/upload', debug: false } diff --git a/admin/src/views/account/pla_account_detail.vue b/admin/src/views/account/pla_account_detail.vue index 3bdee12..2c1c2ed 100644 --- a/admin/src/views/account/pla_account_detail.vue +++ b/admin/src/views/account/pla_account_detail.vue @@ -189,6 +189,28 @@ {{ deliverConfig.exclude_keywords || '-' }} + +
+ 投递开始时间: + {{ deliverConfig.deliver_start_time || '-' }} +
+ + +
+ 投递结束时间: + {{ deliverConfig.deliver_end_time || '-' }} +
+ + +
+ 是否仅工作日: + + + {{ deliverConfig.deliver_workdays_only === 1 ? '仅工作日' : '包含周末' }} + + +
+ @@ -795,7 +817,10 @@ export default { : (deliverConfig.filter_keywords || ''), exclude_keywords: Array.isArray(deliverConfig.exclude_keywords) ? deliverConfig.exclude_keywords.join(',') - : (deliverConfig.exclude_keywords || '') + : (deliverConfig.exclude_keywords || ''), + deliver_start_time: deliverConfig.time_range?.start_time || '09:00', + deliver_end_time: deliverConfig.time_range?.end_time || '18:00', + deliver_workdays_only: deliverConfig.time_range?.workdays_only !== undefined ? deliverConfig.time_range.workdays_only : 1 } } else { this.deliverConfig = { @@ -806,7 +831,10 @@ export default { page_count: 3, max_deliver: 10, filter_keywords: '', - exclude_keywords: '' + exclude_keywords: '', + deliver_start_time: '09:00', + deliver_end_time: '18:00', + deliver_workdays_only: 1 } } diff --git a/admin/src/views/account/pla_account_edit.vue b/admin/src/views/account/pla_account_edit.vue index eab511d..1d7c4f9 100644 --- a/admin/src/views/account/pla_account_edit.vue +++ b/admin/src/views/account/pla_account_edit.vue @@ -113,6 +113,18 @@ + + + + + + + + + 仅工作日 + 包含周末 + + @@ -207,6 +219,9 @@ export default { max_deliver: 10, filter_keywords: '', exclude_keywords: '', + deliver_start_time: '09:00', + deliver_end_time: '18:00', + deliver_workdays_only: 1, auto_chat: 0, chat_interval: 30, is_chat_outsourcing: 0, @@ -307,6 +322,12 @@ export default { this.formData.exclude_keywords = Array.isArray(deliverConfig.exclude_keywords) ? deliverConfig.exclude_keywords.join(',') : (deliverConfig.exclude_keywords || '') + // 处理时间区间配置 + if (deliverConfig.time_range) { + this.formData.deliver_start_time = deliverConfig.time_range.start_time || '09:00' + this.formData.deliver_end_time = deliverConfig.time_range.end_time || '18:00' + this.formData.deliver_workdays_only = deliverConfig.time_range.workdays_only !== undefined ? deliverConfig.time_range.workdays_only : 1 + } } // chat_strategy 配置 @@ -449,6 +470,12 @@ export default { deliverConfig.exclude_keywords = typeof saveData.exclude_keywords === 'string' && saveData.exclude_keywords.trim() ? saveData.exclude_keywords.split(',').map(k => k.trim()).filter(k => k) : [] + // 处理时间区间配置 + deliverConfig.time_range = { + start_time: saveData.deliver_start_time || '09:00', + end_time: saveData.deliver_end_time || '18:00', + workdays_only: saveData.deliver_workdays_only ? 1 : 0 + } saveData.deliver_config = deliverConfig delete saveData.deliver_interval delete saveData.min_salary @@ -457,6 +484,9 @@ export default { delete saveData.max_deliver delete saveData.filter_keywords delete saveData.exclude_keywords + delete saveData.deliver_start_time + delete saveData.deliver_end_time + delete saveData.deliver_workdays_only // 处理 chat_strategy const chatStrategy = {} diff --git a/package.json b/package.json index 157373a..10cc4e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frameapi", - "version": "1.0.0", + "version": "1.0.2", "author": "light22600", "description": "a node webApi", "main": "app.js",