From 4cfcd70a3517cb083ddacdd7af5fc30868d66085 Mon Sep 17 00:00:00 2001
From: muzi <1099438829@qq.com>
Date: Wed, 14 Aug 2019 23:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=A9=E6=B0=94=E5=92=8C?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E6=97=A5=E6=9C=9F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/index.css |  6 +++---
 js/mac.js     | 32 +++++++++++++-------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/css/index.css b/css/index.css
index e8a7108..b678978 100644
--- a/css/index.css
+++ b/css/index.css
@@ -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;
 }
diff --git a/js/mac.js b/js/mac.js
index 503589d..d086bef 100644
--- a/js/mac.js
+++ b/js/mac.js
@@ -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');
     	}