github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-06-07 16:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2023-02-25 23:18:20 +08:00
parent 2b362659ef
commit 48654ca5db
8 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/PublicController.php
View File

@ -92,7 +92,7 @@ class PublicController extends AbstractController
if ($key != $setting['key']) {
return 'key error';
}
$times = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59'];
$times = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
$advance = (intval($setting['advance']) ?: 120) * 60;
$delay = (intval($setting['delay']) ?: 120) * 60;
//

2
app/Http/Controllers/Api/SystemController.php
View File

@ -267,7 +267,7 @@ class SystemController extends AbstractController
}
//
$setting['open'] = $setting['open'] ?: 'close';
$setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59'];
$setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
$setting['advance'] = intval($setting['advance']) ?: 120;
$setting['delay'] = intval($setting['delay']) ?: 120;
$setting['remindin'] = intval($setting['remindin']) ?: 5;

2
app/Tasks/EmailNoticeTask.php
View File

@ -90,7 +90,7 @@ class EmailNoticeTask extends AbstractTask
if (empty($data)) {
continue;
}
$user = User::whereNull('disable_at')->find($userid);
$user = User::whereBot(0)->whereNull('disable_at')->find($userid);
if (empty($user)) {
continue;
}

2
resources/assets/js/app.js vendored
View File

@ -1,4 +1,4 @@
const isElectron = window && window.process && window.process.type;
const isElectron = !!(window && window.process && window.process.type);
const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent);
import {switchLanguage as $L} from "./language";

2
resources/assets/js/pages/manage.vue
View File

@ -2,7 +2,7 @@
<div v-show="userId > 0" class="page-manage" :class="{'show-tabbar': showMobileTabbar}">
<div class="manage-box-menu" :class="{'show768-menu': show768Menu}">
<Dropdown
class="page-manage-menu-dropdown"
class="page-manage-menu-dropdown main-menu"
trigger="click"
@on-click="settingRoute"
@on-visible-change="menuVisibleChange">

2
resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
View File

@ -46,7 +46,7 @@
<label>{{ $L('分钟') }}</label>
</div>
</FormItem>
<div class="form-tip">{{$L('签到提醒对象：在职且3天内有签到过的成员')}}</div>
<div class="form-tip">{{$L('签到提醒对象：3天内有签到的成员（法定工作日）')}}</div>
</Form>
</FormItem>
<FormItem :label="$L('允许修改')" prop="edit">

3
resources/assets/js/store/actions.js vendored
View File

@ -35,6 +35,7 @@ export default {
state.dialogInputCache = await $A.IDBArray("dialogInputCache")
state.fileLists = await $A.IDBArray("fileLists")
state.userInfo = await $A.IDBJson("userInfo")
state.dialogUpdatedAt = await $A.IDBString("dialogUpdatedAt")
state.dialogDeletedAt = await $A.IDBString("dialogDeletedAt")
state.projectDeletedAt = await $A.IDBString("projectDeletedAt")
@ -2169,7 +2170,7 @@ export default {
state.dialogDeletedAt = data.deleted_at
data.deleted_data.some(id => dispatch("forgetDialog", id))
});
state.dialogUpdatedAt = $A.formatDate()
$A.IDBSet("dialogUpdatedAt", state.dialogUpdatedAt = $A.formatDate()).then(_ => {})
}
//
if (data.next_page_url && data.current_page < 5) {

4
resources/assets/sass/pages/page-manage.scss vendored
View File

@ -259,7 +259,9 @@
.page-manage-menu-dropdown {
flex-shrink: 0;
width: 86%;
&.main-menu {
width: 86%;
}
.ivu-select-dropdown {
padding: 7px 0;
.ivu-dropdown-item {