muzi
/
macUI
mirror of https://github.com/1099438829/macUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正天气和通知的日期错误

This commit is contained in:
muzi 2019-08-14 23:16:16 +08:00
parent e9f7abe47c
commit 4cfcd70a35
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/index.css
View File

@ -1009,7 +1009,7 @@ body {
#footer .dock .dock-tips{
color:#333;
font-size:0.4em;
font-size:0.5em;
font-weight:700;
border-radius: 5px;
background: rgba(255,255,255,0.5);
@ -1017,8 +1017,8 @@ body {
line-height: 20px;
display: none;
padding:0px 5px;
margin-top: -30px;
margin-bottom: 10px;
margin-top: -35px;
margin-bottom: 15px;
flex-direction: column;
align-items: center;
}

32
js/mac.js
View File

@ -721,7 +721,7 @@ window.Win10 = {
//小时
viewdate.hour = get_hour(date);
//日期
viewdate.day = date.getDay();
viewdate.day = date.getDate();
//星期
viewdate.week = get_week(date);
//月
@ -752,24 +752,18 @@ window.Win10 = {
if (!active) {
if (!today) {
var lunarDate = Win10.getLunarObj();
today = '<div class="command-body-calendar">' +
'<div class="command-body-calendar-date normal-date">'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'</div>' +
'<div class="command-body-calendar-date lunar-date">'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'</div>' +
'</div>' +
'<div class="notice">' +
'<div class="notice-header">' +
'<span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>' +
'<span class="notice-header-title">天气</span>'+
'</div>' +
'<div class="notice-body">' +
'<div class="weather-item">' +
'<div class="weather-city">' +
'<span class="weather-city-time">'+lunarDate.hour+':'+lunarDate.minute+'</span>'+
'<span class="weather-city-text">广州市</span>' +
'</div>' +
'<div class="weather-type"><img src="http://yun.rili.cn/wnl/img/cloud.png" alt="多云" /></div>' +
'<div class="weather-temperature">17</div>' +
'</div></div></div>';
var today = '<div class="command-body-calendar">' +
'<div class="command-body-calendar-date normal-date">'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'</div>' +
'<div class="command-body-calendar-date lunar-date">'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'</div>' +
'</div>';
today += '<div class="notice">' +
'<div class="notice-header">' +
'<span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>' +
'<span class="notice-header-title">天气</span>'+
'</div>' +
'<div class="notice-body">' +
'<iframe src="http://www.seniverse.com/weather/weather.aspx?uid=U43DF172E7&cid=CHBJ000000&l=&p=SMART&a=1&u=C&s=13&m=2&x=1&d=1&fc=&bgc=2E93D9&bc=&ti=0&in=0&li=" frameborder="0" scrolling="no" width="97%" height="150" style="padding:5px;" allowTransparency="true"></iframe>'+
'</div></div>';
}
$("#win10_command_center .command-body.today").html(today).addClass('active');
}