From c8adbc219c47d0d2809126f054c07038ec470ddc Mon Sep 17 00:00:00 2001 From: muzi_ys <1099438829@qq.com> Date: Tue, 8 Jan 2019 00:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo.html | 26 +------------------ index.html | 25 +------------------ js/mac.js | 73 ++++++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 59 insertions(+), 65 deletions(-) diff --git a/demo.html b/demo.html index f2fca1c..e92a1c7 100644 --- a/demo.html +++ b/demo.html @@ -112,7 +112,6 @@
磁贴代码生成器
菜单代码生成器
关于
-
关闭
@@ -121,30 +120,7 @@
今天
通知
-
-
-
1月6日 星期日
-
戊戌年十二月初一
-
-
-
- - 天气 -
-
-
-
- 下午3:54 - 广州市 -
-
- 多云 -
-
17
-
-
-
-
+
diff --git a/index.html b/index.html index 480d42c..5428e27 100644 --- a/index.html +++ b/index.html @@ -75,30 +75,7 @@
今天
通知
-
-
-
1月6日 星期日
-
戊戌年十二月初一
-
-
-
- - 天气 -
-
-
-
- 下午3:54 - 广州市 -
-
- 多云 -
-
17
-
-
-
-
+
diff --git a/js/mac.js b/js/mac.js index ff6cfc2..00a721d 100644 --- a/js/mac.js +++ b/js/mac.js @@ -288,6 +288,7 @@ window.Win10 = { Win10.menuToggle(); }); $("#win10_btn_command").click(function () { + Win10.renderCommand(); Win10.menuClose(); Win10.commandCenterToggle(); }); @@ -302,26 +303,20 @@ window.Win10 = { msg.remove() }, 500) }); - //消息界面切换 - $('#win10_command_center').on('click',".command-header .tab-today", function () { + $('#win10_command_center').on('click',".command-header div", function () { if (!$(this).hasClass('active')) { - $('#win10_command_center .command-body.msgs').hide(); - $('#win10_command_center .command-body.today').show(); - $(this).addClass('active').siblings('div').removeClass('active'); + if ($(this).hasClass('tab-today')) { + console.log(1); + $(this).parent().siblings('.msgs').hide().siblings('.today').show(); + $(this).addClass('active').siblings('div').removeClass('active'); + }else{ + console.log(2); + $(this).parent().siblings('.today').hide().siblings('.msgs').show(); + $(this).addClass('active').siblings('div').removeClass('active'); + } } }); - - //消息界面切换 - $('#win10_command_center').on('click',".command-header .tab-msg", function () { - if (!$(this).hasClass('active')) { - $('#win10_command_center .command-body.today').hide(); - $('#win10_command_center .command-body.msgs').show(); - $(this).addClass('active').siblings('div').removeClass('active'); - } - }); - - $('#win10_btn_command_center_clean_all').click(function () { var msgs=$('#win10_command_center .msg'); msgs.addClass('animated slideOutRight'); @@ -442,6 +437,8 @@ window.Win10 = { else {hours='深夜'+(hour-12)} $("#win10_btn_time").html(week+hours+':'+mins); },1000); + + //离开前警告 document.body.onbeforeunload = function(event){ var rel = Win10.lang( '系统可能不会保存您所做的更改','The system may not save the changes you have made.'); @@ -576,12 +573,56 @@ window.Win10 = { this._bgs=bgs; this._checkBgUrls(); }, + setBgUrl:function (bgs) { + this._bgs=bgs; + this._checkBgUrls(); + }, menuClose: function () { $("#win10-menu").removeClass('opened'); $("#win10-menu").addClass('hidden'); this._showShortcut(); $(".win10-open-iframe").removeClass('hide'); }, + //消息中心渲染 + renderCommand:function (today=null) { + var active = $("#win10_command_center .command-body.today").hasClass('active'); + if (!active) { + if (!today) { + var myDate = new Date(); + var week = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六")[myDate.getDay()]; + var hour=myDate.getHours(); + var mins=myDate.getMinutes();if (mins<10){mins='0'+mins} + if(hour < 6){hours='凌晨'+hour;} + else if (hour < 9){hours='早上'+hour;} + else if (hour < 12){hours='上午'+hour;} + else if (hour < 14){hours='中午'+(hour-12);} + else if (hour < 17){hours='下午'+(hour-12);} + else if (hour < 19){hours='傍晚'+(hour-12);} + else if (hour < 22){hours='晚上'+(hour-12);} + else {hours='深夜'+(hour-12)} + + today = '
' + + '
'+(myDate.getMonth()+1)+'月'+myDate.getDay()+'日 '+week+'
' + + '
'+''+'
' + + '
' + + '
' + + '
' + + '' + + '天气'+ + '
' + + '
' + + '
' + + '
' + + ''+hours+':'+mins+''+ + '广州市' + + '
' + + '
多云
' + + '
17
' + + '
'; + } + $("#win10_command_center .command-body.today").html(today).addClass('active'); + } + }, menuOpen: function () { $("#win10-menu").addClass('opened'); $("#win10-menu").removeClass('hidden');