diff --git a/js/okadmin.js b/js/okadmin.js
index 97463bc..491311f 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -1,11 +1,12 @@
/^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问');
var objOkTab = "";
-layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu"], function () {
+layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu", "okHoliday"], function () {
var okUtils = layui.okUtils;
var $ = layui.jquery;
var layer = layui.layer;
var okLayer = layui.okLayer;
+ var okHoliday = layui.okHoliday;
var okTab = layui.okTab({
// 菜单请求路径
@@ -234,7 +235,7 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu"],
function noticeFun() {
var srcWidth = okUtils.getBodyWidth();
layer.open({
- type: 0, title: "系统公告", btn: "我知道啦", btnAlign: 'c', content: getContent(),
+ type: 0, title: "系统公告", btn: "我知道啦", btnAlign: 'c', content: okHoliday.getContent(),
yes: function (index) {
if (srcWidth > 800) {
layer.tips('公告跑到这里去啦', '#notice', {
@@ -256,58 +257,6 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu"],
});
}
- function getContent() {
- let dateStr = okUtils.dateFormat(new Date(), "yyyy-MM-dd");
- let content = "";
- if (dateStr == "2020-01-01") {
- content = "元旦，一年之始也。元，初，始也；旦，太阳微露地平一线，是为一日之始。值此新年之际，祝诸君快乐安康，如意吉祥！
" +
- "ok-admin v2.0 祝您元旦节快乐！(^し^)";
- } else if (dateStr == "2020-01-24" || dateStr == "2020-01-25" || dateStr == "2020-01-26" || dateStr == "2020-01-27" || dateStr == "2020-01-28" || dateStr == "2020-01-29" || dateStr == "2020-01-30") {
- content = "鞭炮声声迎新年，妙联横生贴门前。
" +
- "笑声处处传入耳，美味佳肴上餐桌。
" +
- "谈天论地成一片，灯光通明照残夜。
" +
- "稚童新衣相夸耀，旧去新来气象清。
" +
- "ok-admin v2.0 祝您春节快乐！(^し^)";
- } else if (dateStr == "2020-04-04" || dateStr == "2020-04-05" || dateStr == "2020-04-06") {
- content = "清明时节雨纷纷，路上行人欲断魂。
" +
- "借问酒家何处有，牧童遥指杏花村。
" +
- "ok-admin v2.0 祝您清明节快乐！(^し^)";
- } else if (dateStr == "2020-05-01" || dateStr == "2020-05-02" || dateStr == "2020-05-03" || dateStr == "2020-05-04" || dateStr == "2020-05-05") {
- content = "锄禾日当午，汗滴禾下土。
" +
- "谁知盘中餐，粒粒皆辛苦。
" +
- "ok-admin v2.0 祝您劳动节快乐！(^し^)";
- } else if (dateStr == "2020-06-25" || dateStr == "2020-06-26" || dateStr == "2020-06-27") {
- content = "少年佳节倍多情，老去谁知感慨生。
" +
- "不效艾符趋习俗，但祈蒲酒话升平。
" +
- "鬓丝日日添白头，榴锦年年照眼明。
" +
- "千载贤愚同瞬息，几人湮没几垂名。
" +
- "ok-admin v2.0 祝您端午节安康！(^し^)";
- } else if (dateStr == "2020-10-01") {
- content = "中庭地白树栖鸦，冷露无声湿桂花。
" +
- "今夜月明人尽望，不知秋思落谁家。
" +
- "ok-admin v2.0 祝您中秋节快乐！(^し^)";
- } else if (dateStr == "2020-09-18") {
- content = "铭记九一八，让历史的风云鞭策我们奋进的脚步，让先烈的忠魂聆听我们自强的怒吼;
" +
- "不忘九一八，让未来的发展见证华夏的崛起，让世界的目光聚焦中国的奇迹。
" +
- "勿忘国耻，爱我中华，吾辈当自强！";
- } else if (dateStr == "2020-10-01" || dateStr == "2020-10-02" || dateStr == "2020-10-03" || dateStr == "2020-10-04" || dateStr == "2020-10-05" || dateStr == "2020-10-06" || dateStr == "2020-10-07") {
- content = "龙跃甲子，鸽翱晴空，凤舞九天。
" +
- "昔关河黍离，列强逐鹿；神州放眼，一鹤冲天。
" +
- "重振社稷，举中流誓，今看东方盛世还。
" +
- "黄河血，慨仁人志士，魂祭新篇。
" +
- "华夏意气峥嵘，傲五湖四海锦绣满。
" +
- "壮三山五岳，叠古风姿；九经三史，彰现华韵。
" +
- "豪客泼墨，贤士铺卷，放歌九州富丽妍。
" +
- "泰山脊，领风骚环宇，有谁堪比？
" +
- "ok-admin v2.0 祝您国庆节快乐！
祝福伟大的祖国，越来越强大。
祝福强大的祖国，一直屹立于世界东方！(^し^)";
- } else {
- content = "ok-admin v2.0上线啦(^し^)
" +
- "在此郑重承诺该模板永久免费为大家提供
" +
- "若有更好的建议欢迎加入QQ群一起聊";
- }
- return content;
- }
-
/**
* 捐赠作者
*/
diff --git a/lib/layui/lay/okmodules/okHoliday.js b/lib/layui/lay/okmodules/okHoliday.js
new file mode 100644
index 0000000..753fe1a
--- /dev/null
+++ b/lib/layui/lay/okmodules/okHoliday.js
@@ -0,0 +1,60 @@
+"use strict";
+layui.define(["okUtils"], function (exprots) {
+ let okUtils = layui.okUtils;
+
+ var okHoliday = {
+ getContent: function() {
+ let dateStr = okUtils.dateFormat(new Date(), "yyyy-MM-dd");
+ let content = "";
+ if (dateStr == "2020-01-01") {
+ content = "元旦，一年之始也。元，初，始也；旦，太阳微露地平一线，是为一日之始。值此新年之际，祝诸君快乐安康，如意吉祥！
" +
+ "ok-admin v2.0 祝您元旦节快乐！(^し^)";
+ } else if (dateStr == "2020-01-24" || dateStr == "2020-01-25" || dateStr == "2020-01-26" || dateStr == "2020-01-27" || dateStr == "2020-01-28" || dateStr == "2020-01-29" || dateStr == "2020-01-30") {
+ content = "鞭炮声声迎新年，妙联横生贴门前。
" +
+ "笑声处处传入耳，美味佳肴上餐桌。
" +
+ "谈天论地成一片，灯光通明照残夜。
" +
+ "稚童新衣相夸耀，旧去新来气象清。
" +
+ "ok-admin v2.0 祝您春节快乐！(^し^)";
+ } else if (dateStr == "2020-04-04" || dateStr == "2020-04-05" || dateStr == "2020-04-06") {
+ content = "清明时节雨纷纷，路上行人欲断魂。
" +
+ "借问酒家何处有，牧童遥指杏花村。
" +
+ "ok-admin v2.0 祝您清明节快乐！(^し^)";
+ } else if (dateStr == "2020-05-01" || dateStr == "2020-05-02" || dateStr == "2020-05-03" || dateStr == "2020-05-04" || dateStr == "2020-05-05") {
+ content = "锄禾日当午，汗滴禾下土。
" +
+ "谁知盘中餐，粒粒皆辛苦。
" +
+ "ok-admin v2.0 祝您劳动节快乐！(^し^)";
+ } else if (dateStr == "2020-06-25" || dateStr == "2020-06-26" || dateStr == "2020-06-27") {
+ content = "少年佳节倍多情，老去谁知感慨生。
" +
+ "不效艾符趋习俗，但祈蒲酒话升平。
" +
+ "鬓丝日日添白头，榴锦年年照眼明。
" +
+ "千载贤愚同瞬息，几人湮没几垂名。
" +
+ "ok-admin v2.0 祝您端午节安康！(^し^)";
+ } else if (dateStr == "2020-10-01") {
+ content = "中庭地白树栖鸦，冷露无声湿桂花。
" +
+ "今夜月明人尽望，不知秋思落谁家。
" +
+ "ok-admin v2.0 祝您中秋节快乐！(^し^)";
+ } else if (dateStr == "2020-09-18") {
+ content = "铭记九一八，让历史的风云鞭策我们奋进的脚步，让先烈的忠魂聆听我们自强的怒吼;
" +
+ "不忘九一八，让未来的发展见证华夏的崛起，让世界的目光聚焦中国的奇迹。
" +
+ "勿忘国耻，爱我中华，吾辈当自强！";
+ } else if (dateStr == "2020-10-01" || dateStr == "2020-10-02" || dateStr == "2020-10-03" || dateStr == "2020-10-04" || dateStr == "2020-10-05" || dateStr == "2020-10-06" || dateStr == "2020-10-07") {
+ content = "龙跃甲子，鸽翱晴空，凤舞九天。
" +
+ "昔关河黍离，列强逐鹿；神州放眼，一鹤冲天。
" +
+ "重振社稷，举中流誓，今看东方盛世还。
" +
+ "黄河血，慨仁人志士，魂祭新篇。
" +
+ "华夏意气峥嵘，傲五湖四海锦绣满。
" +
+ "壮三山五岳，叠古风姿；九经三史，彰现华韵。
" +
+ "豪客泼墨，贤士铺卷，放歌九州富丽妍。
" +
+ "泰山脊，领风骚环宇，有谁堪比？
" +
+ "ok-admin v2.0 祝您国庆节快乐！
祝福伟大的祖国，越来越强大。
祝福强大的祖国，一直屹立于世界东方！(^し^)";
+ } else {
+ content = "ok-admin v2.0上线啦(^し^)
" +
+ "在此郑重承诺该模板永久免费为大家提供
" +
+ "若有更好的建议欢迎加入QQ群一起聊";
+ }
+ return content;
+ }
+ }
+
+ exprots("okHoliday", okHoliday);
+});
\ No newline at end of file
diff --git a/lib/layui/layui.js b/lib/layui/layui.js
index 4968e72..d7286c5 100644
--- a/lib/layui/layui.js
+++ b/lib/layui/layui.js
@@ -41,7 +41,8 @@ if (!Object.assign) {
"okToastr": "okmodules/okToastr",
"okBarcode": "okmodules/okBarcode",
"okNprogress": "okmodules/okNprogress",
- "okSweetAlert2": "okmodules/okSweetAlert2"
+ "okSweetAlert2": "okmodules/okSweetAlert2",
+ "okHoliday": "okmodules/okHoliday",
};
var modulePath = Object.assign({
layer: "modules/layer",