1、修复桌面舞台

# Conflicts:
#	app/calendar/js/calender.js
#	app/finder/index.css
#	app/finder/index.html
#	component/layer/theme/default/layer.css
#	css/index.css
#	css/index.min.css
#	demo.html
#	img/icon/icloud.png
#	index.html
#	js/index.js
#	js/index.min.js
#	plugins/theme_switcher/theme_switcher.js

app/finder/js/main.js

@@ -0,0 +1,215 @@
+function finder(name,path,appObject) {
+	
+	// ajax请求sidebar数据
+	$.ajax({
+		url:'json/sidebar.json',
+		type:'GET', // GET
+		async:true, // 是否异步
+		dataType:'json',
+		success:function(data,textStatus,jqXHR){
+			// 变量赋值
+			favoritesTitle 	= data.data.favoritesTitle;
+			favorites 		= data.data.favorites;
+			devicesTitle	= data.data.devicesTitle;
+			devices			= data.data.devices;
+			delimiter 		= "<div style='height:10px;clear:both'></div>";
+
+			favoritesHeaderHtml = "<ul><li class='title'>"+favoritesTitle+"</li>";
+			favoritesBodyHtml	= '';
+			$.each(favorites,function(key, value) {
+				if(!name){
+					//如果设置默认打开app,则以第一个为主
+					name = value.name;
+				}
+				if(!path){
+					//如果设置默认打开位置,则以第一个为主
+					path = value.path;
+				}
+				favoritesBodyHtml = favoritesBodyHtml + 
+				"<li>\
+					<a onclick=\"finderOpenApp('"+value.name+"','"+value.path+"')\" class='"+value.active+"' href='#'>\
+						<span class='"+value.icon+"'></span>\
+						<span class='name'>"+value.title+"</span>\
+					</a>\
+				</li>";
+			});
+            favoritesFooterHtml = "</ul>";
+			favoritesHtml = favoritesHeaderHtml+favoritesBodyHtml+favoritesFooterHtml;
+
+			devicesHeaderHtml = "<ul><li class='title'>"+devicesTitle+"</li>";
+			devicesBodyHtml	= '';
+			$.each(devices,function(key, value) {
+				devicesBodyHtml = devicesBodyHtml + 
+				"<li>\
+					<a onclick=\"finderOpenApp('"+value.name+"','"+value.path+"')\" class='"+value.active+"' href='#'>\
+						<span class='"+value.icon+"'></span>\
+						<span class='name'>"+value.title+"</span>\
+					</a>\
+				</li>";
+			});
+            devicesFooterHtml = "</ul>";
+			devicesHtml = devicesHeaderHtml+devicesBodyHtml+devicesFooterHtml;
+
+			$(".finder-wrapper .sidebar").html(favoritesHtml+delimiter+devicesHtml);
+
+			if(path) {
+				$('.finder-wrapper .pathHistory').val(path);
+				$('.finder-wrapper .content').attr(path);
+			} else {
+				$('.finder-wrapper .content').attr('current-path','public/user/'+'administrator'+'/home/'); //administrator为用户名
+			}
+			finderOpenApp(name,path,appObject);
+
+		},
+		error:function(xhr,textStatus){
+			console.log('错误')
+		}
+	});
+	// scroll
+	$(".sidebar").niceScroll({cursorcolor:"#bebebe"});
+}
+
+
+
+/**
+ * 打开app，finder专用
+ * @author tangtanglove
+ */
+function finderOpenApp(name,path,appObject) {
+	// 保存历史记录
+	pathHistory = $('.finder-wrapper .pathHistory').val();
+	pathArray = new Array(); //定义一数组
+	pathArray = pathHistory.split("|"); //字符分割 
+	key = $.inArray(path, pathArray);
+
+	if(key ==-1) {
+		if(path) {
+			lastPath = pathArray[pathArray.length-1];
+			if(lastPath != 'root') {
+				if(path.indexOf(lastPath) > -1) {
+					pathHistory = pathHistory+'|'+path;
+					$('.finder-wrapper .pathHistory').val(pathHistory);
+					$('.finder-wrapper .currentPath').val(path);
+					$('.finder-wrapper .content').attr('current-path',path);
+				} else {
+					// 将历史路径的最后一个路径替换新的路径
+					pathHistory = pathHistory.replace(lastPath,path);
+					// pathHistory = pathHistory+'|'+path;
+					$('.finder-wrapper .pathHistory').val(pathHistory);
+					$('.finder-wrapper .currentPath').val(path);
+					$('.finder-wrapper .content').attr('current-path',path);
+				}
+			} else {
+				pathHistory = pathHistory+'|'+path;
+				$('.finder-wrapper .pathHistory').val(pathHistory);
+				$('.finder-wrapper .currentPath').val(path);
+				$('.finder-wrapper .content').attr('current-path',path);
+			}
+		}
+	} else {
+		$('.finder-wrapper .currentPath').val(path);
+		$('.finder-wrapper .content').attr('current-path',path);
+	}
+
+
+	// ajax请求后台数据
+	$.ajax({
+		url:'json/openPath.json',
+		type:'GET', // GET
+		async:true, // 是否异步
+		data:{
+			path:path
+		},
+		dataType:'json',
+		success:function(data,textStatus,jqXHR){
+			if (data.status == 'success') {
+				html = '';
+				if(data.data) {
+					$.each(data.data,function(key, value) {
+						if(typeof(value.path)=="undefined") {
+							value.path = '';
+						}
+						html = html + "<div class='app-box middle "+value.context+"' title='"+value.title+"' app-name='"+value.name+"' app-path='"+value.path+"' app-width="+value.width+" app-height="+value.height+">\
+						<span class='app-icon'><img class='img-rounded' src='"+value.icon+"' alt='"+value.title+"' app-path='"+value.path+"' app-width="+value.width+" app-height="+value.height+"></span>\
+						<span class='app-name'>"+value.title+"</span>\
+						<div class='clear'></div>\
+						</div>";
+					});
+				}
+				$('.finder-wrapper .app-list').html(html);
+
+			} else {
+				layer.msg(data.msg,{zIndex: layer.zIndex,success: function(layero){layer.setTop(layero);}});
+			}
+		},
+		error:function(xhr,textStatus){
+			console.log('错误')
+		}
+	});
+
+}
+
+/**
+ * 下一级
+ * @author tangtanglove
+ */
+function next () {
+	pathHistory = $('.finder-wrapper .pathHistory').val();
+	currentPath = $('.finder-wrapper .currentPath').val();
+	pathArray = new Array(); //定义一数组
+	pathArray = pathHistory.split("|"); //字符分割 
+	key = $.inArray(currentPath, pathArray);
+	path = pathArray[key+1];
+	if(path) {
+		finderOpenApp('finder',path);
+		$('.finder-wrapper .currentPath').val(path);
+		$('.finder-wrapper .content').attr('current-path',path);
+	}
+}
+
+/**
+ * 上一级
+ * @author tangtanglove
+ */
+function prev () {
+	pathHistory = $('.finder-wrapper .pathHistory').val();
+	currentPath = $('.finder-wrapper .currentPath').val();
+	pathArray = new Array(); //定义一数组
+	pathArray = pathHistory.split("|"); //字符分割 
+	key = $.inArray(currentPath, pathArray);
+	path = pathArray[key-1];
+	if(path) {
+		if(path=='root') {
+			finderOpenApp('finder','');
+		} else {
+			finderOpenApp('finder',path);
+		}
+		$('.finder-wrapper .currentPath').val(path);
+		$('.finder-wrapper .content').attr('current-path',path);
+	}
+}
+
+// 系统点击事件
+$(document).on("dblclick",'.finder-wrapper .app-box',function(event){
+	finderOpenApp($(this).attr('app-name'),$(this).attr('app-path'),$(this));
+});
+$(document).on("mouseover",'.finder-wrapper .app-box',function(event){
+	$(this).addClass('hover');
+})
+$(document).on("mouseout",'.finder-wrapper .app-box',function(event){
+	$(this).removeClass('hover');
+});
+$(document).on("mousedown",'.finder-wrapper .app-box',function(event){
+	$(".finder-wrapper .app-box").removeClass('active');
+	$(this).addClass('active');
+	return false;
+});
+$(document).on("mousedown",'.finder-wrapper .content',function(event){
+	$(".finder-wrapper .app-box").removeClass('active');
+})
+$(document).on("mousedown",'.finder-wrapper .sidebar ul li a',function(event){
+	$(".finder-wrapper .sidebar ul li a").removeClass('on');
+	$(this).addClass('on');
+})
+
+finder();//系统调用开始

