diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index c8a1271c0..acedc6dff 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -38,7 +38,7 @@ class SystemController extends AbstractController * @apiParam {String} type * - get: 获取（默认） * - all: 获取所有（需要管理员权限） - * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'auto_archived', 'archived_day', 'all_group_mute', 'all_group_autoin', 'image_compress', 'image_save_local', 'start_home', 'home_footer']） + * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'auto_archived', 'archived_day', 'task_visible', 'all_group_mute', 'all_group_autoin', 'image_compress', 'image_save_local', 'start_home']） * @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {String} msg 返回信息（错误描述） @@ -65,12 +65,12 @@ class SystemController extends AbstractController 'anon_message', 'auto_archived', 'archived_day', + 'task_visible', 'all_group_mute', 'all_group_autoin', 'image_compress', 'image_save_local', 'start_home', - 'home_footer' ])) { unset($all[$key]); } @@ -104,6 +104,7 @@ class SystemController extends AbstractController $setting['anon_message'] = $setting['anon_message'] ?: 'open'; $setting['auto_archived'] = $setting['auto_archived'] ?: 'close'; $setting['archived_day'] = floatval($setting['archived_day']) ?: 7; + $setting['task_visible'] = $setting['task_visible'] ?: 'close'; $setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open'; $setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes'; $setting['image_compress'] = $setting['image_compress'] ?: 'open'; @@ -909,26 +910,6 @@ class SystemController extends AbstractController ]); } - /** - * @api {get} api/system/get/starthome 20. 启动首页设置信息 - * - * @apiDescription 用于判断注册是否需要启动首页 - * @apiVersion 1.0.0 - * @apiGroup system - * @apiName get__starthome - * - * @apiSuccess {Number} ret 返回状态码（1正确、0错误） - * @apiSuccess {String} msg 返回信息（错误描述） - * @apiSuccess {Object} data 返回数据 - */ - public function get__starthome() - { - return Base::retSuccess('success', [ - 'need_start' => Base::settingFind('system', 'start_home') == 'open', - 'home_footer' => Base::settingFind('system', 'home_footer') - ]); - } - /** * @api {get} api/system/email/check 21. 邮件发送测试（限管理员） * diff --git a/public/site/css/common.css b/public/site/css/common.css index 03d6f4a5c..195c4f564 100644 --- a/public/site/css/common.css +++ b/public/site/css/common.css @@ -315,6 +315,7 @@ img { border: 1px solid var(--txt-theme-color); } .search-form{ + display: none; position: relative; } .search-input{ diff --git a/public/site/css/help.css b/public/site/css/help.css index fb85f031d..e8a9563e3 100644 --- a/public/site/css/help.css +++ b/public/site/css/help.css @@ -40,12 +40,6 @@ height: 82vh; } -.l-ul-item { - padding: 9px 16px; - cursor: pointer; - height: 22px; -} - .l-ul-item.active .txt { color: var(--txt-theme-color); } @@ -195,4 +189,6 @@ display: block; width: 100%; height: 100%; + padding: 9px 16px; + line-height: normal; } diff --git a/public/site/css/log.css b/public/site/css/log.css index 9e12fd01a..641b59029 100644 --- a/public/site/css/log.css +++ b/public/site/css/log.css @@ -33,11 +33,6 @@ .logs-l-ul{ width: 240px; } -.l-ul-item{ - padding: 9px 16px; - cursor: pointer; - height: 22px; -} .l-ul-item.active .txt{ color: var(--txt-theme-color); } @@ -133,9 +128,11 @@ border-top: 1px solid var(--border-color); } .log-a{ - display: block; - width: 100%; - height: 100%; + display: block; + width: 100%; + height: 100%; + padding: 9px 16px; + line-height: normal; } .logs-sticky{ position: sticky; diff --git a/public/site/en/about.html b/public/site/en/about.html index 8abb70aa7..67660e287 100644 --- a/public/site/en/about.html +++ b/public/site/en/about.html @@ -202,7 +202,7 @@
  • - Try Now + Try Now
    • diff --git a/public/site/en/download.html b/public/site/en/download.html index 565f6376c..e2494d9d0 100644 --- a/public/site/en/download.html +++ b/public/site/en/download.html @@ -75,7 +75,7 @@ - + @@ -132,7 +132,7 @@ Windows Windows - + Windows,download Download @@ -212,7 +212,7 @@
  • - Try Now + Try Now
    • @@ -318,9 +318,7 @@ - - - + diff --git a/public/site/en/help.html b/public/site/en/help.html index 5c2fab2bd..cba73aa84 100644 --- a/public/site/en/help.html +++ b/public/site/en/help.html @@ -250,7 +250,7 @@
  • - Try Now + Try Now
    • diff --git a/public/site/en/index.html b/public/site/en/index.html index 6dae35c27..ef65a905a 100644 --- a/public/site/en/index.html +++ b/public/site/en/index.html @@ -183,7 +183,7 @@
  • - Try Now + Try Now
    • diff --git a/public/site/en/log.html b/public/site/en/log.html index 678589263..9f0363740 100644 --- a/public/site/en/log.html +++ b/public/site/en/log.html @@ -168,7 +168,7 @@
  • - Try Now + Try Now
    • @@ -208,8 +208,8 @@ + - diff --git a/public/site/js/common.js b/public/site/js/common.js index a0a216b3e..19e0c7e11 100644 --- a/public/site/js/common.js +++ b/public/site/js/common.js @@ -2,7 +2,7 @@ const menuBtn = document.getElementById('menuBtn'); // 768模式下的菜单按 const drawer = document.querySelector('.drawer'); // 768模式下的菜单 const theme_light = document.querySelectorAll('.theme_light'); const theme_dark = document.querySelectorAll('.theme_dark'); -/* 主题切换更换图片 */ +/* 主题切换更换图片 */ const themeSwitch = (val1,val2)=>{ theme_light.forEach(item=>{ item.style.display = val1 @@ -11,7 +11,7 @@ const themeSwitch = (val1,val2)=>{ item.style.display = val2 }) } -/* 更换图片 */ +/* 更换图片 */ const changeImageSrc = (img, src) => { const imgDom = document.querySelectorAll(img); const url = window.location.href // 获取当前浏览器 URL @@ -21,20 +21,20 @@ const changeImageSrc = (img, src) => { }) } }; -/* 设置默认语言 */ +/* 设置默认语言 */ if(!localStorage.getItem('lang')){ localStorage.setItem('lang','zh') } -/* 设置默认主题 */ +/* 设置默认主题 */ const localStorageTheme = localStorage.getItem('theme') -if(!localStorageTheme){ - setTheme('light') +if(!localStorageTheme){ + setTheme('light') localStorage.setItem('theme', 'light') }else{ - setTheme(localStorageTheme) + setTheme(localStorageTheme) } -/* 切换主题函数 */ +/* 切换主题函数 */ function setTheme(theme) { const root = document.documentElement; const lang = localStorage.getItem('lang') @@ -102,12 +102,12 @@ function setTheme(theme) { localStorage.setItem('theme', theme) drawer.classList.remove('open-drawer'); } -/* 导航选中激活 */ +/* 导航选中激活 */ const url = window.location.pathname; const currentTabName = url.split('/')[url.split('/').length - 1].split('.')[0] -if(currentTabName - && currentTabName != 'index' - && currentTabName != 'help' +if(currentTabName + && currentTabName != 'index' + && currentTabName != 'help' && currentTabName != 'download' && currentTabName != 'log'){ const currentTab = document.querySelector(`.nav-${currentTabName}`) @@ -115,7 +115,7 @@ if(currentTabName currentTab.style.color = 'var(--text-color)'; currentTab.style.borderRadius = '6px'; } -/* 导航下拉菜单函数 */ +/* 导航下拉菜单函数 */ const submenuPopDom = document.querySelector('#submenu-pop'); const dropDownSvgDom = document.querySelector('#drop-down-svg'); const showMenuPopHandle = ()=>{ @@ -196,10 +196,6 @@ window.addEventListener('scroll', () => { navbar.classList.remove('navbar-white'); } }); -/* 去登录函数 */ -const goToLoginHandle = ()=>{ - window.location.href = `https://www.dootask.com/manage/dashboard` -} const openInNewTab = (url)=> { const win = window.open(url, '_blank'); win.focus(); diff --git a/public/site/zh/about.html b/public/site/zh/about.html index 23f853c4a..9d892856c 100644 --- a/public/site/zh/about.html +++ b/public/site/zh/about.html @@ -202,7 +202,7 @@
  • - 立即体验 + 立即体验
    • diff --git a/public/site/zh/download.html b/public/site/zh/download.html index 17925c0fe..ab16bbfb7 100644 --- a/public/site/zh/download.html +++ b/public/site/zh/download.html @@ -75,7 +75,7 @@ - + @@ -132,7 +132,7 @@ Windows Windows

    - + Windows,下载 下载 @@ -212,7 +212,7 @@
  • - 立即体验 + 立即体验
    • @@ -316,48 +316,10 @@ - - - + diff --git a/public/site/zh/help.html b/public/site/zh/help.html index 288163d25..2caa71a77 100644 --- a/public/site/zh/help.html +++ b/public/site/zh/help.html @@ -250,7 +250,7 @@
  • - 立即体验 + 立即体验
    • diff --git a/public/site/zh/index.html b/public/site/zh/index.html index 8aab6edd7..f600d79b5 100644 --- a/public/site/zh/index.html +++ b/public/site/zh/index.html @@ -183,7 +183,7 @@
  • - 立即体验 + 立即体验
    • diff --git a/public/site/zh/log.html b/public/site/zh/log.html index ae7ad438c..aa698966e 100644 --- a/public/site/zh/log.html +++ b/public/site/zh/log.html @@ -75,7 +75,7 @@ - + @@ -168,7 +168,7 @@
  • - 立即体验 + 立即体验
    • @@ -207,9 +207,8 @@ - - - + +