github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-14 12:42:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-09-19 13:50:51 +08:00
parent 45c20dbed9
commit 6e6397fc91
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -59,7 +59,7 @@
"stylus-loader": "^7.1.0", "stylus-loader": "^7.1.0",
"tinymce": "^5.10.3", "tinymce": "^5.10.3",
"tui-calendar-hi": "^1.15.1-5", "tui-calendar-hi": "^1.15.1-5",
"view-design-hi": "^4.7.0-55", "view-design-hi": "^4.7.0-56",
"vite": "^2.9.15", "vite": "^2.9.15",
"vite-plugin-file-copy": "^1.0.0", "vite-plugin-file-copy": "^1.0.0",
"vite-plugin-require": "^1.1.10", "vite-plugin-require": "^1.1.10",
@ -72,7 +72,7 @@
"vue-resize-observer": "^2.0.16", "vue-resize-observer": "^2.0.16",
"vue-router": "^3.6.5", "vue-router": "^3.6.5",
"vue-template-compiler": "~2.6.14", "vue-template-compiler": "~2.6.14",
"vue-virtual-scroll-list-hi": "^2.3.5-10", "vue-virtual-scroll-list-hi": "^2.3.5-12",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },

4
resources/assets/js/App.vue
View File

@ -49,7 +49,7 @@ export default {
return { return {
routePath: null, routePath: null,
appInter: null, appInter: null,
countDown: Math.min(30, 60 - $A.Date().getSeconds()), countDown: Math.min(30, 60 - $A.Date(true).getSeconds()),
} }
}, },
@ -167,7 +167,7 @@ export default {
// //
this.countDown-- this.countDown--
if (this.countDown <= 0) { if (this.countDown <= 0) {
this.countDown = Math.min(30, 60 - $A.Date().getSeconds()) this.countDown = Math.min(30, 60 - $A.Date(true).getSeconds())
this.$store.dispatch("todayAndOverdue") this.$store.dispatch("todayAndOverdue")
} }
}, },

6
resources/assets/js/functions/common.js vendored
View File

@ -289,16 +289,16 @@ const localforage = require("localforage");
/** /**
* 返回 时间对象|时间戳 * 返回 时间对象|时间戳
* @param v 支持时间戳|时间格式字符串|时间对象|空 * @param v 支持时间戳|时间格式字符串|时间对象|boolean(当前时间)
* @param timestamp 是否返回时间戳 * @param timestamp 是否返回时间戳
* @returns {Date|number} * @returns {Date|number}
* @constructor * @constructor
*/ */
Date(v = undefined, timestamp = false) { Date(v, timestamp = false) {
if (typeof v === "string" && this.strExists(v, "-")) { if (typeof v === "string" && this.strExists(v, "-")) {
v = v.replace(/-/g, '/'); v = v.replace(/-/g, '/');
} }
const d = v === undefined || v === null ? new Date() : new Date(v); const d = typeof v === "boolean" ? new Date() : new Date(v);
if (timestamp === true) { if (timestamp === true) {
return Math.round(d.getTime() / 1000) return Math.round(d.getTime() / 1000)
} }