app/msg_center_weather/index.html

@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1,minimum-scale=1,user-scalable=no"
+          name="viewport">
+    <title>北京天气预报 - TianqiAPI.com</title>
+    <style type="text/css">
+        * {
+            margin: 0;
+            padding: 0
+        }
+
+        body {
+            text-align: left;
+            font-size: 14px;
+            color: #333;
+            font-family: Verdana, "微软雅黑", "宋体";
+        }
+        img{vertical-align: middle;}
+        A IMG {
+            border: 0
+        }
+
+        A:link {
+            COLOR: #000;
+            TEXT-DECORATION: none
+        }
+
+        A:visited {
+            COLOR: #333;
+            TEXT-DECORATION: none
+        }
+
+        A:hover {
+            color: #FF5200;
+            TEXT-DECORATION: none
+        }
+
+        A:active {
+            color: #FF5200;
+            TEXT-DECORATION: none
+        }
+
+        p {
+            padding: 0;
+            margin: 0
+        }
+
+        dd {
+            white-space: nowrap
+        }
+
+        LI, UL, h2, h3 {
+            margin: 0;
+            padding: 0;
+            LIST-STYLE-TYPE: none
+        }
+
+        button, input, select, textarea {
+            outline: 0
+        }
+
+        em {
+            font-family: "Hiragino Sans GB", "Microsoft YaHei", "\5FAE\8F6F\96C5\9ED1", arial, Tahoma, SimSun, sans-serif !important;
+            font-style: normal
+        }
+
+        .zl {
+            margin: 0;
+            padding: 1px 2px;
+            display: inline-block;
+            border-radius: 3px;
+            line-height: 16px;
+            color: #fff;
+        }
+
+        .liang {
+            background-color: #eec50b;
+        }
+        @media screen and (min-width: 750px) {
+            body {
+                width: 450px;margin: 0 auto;
+            }
+        }
+    </style>
+<body>
+<div style="padding:10px;border-bottom: 10px solid transparent;">
+    <table>
+        <tr>
+            <td style="width: 50px;padding-right: 10px;"><img width="100%"
+                                                              src="static/picture/yun.png"/>
+            </td>
+            <td>
+                <div style="font-size: 16px; font-weight: bold;">
+                    <em>北京</em>&nbsp;晴转多云&nbsp;<em
+                            class="wTemp">23℃/33℃</em>
+                </div>
+                <div style="font-size: 14px;">
+                    南风<3级                </div>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<div style="padding:10px 0; font-size: 18px; font-weight: bold; border-bottom: 1px solid #f1f1f1;">&nbsp;北京一周天气预报</div>
+<div style="font-size: 14px;border-bottom: 10px solid transparent;">
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
+        <tr>
+            <td height="35" style="padding-left: 10px;">今天</td>
+            <td align="left" width=""><img width="25"
+                     src="static/picture/yun.png"/> 晴转多云</td>
+            <td align="center">23℃/33℃</td>
+        </tr>
+        <tr style="background: #f9f9f9">
+            <td height="35" style="padding-left: 10px;">08日（星期日）</td>
+            <td align="left" ><img width="25"
+                                                   src="static/picture/lei.png"/> 多云转雷阵雨</td>
+            <td align="center">23℃/32℃</td>
+        </tr>
+        <tr>
+            <td height="35" style="padding-left: 10px;">09日（星期一）</td>
+            <td align="left" ><img width="25"
+                                                   src="static/picture/lei.png"/> 雷阵雨转晴</td>
+            <td align="center">23℃/30℃</td>
+        </tr>
+        <tr style="background: #f9f9f9">
+            <td height="35" style="padding-left: 10px;">10日（星期二）</td>
+            <td align="left"><img width="25"
+                                                   src="static/picture/yun.png"/> 多云转阴</td>
+            <td align="center">22℃/32℃</td>
+        </tr>
+        <tr>
+            <td  height="35" style="padding-left: 10px;">11日（星期三）</td>
+            <td align="left" ><img width="25"
+                                                   src="static/picture/yun.png"/> 多云</td>
+            <td align="center">22℃/30℃</td>
+        </tr>
+        <tr style="background: #f9f9f9">
+            <td  height="35" style="padding-left: 10px;">12日（星期四）</td>
+            <td align="left" ><img width="25"
+                                                   src="static/picture/yun.png"/> 多云转阴</td>
+            <td align="center">22℃/30℃</td>
+        </tr>
+        <tr>
+            <td  height="35" style="padding-left: 10px;">13日（星期五）</td>
+            <td align="left"><img width="25"
+                                                   src="static/picture/yun.png"/> 多云</td>
+            <td align="center">21℃/30℃</td>
+        </tr>
+    </table>
+</div>
+<div style="padding:10px 0; font-size: 18px; font-weight: bold; border-bottom: 1px solid #f1f1f1;">&nbsp;生活提示</div>
+<div style="padding: 10px; font-size: 14px;">
+    空气好，可以外出活动，除极少数对污染物特别敏感的人群以外，对公众没有危害！</div>
+</body>
+</html>

css/index.css

@@ -694,24 +694,24 @@ body {
     cursor: pointer;
 }
 
-.mac-open-iframe {
+/* 窗口打开主题 */
+body .mac-open-iframe {
     /*繁华年间许你一世安宁提供*/
     background-color: transparent;
-    border: #f0f6f6 solid 1px;
+    -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.4);
-    -webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
+    -moz-box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.4);
-    -moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
+    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.4);
-    box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
     border-radius: 6px !important;
     -webkit-border-radius: 6px !important;
     -moz-border-radius: 6px !important;
 }
 
-.mac-open-iframe .layui-layer-content {
+body .mac-open-iframe .layui-layer-content {
     background-color: white;
     max-height: calc(100% - 24px);
 }
 
-.mac-open-iframe .layui-layer-title {
+body .mac-open-iframe .layui-layer-title {
     box-sizing: border-box;
     background: rgba(250, 250, 250, 0.9);
     padding-left: 120px;
@@ -720,197 +720,44 @@ body {
     text-align: center;
 }
 
-.mac-open-iframe.hide {
+body .mac-open-iframe.hide {
     display: none;
 }
 
-.mac-btn_refresh {
+body .mac-btn_refresh {
     float: right;
 }
 
-#mac .img-loader {
-    display: none;
-}
-
-.mac-open-iframe .layui-layer-min cite {
-    display: none;
-}
-
-.mac-open-iframe .layui-layer-max:hover {
-    background-image: none
-}
-
-.mac-open-iframe .layui-layer-max, .layui-layer-maxmin {
-    background: none
-}
-
-.mac-open-iframe .layui-layer-setwin a::before {
-    display: inline-block;
-    width: 0.9rem;
-    height: 0.9rem;
-    border-radius: 50%;
-}
-
-.mac-open-iframe .layui-layer-setwin a.layui-layer-close1:hover::before {
-    content: "\f057";
-    color: #FF6057;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-min::before {
-    content: "\f111";
-    color: #28CA40;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-min:hover::before {
-    content: "\f056";
-    color: #28CA40;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-max::before {
-    content: "\f111";
-    color: #FFBD2E;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-max:hover::before {
-    content: "\f055";
-    color: #FFBD2E;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-maxmin.layui-layer-max::before {
-    content: "\f111";
-    color: #FFBD2E;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-maxmin.layui-layer-max:hover::before {
-    content: "\f055";
-    color: #FFBD2E;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .layui-layer-close::before {
-    content: "\f111";
-    color: #FF6057;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-/*
-.mac-open-iframe .layui-layer-setwin .layui-layer-max::before{
-    background-color: #FFBD2E;
-}
-
-.mac-open-iframe .layui-layer-min::before{
-    background-color: #28CA40;
-}
-
-.mac-open-iframe .mac-btn-refresh::before{
-    background-color: #029FFF;
-}
-
-.layui-layer-setwin .layui-layer-close1::hover{
-    content: "xxx";
-    background-color: #fd6458;
-}
-
-*/
-
-.mac-open-iframe .layui-layer-min, .layui-layer-close, .layui-layer-max {
-    text-decoration: none;
-}
-
-.mac-btn-refresh, .mac-btn-change-url, .mac-btn-refresh:hover, .mac-btn-change-url:hover {
-    text-decoration: none;
-}
-
-.mac-open-iframe .mac-btn-refresh::before, .mac-btn-change-url::before {
-    content: "\f111";
-    color: #029FFF;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-.mac-open-iframe .mac-btn-refresh:hover::before, .mac-btn-change-url:hover::before {
-    content: "\f192";
-    color: #029FFF;
-    font: normal normal normal 0.9rem/1 FontAwesome;
-}
-
-/*右键菜单*/
-#mac .mac-context-menu {
-    left: 0;
-    top: 0;
-    position: fixed;
-    width: 150px;
-    height: auto;
-    background-color: rgba(255, 255, 255, 0.45);
-    display: block;
-    border-radius: 5px;
-    z-index: 99999999;
-}
-
-#mac .mac-context-menu ul {
-    margin: 0;
-    padding: 0;
-}
-
-#mac .mac-context-menu ul li {
-    transition: background-color 0.5s;
-    cursor: default;
-    padding: 0 1em;
-    list-style: none;
-    line-height: 25px;
-    height: 25px;
-    margin: 3px 0;
-    font-size: 13px;
-}
-
-#mac .mac-context-menu ul li:hover {
-    background-color: rgba(49, 156, 241, 0.71);
-    cursor: pointer;
-}
-
-#mac .mac-context-menu ul li a {
-    text-decoration: none;
-    display: block;
-    height: 100%;
-    color: #333;
-    outline: none;
-}
-
-#mac .mac-context-menu ul hr {
-    margin: 0;
-    height: 0;
-    border: 0;
-    border-bottom: rgba(121, 121, 121, 0.24) 1px solid;
-    border-top: none
-}
-
-/*块级按钮*/
 .mac-open-iframe .layui-layer-ico {
-    background-image: none;
+    background: url(../img/frame/assets.png) no-repeat;
+    background-size: 144px;
 }
 
 .mac-open-iframe .layui-layer-setwin {
+    width: 10rem; /*需要定义长度避免影响拖动 多预留一个button位置*/
     position: absolute;
     left: 0;
     top: 0;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    text-align: center;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
     font-size: 0;
     height: 30px;
     line-height: 30px;
 }
 
 .mac-open-iframe .layui-layer-setwin a {
-    position: relative;
+    width: 1rem;
-    width: 30px;
+    height: 1rem;
-    height: 30px;
     font-size: 13px;
-    text-align: center;
     overflow: hidden;
-    margin: 0;
+    margin-left: 10px;
 }
 
 .mac-open-iframe .layui-layer-title {
@@ -938,6 +785,129 @@ body {
     top: 5px;
 }
 
+.mac-open-iframe .layui-layer-min cite{display:none}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-min {
+    background: url(../img/frame/assets.png) no-repeat -1px -26px;
+    background-size: 144px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-min:hover {
+    background: url(../img/frame/assets.png) no-repeat -1px -49px;
+    background-size: 144px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin a.layui-layer-close {
+    background-position: -36px -26px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin a.layui-layer-close:hover {
+    background-position: -36px -50px;
+    cursor: pointer;
+}
+
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-max {
+    background-position: -19px -25.5px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-max:hover {
+    background-position: -19px -49px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-maxmin {
+    background-position: -55px -25px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe.layui-layer-setwin .layui-layer-maxmin:hover {
+    background-position: -55px -49px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh {
+    background-position: -83px -25px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh:hover {
+    background-position: -83px -48.5px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe .layui-layer-setwin .layui-layer-change-url {
+    background-position: -55px -25px;
+    cursor: pointer;
+}
+
+body .mac-open-iframe.layui-layer-setwin .layui-layer-change-url:hover {
+    background-position: -83px -49px;
+    cursor: pointer;
+}
+
+.mac-open-iframe .layui-layer-min, .layui-layer-close, .layui-layer-max,.layui-layer-refresh, .layui-layer-change-url {
+    text-decoration: none;
+}
+
+#mac .img-loader {
+    display: none;
+}
+
+/*右键菜单*/
+#mac .mac-context-menu {
+    left: 0;
+    top: 0;
+    position: fixed;
+    width: 150px;
+    height: auto;
+    background-color: rgba(255, 255, 255, 0.45);
+    display: block;
+    border-radius: 5px;
+    z-index: 99999999;
+}
+
+#mac .mac-context-menu ul {
+    margin: 0px;
+    padding: 0px;
+}
+
+#mac .mac-context-menu ul li {
+    transition: background-color 0.5s;
+    cursor: default;
+    padding: 0px 1em;
+    list-style: none;
+    line-height: 25px;
+    height: 25px;
+    margin: 3px 0;
+    font-size: 13px;
+}
+
+#mac .mac-context-menu ul li:hover {
+    background-color: rgba(49, 156, 241, 0.71);
+    cursor: pointer;
+}
+
+#mac .mac-context-menu ul li a {
+    text-decoration: none;
+    display: block;
+    height: 100%;
+    color: #333;
+    outline: none;
+}
+
+#mac .mac-context-menu ul hr {
+    margin: 0;
+    height: 0px;
+    border: 0px;
+    border-bottom: rgba(121, 121, 121, 0.24) 1px solid;
+    border-top: none
+}
+
 #mac-menu > .list > .sub-item img.icon, #mac-menu > .list > .item img.icon {
     width: 36px;
     height: 36px;
@@ -1236,10 +1206,6 @@ body {
         display: none;
     }
 
-    .mac-open-iframe .layui-layer-setwin a {
-        width: 32px;
-    }
-
     #dock {
         width: 100%;
         height: 60px;
@@ -1265,4 +1231,148 @@ body {
         width: 90%;
     }
 
+    #dock {
+        bottom: 10px;
+    }
+    /* 窗口打开主题 */
+    body .mac-open-iframe {
+        background-color: transparent;
+        border: none;
+        box-shadow: none; 
+    }
+
+    /*#dock .dock-container{
+        width: 100%;
+        border-radius: 0px;
+    }*/
+}
+
+@media (min-width: 1281px) {
+}
+
+/*
+  ##笔记本或PC
+  ##1025px - 1280px
+*/
+
+@media (min-width: 1025px) and (max-width: 1280px) {
+}
+
+/*
+  ##平板电脑/Ipad竖屏
+  ##768px - 1024px
+*/
+
+@media (min-width: 768px) and (max-width: 1024px) {
+    #dock {
+        bottom: 10px;
+    }
+
+
+    #dock .dock-container {
+        border-radius: 8px;
+    }
+}
+
+/*
+  ##平板电脑或Ipad横屏
+  ##768px - 1024px
+*/
+
+@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) {
+
+    #dock {
+        bottom: 6px;
+    }
+
+    #dock .dock-container {
+        border-radius: 6px;
+    }
+}
+
+/*
+  ##低分辨率的平板电脑或横屏的手机
+  ##481px - 767px
+*/
+
+@media (min-width: 481px) and (max-width: 767px) {
+    #dock {
+        bottom: 6px;
+    }
+
+    #dock .dock-container {
+        border-radius: 6px;
+        -webkit-box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+        -moz-box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+        box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+    }
+}
+
+/*
+  ##多数竖屏的智能手机
+  ##320px - 479px
+*/
+
+@media screen and (max-width: 480px) {
+    #dock {
+        bottom: 0px;
+    }
+
+    #dock .dock-container {
+        width: 100%;
+        border-radius: 0px;
+        -webkit-box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+        -moz-box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+        box-shadow: 0 0 0px 0 rgba(0, 0, 0, 0.8);
+    }
+
+    #mac-menu .list .item, .sub-item {
+        width: calc(100% - 20px);
+    }
+}
+
+@-webkit-keyframes bounce {
+    0% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
+    25% {
+        -webkit-transform: translateY(-40px) translateX(0.1px);
+        transform: translateY(-40px) translateX(0.1px);
+    }
+    50% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
+    75% {
+        -webkit-transform: translateY(-20px) translateX(0.1px);
+        transform: translateY(-20px) translateX(0.1px);
+    }
+    100% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
+}
+
+@keyframes bounce {
+    0% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
+    25% {
+        -webkit-transform: translateY(-40px) translateX(0.1px);
+        transform: translateY(-40px) translateX(0.1px);
+    }
+    50% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
+    75% {
+        -webkit-transform: translateY(-20px) translateX(0.1px);
+        transform: translateY(-20px) translateX(0.1px);
+    }
+    100% {
+        -webkit-transform: translateY(0px) translateX(0.1px);
+        transform: translateY(0px) translateX(0.1px);
+    }
 }

demo.html

@@ -4,178 +4,190 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <title>mac桌面</title>
     <meta name="description" content="mac桌面">
     <meta name="keywords" content="mac桌面">
-    <link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'>
+    <link rel='Shortcut Icon' type='image/x-icon' href='./favicon.ico'>
-    <link rel="stylesheet" href="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/animate.css/4.1.1/animate.min.css">
+    <link rel="stylesheet" href="https://cdn.staticfile.org/animate.css/4.1.1/animate.min.css">
-    <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="./component/fontawesome-6.4.0/css/all.min.css">
     <link rel="stylesheet" href="./css/index.min.css">
     <link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
 </head>
 
 <body>
-    <div id="mac">
+<div id="mac">
-        <div id="mac_task_bar" class="backgroud_blur">
+    <div id="mac_task_bar" class="backgroud_blur">
-            <div id="mac_btn_group_left" class="btn_group">
+        <div id="mac_btn_group_left" class="btn_group">
-                <div id="mac_btn_win" class="btn"><span class="fa fa-apple"></span></div>
+            <div id="mac_btn_win" class="btn"><i class="fa-brands fa-apple"></i></div>
-            </div>
-            <div id="mac_btn_group_middle" class="btn_group"></div>
-            <div id="mac_btn_group_right" class="btn_group">
-                <div class="btn" id="mac_btn_time"></div>
-                <div class="btn" id="mac_btn_command"><span id="mac-msg-nof" class="fa fa-list-ul"></span></div>
-                <div class="btn" id="mac_btn_show_desktop"></div>
-            </div>
         </div>
-        <div class="desktop">
+        <div id="mac_btn_group_middle" class="btn_group"></div>
-            <div id="mac-shortcuts" class="shortcuts-hidden">
+        <div id="mac_btn_group_right" class="btn_group">
-                <div class="shortcut"
+            <div class="btn" id="mac_btn_time"></div>
-                    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','OS官网')">
+            <div class="btn" id="mac_btn_command"><i id="mac-msg-nof" class="fa-solid fa-list-ul"></i></div>
-                    <img class="icon" src="./img/icon/computer.png" />
+            <div class="btn" id="mac_btn_show_desktop"></div>
-                    <div class="title">OS官网</div>
+        </div>
-                </div>
+    </div>
-                <div class="shortcut"
+    <div class="desktop">
-                    onclick="Macui.openUrl('./app/todo','<img class=\'icon\' src=\'./img/icon/notes.png\'/>','note')">
+        <div id="mac-shortcuts" class="shortcuts-hidden">
-                    <img class="icon" src="./img/icon/notes.png" />
+            <div class="shortcut"
-                    <div class="title">Note</div>
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','OS官网')">
-                </div>
+                <img class="icon" src="./img/icon/computer.png"/>
-                <div class="shortcut"
+                <div class="title">OS官网</div>
-                    onclick="Macui.openUrl('https://developer.apple.com/game-center','<img class=\'icon\' src=\'./img/icon/gamecenter.png\'/>','GameCenter')">
+            </div>
-                    <img class="icon" src="./img/icon/gamecenter.png" />
+            <div class="shortcut"
-                    <div class="title">GameCenter</div>
+                 onclick="Macui.openUrl('./app/todo','<img class=\'icon\' src=\'./img/icon/notes.png\'/>','note')">
-                </div>
+                <img class="icon" src="./img/icon/notes.png"/>
-                <div class="shortcut" onclick="Macui.openUrl('./app/calendar','<img class=\'icon\' src=\'./img/icon/calendar.png\'/>','Calendar',[['910px','675px'],'auto'])">
+                <div class="title">Note</div>
-                    <img class="icon" src="./img/icon/calendar.png" />
+            </div>
-                    <div class="title">Calendar</div>
+            <div class="shortcut"
-                </div>
+                 onclick="Macui.openUrl('https://developer.apple.com/game-center','<img class=\'icon\' src=\'./img/icon/gamecenter.png\'/>','GameCenter')">
-                <div class="shortcut" onclick="Macui.openUrl('./app/calculator','<img class=\'icon\' src=\'./img/icon/calculator.png\'/>','Calculator',[['387px','613px'],'auto'])">
+                <img class="icon" src="./img/icon/gamecenter.png"/>
-                    <img class="icon" src="./img/icon/calculator.png" />
+                <div class="title">GameCenter</div>
-                    <div class="title">Calculator</div>
+            </div>
-                </div>
+            <div class="shortcut"
-                <div class="shortcut" onclick="window.open('https://www.icloud.com/')">
+                 onclick="Macui.openUrl('./app/calendar','<img class=\'icon\' src=\'./img/icon/calendar.png\'/>','Calendar',[['910px','675px'],'auto'])">
-                    <img class="icon" src="./img/icon/icloud.png" />
+                <img class="icon" src="./img/icon/calendar.png"/>
-                    <div class="title">iCloud</div>
+                <div class="title">Calendar</div>
-                </div>
+            </div>
-                <div class="shortcut"
+            <div class="shortcut"
-                    onclick="Macui.openUrl('https://map.baidu.com','<img class=\'icon\' src=\'./img/icon/maps.png\'/>','Map')">
+                 onclick="Macui.openUrl('./app/calculator','<img class=\'icon\' src=\'./img/icon/calculator.png\'/>','Calculator',[['387px','613px'],'auto'])">
-                    <img class="icon" src="./img/icon/maps.png" />
+                <img class="icon" src="./img/icon/calculator.png"/>
-                    <div class="title">地图</div>
+                <div class="title">Calculator</div>
-                </div>
+            </div>
-                <div class="shortcut"
+            <div class="shortcut" onclick="window.open('https://www.icloud.com/')">
-                    onclick="window.open('https://github.com/yuri2peter/mac-ui/archive/master.zip')">
+                <img class="icon" src="./img/icon/icloud.png"/>
-                    <img class="icon" src="./img/icon/prefapp.png" />
+                <div class="title">iCloud</div>
-                    <div class="title">设置</div>
+            </div>
-                </div>
+            <div class="shortcut"
-                <div class="shortcut"
+                 onclick="Macui.openUrl('https://map.baidu.com','<img class=\'icon\' src=\'./img/icon/maps.png\'/>','Map')">
-                    onclick="window.open('./login.html','<i class=\'fa fa-user icon black-green\'></i>','登录页')">
+                <img class="icon" src="./img/icon/maps.png"/>
-                    <i class="fa fa-user icon black-green"></i>
+                <div class="title">地图</div>
-                    <div class="title">登录页</div>
+            </div>
-                </div>
+            <div class="shortcut"
-                <div class="shortcut mac-open-window flipInX animated"
+                 onclick="window.open('https://github.com/yuri2peter/mac-ui/archive/master.zip')">
-                    data-url="./plugins/theme_switcher/theme_switcher.html" style="left: 92px; top: 510px;">
+                <img class="icon" src="./img/icon/prefapp.png"/>
-                    <img class="icon" src="./img/icon/DesktopScreenEffectsPref.png" />
+                <div class="title">设置</div>
-                    <div class="title">切换壁纸</div>
+            </div>
-                </div>
+            <div class="shortcut"
-                <div class="shortcut mac-drawer">
+                 onclick="window.open('./login.html','<i class=\'fa fa-user icon black-green\'></i>','登录页')">
-                    <img class="icon" src="./img/icon/folder.png" />
+                <i class="fa fa-user icon black-green"></i>
-                    <div class="title">新建文件夹</div>
+                <div class="title">登录页</div>
-                    <div class="mac-drawer-box">
+            </div>
-                        <div class="shortcut-drawer mac-drawer">
+            <div class="shortcut mac-open-window flipInX animated"
-                            <img class="icon" src="./img/icon/folder.png" />
+                 data-url="./plugins/theme_switcher/theme_switcher.html" style="left: 92px; top: 510px;">
-                            <div class="title">新建文件夹</div>
+                <img class="icon" src="./img/icon/DesktopScreenEffectsPref.png"/>
-                            <div class="mac-drawer-box">
+                <div class="title">切换壁纸</div>
-                                <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+            </div>
-                                    <i class="icon fa fa-fw fa-th-list orange"></i>
+            <div class="shortcut mac-drawer">
-                                    <div class="title">子项1</div>
+                <img class="icon" src="./img/icon/folder.png"/>
-                                </div>
+                <div class="title">新建文件夹</div>
+                <div class="mac-drawer-box">
+                    <div class="shortcut-drawer mac-drawer">
+                        <img class="icon" src="./img/icon/folder.png"/>
+                        <div class="title">新建文件夹</div>
+                        <div class="mac-drawer-box">
+                            <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+                                <i class="icon fa fa-fw fa-th-list orange"></i>
+                                <div class="title">子项1</div>
                             </div>
                         </div>
-                        <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+                    </div>
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
+                    <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
-                            <div class="title">子项1</div>
+                        <i class="icon fa fa-fw fa-th-list orange"></i>
-                        </div>
+                        <div class="title">子项1</div>
-                        <div class="shortcut-drawer">
+                    </div>
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
+                    <div class="shortcut-drawer">
-                            <div class="title">子项2</div>
+                        <i class="icon fa fa-fw fa-th-list orange"></i>
-                        </div>
+                        <div class="title">子项2</div>
                     </div>
                 </div>
             </div>
-            <div class="background blur"></div>
         </div>
-
+        <div id="mac-desktop-scene" class="background blur"></div>
-        <div id="mac-menu" class="hidden backgroud_blur">
-            <div class="list mac-menu-hidden animated animated-slideOutLeft">
-                <div class="item"><i class="icon fa fa-wrench fa-fw"></i><span>API测试</span></div>
-                <div class="sub-item" onclick="Macui.openUrl('./child.html','子页')">父子页沟通</div>
-                <div class="sub-item" onclick="Macui.commandCenterOpen()">打开消息中心</div>
-                <div class="sub-item"
-                    onclick="Macui.newMsg('API测试','通过API可以发送消息至消息中心，自定义标题与内容(点击我试试)',function() {alert('click')})">
-                    发送带回调的消息</div>
-                <div class="sub-item" onclick="Macui.menuClose()">关闭菜单</div>
-                <div class="item"><i class="icon fa fa-gavel fa-fw"></i>辅助工具</div>
-                <div class="sub-item"
-                    onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-shortcut.html','图标代码生成器')">桌面图标代码生成器
-                </div>
-                <div class="sub-item" onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-tile.html','磁贴代码生成器')">
-                    磁贴代码生成器</div>
-                <div class="sub-item" onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-menu.html','菜单代码生成器')">
-                    菜单代码生成器</div>
-                <div class="item" onclick="Macui.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>
-                <div class="item" onclick=" Macui.exit();"><i class="icon fa fa-power-off fa-fw"></i>关闭</div>
-            </div>
-        </div>
-        <div id="mac_command_center" class="hidden_right backgroud_blur">
-            <div class="command-header">
-                <div class="tab-today active">今天</div>
-                <div class="tab-msg">通知</div>
-            </div>
-            <div class="command-body today"></div>
-            <!-- <span id="mac_btn_command_center_clean_all">全部清除</span> -->
-            <div class="command-body msgs"></div>
-        </div>
-        <!--bottom dock -->
-        <div class="dock" id="dock">
-            <div class="dock-container backgroud_blur">
-                <a class="dock-item" onclick="Macui.openUrl('./app/finder','<img class=\'icon\' src=\'./img/icon/finder.png\'/>','finder')"><span>finder</span><img src="./img/icon/finder.png" alt="finder"></a>
-                <a class="dock-item launchpad" href="#"><span>launchpad</span><img src="./img/icon/launchpad.png" alt="launchpad" /></a>
-				<a class="dock-item" onclick="Macui.openUrl('./app/safari','<img class=\'icon\' src=\'./img/icon/safari.png\'/>','safari')"><span>safari</span><img src="./img/icon/safari.png" alt="safari"></a>
-                <a class="dock-item" id="trashicon"><span>trashicon</span><img src="./img/icon/trashicon.png" alt="trashicon" /></a>
-            </div>
-        </div>
-		<div id="launchpad" class="backgroud_blur hidden">
-			<div id="app-serach-box" class="app-serach-box">
-				<form action="" class="search">
-				    <div class="serach-box">	
-				        <input type="text" class="input-search" name="input-search" pattern=".{1,}" required>
-				        <label>Search</label>	
-				    </div>	
-				</form>
-			</div>
-			<div id="app-shortcuts" class="app-shortcuts">
-				<div class="shortcut"
-				    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
-				    <img class="icon" src="./img/icon/computer.png" />
-				    <div class="title">UI官网</div>
-				</div>
-				<div class="shortcut" onclick="window.open('./demo.html')">
-				    <img class="icon" src="./img/icon/demo.png" />
-				    <div class="title">查看DEMO</div>
-				</div>
-				<div class="shortcut"
-				    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
-				    <img class="icon" src="./img/icon/computer.png" />
-				    <div class="title">UI官网</div>
-				</div>
-			</div>  
-		</div>
     </div>
+    <div id="mac-menu" class="hidden backgroud_blur">
+        <div class="list mac-menu-hidden animated animated-slideOutLeft">
+            <div class="item"><i class="icon fa fa-wrench fa-fw"></i><span>API测试</span></div>
+            <div class="sub-item" onclick="Macui.openUrl('./child.html','子页')">父子页沟通</div>
+            <div class="sub-item" onclick="Macui.commandCenterOpen()">打开消息中心</div>
+            <div class="sub-item"
+                 onclick="Macui.newMsg('API测试','通过API可以发送消息至消息中心，自定义标题与内容(点击我试试)',function() {alert('click')})">
+                发送带回调的消息
+            </div>
+            <div class="sub-item" onclick="Macui.menuClose()">关闭菜单</div>
+            <div class="item"><i class="icon fa fa-gavel fa-fw"></i>辅助工具</div>
+            <div class="sub-item"
+                 onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-shortcut.html','图标代码生成器')">桌面图标代码生成器
+            </div>
+            <div class="sub-item"
+                 onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-tile.html','磁贴代码生成器')">
+                磁贴代码生成器
+            </div>
+            <div class="sub-item"
+                 onclick="Macui.openUrl('win10ui.yuri2.cn/src/tools/builder-menu.html','菜单代码生成器')">
+                菜单代码生成器
+            </div>
+            <div class="item" onclick="Macui.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>
+            <div class="item" onclick=" Macui.exit();"><i class="icon fa fa-power-off fa-fw"></i>关闭</div>
+        </div>
+    </div>
+    <div id="mac_command_center" class="hidden_right backgroud_blur">
+        <div class="command-header">
+            <div class="tab-today active">今天</div>
+            <div class="tab-msg">通知</div>
+        </div>
+        <div class="command-body today"></div>
+        <!-- <span id="mac_btn_command_center_clean_all">全部清除</span> -->
+        <div class="command-body msgs"></div>
+    </div>
+    <!--bottom dock -->
+    <div class="dock" id="dock">
+        <div class="dock-container backgroud_blur">
+            <a class="dock-item"
+               onclick="Macui.openUrl('./app/finder','<img class=\'icon\' src=\'./img/icon/finder.png\'/>','finder')"><span>finder</span><img
+                    src="./img/icon/finder.png" alt="finder"></a>
+            <a class="dock-item launchpad" href="#"><span>launchpad</span><img src="./img/icon/launchpad.png"
+                                                                               alt="launchpad"/></a>
+            <a class="dock-item"
+               onclick="Macui.openUrl('./app/safari','<img class=\'icon\' src=\'./img/icon/safari.png\'/>','safari')"><span>safari</span><img
+                    src="./img/icon/safari.png" alt="safari"></a>
+            <a class="dock-item" id="trashicon"><span>trashicon</span><img src="./img/icon/trashicon.png"
+                                                                           alt="trashicon"/></a>
+        </div>
+    </div>
+    <div id="launchpad" class="launchpad backgroud_blur hidden">
+        <div id="app-serach-box" class="app-serach-box">
+            <form action="" class="search">
+                <div class="serach-box">
+                    <input type="text" class="input-search" name="input-search" pattern=".{1,}" required>
+                    <label>Search</label>
+                </div>
+            </form>
+        </div>
+        <div id="app-shortcuts" class="app-shortcuts">
+            <div class="shortcut"
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
+                <img class="icon" src="./img/icon/computer.png"/>
+                <div class="title">UI官网</div>
+            </div>
+            <div class="shortcut" onclick="window.open('./demo.html')">
+                <img class="icon" src="./img/icon/demo.png"/>
+                <div class="title">查看DEMO</div>
+            </div>
+            <div class="shortcut"
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
+                <img class="icon" src="./img/icon/computer.png"/>
+                <div class="title">UI官网</div>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
-<script type="text/javascript" src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.2.4/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdn.staticfile.org/jquery/2.2.4/jquery.min.js"></script>
-<script type="text/javascript" src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/layer/3.5.1/layer.min.js"></script>
+<script type="text/javascript" src="https://cdn.staticfile.org/layer/3.5.1/layer.min.js"></script>
-<script type="text/javascript" src="./js/interface.js"></script>
 <script type="text/javascript" src="./js/index.min.js"></script>
+<script type="text/javascript" src="./js/interface.min.js"></script>
 <script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
 <script>
     Macui.onReady(function () {
@@ -193,18 +205,7 @@
         setTimeout(function () {
             Macui.newMsg('推荐全屏', '按下F11全屏以达到最佳视觉效果(点击进入)', function () {
                 Macui.enableFullScreen();
-            });
+            })
-            Macui.newMsg('最新资讯', '最新资讯信息', function () {
-                layer.open({
-                    type: 2,
-                    title: '最新资讯',
-                    area: ['300px', '380px'],
-                    shade: 0,
-                    skin: 'mac-open-iframe',
-                    offset: 'rb',
-                    content: './broadcast.html'
-                });
-            });
         }, 1500);
 
         setTimeout(function () {

index.html

@@ -4,148 +4,135 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <title>mac桌面</title>
     <meta name="description" content="mac桌面">
     <meta name="keywords" content="mac桌面">
-    <link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'>
+    <link rel='Shortcut Icon' type='image/x-icon' href='./favicon.ico'>
-    <link rel="stylesheet" href="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/animate.css/4.1.1/animate.min.css">
+    <link rel="stylesheet" href="https://cdn.staticfile.org/animate.css/4.1.1/animate.min.css">
-    <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="./component/fontawesome-6.4.0/css/all.min.css">
-    <link rel="stylesheet" href="./css/index.css">
+    <link rel="stylesheet" href="./css/index.min.css">
     <link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
 </head>
 
 <body>
-    <div id="mac">
+<div id="mac">
-		<div id="mac_task_bar" class="backgroud_blur">
+    <div id="mac_task_bar" class="backgroud_blur">
-            <div id="mac_btn_group_left" class="btn_group">
+        <div id="mac_btn_group_left" class="btn_group">
-                <div id="mac_btn_win" class="btn"><span class="fa fa-apple"></span></div>
+            <div id="mac_btn_win" class="btn"><i class="fa-brands fa-apple"></i></div>
-            </div>
-            <div id="mac_btn_group_middle" class="btn_group"></div>
-            <div id="mac_btn_group_right" class="btn_group">
-                <div class="btn" id="mac_btn_time"></div>
-                <div class="btn" id="mac_btn_command"><span id="mac-msg-nof" class="fa fa-list-ul"></span></div>
-                <div class="btn" id="mac_btn_show_desktop"></div>
-            </div>
         </div>
-        <div class="desktop">
+        <div id="mac_btn_group_middle" class="btn_group"></div>
-            <div id="mac-shortcuts" class="shortcuts-hidden">
+        <div id="mac_btn_group_right" class="btn_group">
-                <div class="shortcut"
+            <div class="btn" id="mac_btn_time"></div>
-                    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
+            <div class="btn" id="mac_btn_command"><i id="mac-msg-nof" class="fa-solid fa-list-ul"></i></div>
-                    <img class="icon" src="./img/icon/computer.png" />
+            <div class="btn" id="mac_btn_show_desktop"></div>
-                    <div class="title">UI官网</div>
+        </div>
-                </div>
+    </div>
-                <div class="shortcut" onclick="window.open('./demo.html')">
+    <div class="desktop">
-                    <img class="icon" src="./img/icon/demo.png" />
+        <div id="mac-shortcuts" class="shortcuts-hidden">
-                    <div class="title">查看DEMO</div>
+            <div class="shortcut"
-                </div>
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
-                <div class="shortcut mac-drawer">
+                <img class="icon" src="./img/icon/computer.png"/>
-                    <img class="icon" src="./img/icon/folder.png" />
+                <div class="title">UI官网</div>
-                    <div class="title">新建文件夹</div>
+            </div>
-                    <div class="mac-drawer-box">
+            <div class="shortcut"
-                        <div class="shortcut-drawer mac-drawer">
+                 onclick="Macui.openUrl('./app/safari','<img class=\'icon\' src=\'./img/icon/safari.png\'/>','safari')">
-                            <img class="icon" src="./img/icon/folder.png" />
+                <img class="icon" src="./img/icon/safari.png"/>
-                            <div class="title">新建文件夹</div>
+                <div class="title">safari</div>
-                            <div class="mac-drawer-box">
+            </div>
-                                <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+            <div class="shortcut" onclick="window.open('./demo.html')">
-                                    <i class="icon fa fa-fw fa-th-list orange"></i>
+                <img class="icon" src="./img/icon/demo.png"/>
-                                    <div class="title">子项1</div>
+                <div class="title">查看DEMO</div>
-                                </div>
+            </div>
+            <div class="shortcut mac-drawer">
+                <img class="icon" src="./img/icon/folder.png"/>
+                <div class="title">新建文件夹</div>
+                <div class="mac-drawer-box">
+                    <div class="shortcut-drawer mac-drawer">
+                        <img class="icon" src="./img/icon/folder.png"/>
+                        <div class="title">新建文件夹</div>
+                        <div class="mac-drawer-box">
+                            <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+                                <i class="icon fa fa-fw fa-th-list orange"></i>
+                                <div class="title">子项1</div>
                             </div>
                         </div>
-                        <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
+                    </div>
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
+                    <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
-                            <div class="title">子项1</div>
+                        <i class="icon fa fa-fw fa-th-list orange"></i>
-                        </div>
+                        <div class="title">子项1</div>
-                        <div class="shortcut-drawer">
+                    </div>
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
+                    <div class="shortcut-drawer">
-                            <div class="title">子项2</div>
+                        <i class="icon fa fa-fw fa-th-list orange"></i>
-                        </div>
+                        <div class="title">子项2</div>
-                        <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
-                            <div class="title">子项1</div>
-                        </div>
-                        <div class="shortcut-drawer">
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
-                            <div class="title">子项2</div>
-                        </div>
-                        <div class="shortcut-drawer mac-open-window" data-url="www.baidu.com">
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
-                            <div class="title">子项1</div>
-                        </div>
-                        <div class="shortcut-drawer">
-                            <i class="icon fa fa-fw fa-th-list orange"></i>
-                            <div class="title">子项2</div>
-                        </div>
                     </div>
                 </div>
             </div>
-            <div class="background blur"></div>
         </div>
-        <div id="mac-menu" class="hidden backgroud_blur">
+        <div id="mac-desktop-scene" class="background blur"></div>
-            <div class="list mac-menu-hidden animated animated-slideOutLeft">
+    </div>
-                <div class="item" onclick="Macui.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>
+    <div id="mac-menu" class="hidden backgroud_blur">
-                <div class="item" onclick=" Macui.exit();"><i class="icon fa fa-power-off fa-fw"></i>关闭</div>
+        <div class="list mac-menu-hidden animated animated-slideOutLeft">
-            </div>
+            <div class="item" onclick="Macui.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>
+            <div class="item" onclick=" Macui.exit();"><i class="icon fa fa-power-off fa-fw"></i>关闭</div>
         </div>
-        <div id="mac_command_center" class="hidden_right backgroud_blur">
+    </div>
-            <div class="command-header">
+    <div id="mac_command_center" class="hidden_right backgroud_blur">
-                <div class="tab-today active">今天</div>
+        <div class="command-header">
-                <div class="tab-msg">通知</div>
+            <div class="tab-today active">今天</div>
-            </div>
+            <div class="tab-msg">通知</div>
-            <div class="command-body today"></div>
-            <!-- <span id="mac_btn_command_center_clean_all">全部清除</span> -->
-            <div class="command-body msgs"></div>
         </div>
-        <div class="dock" id="dock">
+        <div class="command-body today"></div>
-            <div class="dock-container backgroud_blur">
+        <!-- <span id="mac_btn_command_center_clean_all">全部清除</span> -->
-                <a class="dock-item"
+        <div class="command-body msgs"></div>
-                    onclick="Macui.openUrl('./app/finder','<img class=\'icon\' src=\'./img/icon/finder.png\'/>','finder')">
+    </div>
-                    <span>finder</span><img src="./img/icon/finder.png"></a>
+    <div class="dock" id="dock">
-				<a class="dock-item launchpad" href="#"><span>launchpad</span><img src="./img/icon/launchpad.png"
+        <div class="dock-container backgroud_blur">
-					        alt="launchpad" /></a>
+            <a class="dock-item"
-                <a class="dock-item"
+               onclick="Macui.openUrl('./app/finder','<img class=\'icon\' src=\'./img/icon/finder.png\'/>','finder')">
-                    onclick="Macui.openUrl('./app/safari','<img class=\'icon\' src=\'./img/icon/safari.png\'/>','safari')">
+                <span>finder</span><img src="./img/icon/finder.png"></a>
-                    <span>safari</span><img src="./img/icon/safari.png"></a>
+            <a class="dock-item launchpad" href="#"><span>launchpad</span><img src="./img/icon/launchpad.png"
+                                                                               alt="launchpad"/></a>
+            <a class="dock-item"
+               onclick="Macui.openUrl('./app/safari','<img class=\'icon\' src=\'./img/icon/safari.png\'/>','safari')">
+                <span>safari</span><img src="./img/icon/safari.png"></a>
 
-                <a class="dock-item" id="trashicon" href="#"><span>trashicon</span><img src="./img/icon/trashicon.png"
+            <a class="dock-item" id="trashicon" href="#"><span>trashicon</span><img src="./img/icon/trashicon.png"
-                        alt="trashicon" /></a>
+                                                                                    alt="trashicon"/></a>
+        </div>
+    </div>
+    <div id="launchpad" class="launchpad backgroud_blur hidden">
+        <div id="app-serach-box" class="app-serach-box">
+            <form action="" class="search">
+                <div class="serach-box">
+                    <input type="text" class="input-search" name="input-search" pattern=".{1,}" required>
+                    <label>Search</label>
+                </div>
+            </form>
+        </div>
+        <div id="app-shortcuts" class="app-shortcuts">
+            <div class="shortcut"
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
+                <img class="icon" src="./img/icon/computer.png"/>
+                <div class="title">UI官网</div>
+            </div>
+            <div class="shortcut" onclick="window.open('./demo.html')">
+                <img class="icon" src="./img/icon/demo.png"/>
+                <div class="title">查看DEMO</div>
+            </div>
+            <div class="shortcut"
+                 onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
+                <img class="icon" src="./img/icon/computer.png"/>
+                <div class="title">UI官网</div>
             </div>
         </div>
-		<div id="launchpad" class="launchpad backgroud_blur hidden">
+    </div>
-			<div id="app-serach-box" class="app-serach-box">
+</div>
-				<form action="" class="search">
-				    <div class="serach-box">
-				        <input type="text" class="input-search" name="input-search" pattern=".{1,}" required>
-				        <label>Search</label>
-				    </div>
-				</form>
-			</div>
-			<div id="app-shortcuts" class="app-shortcuts">
-				<div class="shortcut"
-				    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
-				    <img class="icon" src="./img/icon/computer.png" />
-				    <div class="title">UI官网</div>
-				</div>
-				<div class="shortcut" onclick="window.open('./demo.html')">
-				    <img class="icon" src="./img/icon/demo.png" />
-				    <div class="title">查看DEMO</div>
-				</div>
-				<div class="shortcut"
-				    onclick="Macui.openUrl('./index.html','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
-				    <img class="icon" src="./img/icon/computer.png" />
-				    <div class="title">UI官网</div>
-				</div>
-			</div>
-		</div>
-
-	</div>
 </body>
-<script type="text/javascript"
+<script type="text/javascript" src="https://cdn.staticfile.org/jquery/2.2.4/jquery.min.js"></script>
-    src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.2.4/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdn.staticfile.org/layer/3.5.1/layer.min.js"></script>
-<script type="text/javascript" src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/layer/3.5.1/layer.min.js"></script>
+<script type="text/javascript" src="./js/index.min.js"></script>
 <script type="text/javascript" src="./js/interface.min.js"></script>
-<script type="text/javascript" src="./js/index.js"></script>
 <script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
 <script>
     Macui.onReady(function () {

js/index.js

@@ -10,7 +10,7 @@ window.Macui = {
     },
     _wallpaperBlur: true, //壁纸模糊（影响性能）
     _countTask: 0,
-    _maxTask:12,
+    _maxTask: 12,
     _newMsgCount: 0,
     _animated_classes: [],
     _animated_liveness: 0,
@@ -422,7 +422,7 @@ window.Macui = {
         $("#mac_btn_group_middle").click(function () {
             $("#mac .desktop").click();
         });
-        $(document).on('click', '.mac-btn-refresh', function () {
+        $(document).on('click', '.layui-layer-refresh', function () {
             let index = $(this).attr('index');
             let iframe = Macui.getLayeroByIndex(index).find('iframe');
             iframe.attr('src', iframe.attr('src'));
@@ -890,7 +890,9 @@ window.Macui = {
     },
     //close Launchpad
     closeLaunchpad: function () {
-        $("#launchpad").removeClass("show").addClass("hidden").hide();
+        if ($("#launchpad").hasClass("show")){
+            $("#launchpad").removeClass("show").addClass("hidden").hide();
+        }
     },
     //消息中心渲染
     renderCommand: function (todayHtml = null) {
@@ -1005,7 +1007,7 @@ window.Macui = {
                 halign: 'center'
             })
         } else {
-            $("#dock .dock-container").css("width",width)
+            $("#dock .dock-container").css("width", width)
             docks.on('mouseover mousemove mouseout', function (e) {
                 e.stopPropagation()
             }).css("width", cell_width).off('mouseover mousemove mouseout')
@@ -1098,7 +1100,18 @@ window.Macui = {
         })
     },
     openUrl: function (url, icon, title, areaAndOffset) {
-        if ($(".dock-container").children('.dock-item').length > this._maxTask) {
+        //只打开一个应用
+        /*
+        let ifr=document.getElementsByTagName("iframe");
+        for(i=0;i<ifr.length;i++){
+            if(url==ifr[i].src){
+                Win10.show_win(url);
+                return false;
+            }
+        }
+        */
+        //只打开一个应用代码结束，备注，本地方法有点问题，需要全部使用 url才能生效
+        if ($("#dock .dock-container").children('.dock-item').length > this._maxTask) {
             layer.msg("您打开的太多了，歇会儿吧~");
             return false;
         } else {
@@ -1139,7 +1152,6 @@ window.Macui = {
             type: 2,
             shadeClose: true,
             shade: false,
-            move:'.mac-open-iframe',
             maxmin: true, //开启最大化最小化按钮
             title: icon + title,
             content: url,
@@ -1171,12 +1183,15 @@ window.Macui = {
         let layero_opened = Macui.getLayeroByIndex(index);
         layero_opened.css('z-index', Macui._countTask + 813);
         Macui._settop(layero_opened);
-        //重新定义菜单布局
-        layero_opened.find('.layui-layer-setwin').prepend('<a class="mac-btn-refresh" index="' + index + '" href="#"></a>');
         //菜单排列倒序
         layero_opened.find(".layui-layer-setwin>a").each(function () {
-            $(this).prependTo(layero_opened.find(".layui-layer-setwin"));
+            if ($(this).hasClass('layui-layer-close')) {
+                $(this).prependTo(layero_opened.find(".layui-layer-setwin"));
+            }
         })
+        //重新定义菜单布局
+        layero_opened.find('.layui-layer-setwin').append('<a class="layui-layer-ico layui-layer-refresh" index="' + index +
+            '" href="#"></a>');
         layero_opened.find('.layui-layer-setwin .layui-layer-max').click(function () {
             setTimeout(function () {
                 let height = layero_opened.css('height');
@@ -1191,10 +1206,10 @@ window.Macui = {
             }, 300);
         });
         //回收站存在则插入回收站之前不存在则直接追加
-        if ($("#trashicon")){
+        if ($("#trashicon")) {
             btn.insertBefore($("#trashicon"))
-        }else{
+        } else {
-            $("#dock .dock-container").append(btn);
+            $("#dock .dock-container .dock-item").append(btn);
         }
         Macui.renderDocks();
         btn.click(function () {
@@ -1219,13 +1234,13 @@ window.Macui = {
                     Macui._checkTop();
                     layero.hide();
                 } else {
-                    $('.dock-container .dock-item.active').removeClass('active');
+                    $('#dock .dock-container .dock-item.active').removeClass('active');
                     $(this).addClass('active');
                     Macui._settop(layero);
                 }
             } else {
                 $(this).addClass('show');
-                $('.dock-container .dock-item.active').removeClass('active');
+                $('#dock .dock-container .dock-item.active').removeClass('active');
                 $(this).addClass('active');
                 Macui._settop(layero);
                 layero.show();

plugins/theme_switcher/theme_switcher.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>主题切换</title>
     <link href="theme_switcher.css" rel="stylesheet">
-    <script type="text/javascript" src="../../js/jquery-2.2.4.min.js"></script>
+    <script type="text/javascript" src="https://cdn.staticfile.org/jquery/2.2.4/jquery.min.js"></script>
     <script type="text/javascript" src="../../js/mac.child.js"></script>
     <script type="text/javascript" src="./theme_switcher.js"></script>
 </head>