修正完善

This commit is contained in:
liyukun 2021-08-07 18:23:07 +08:00
parent 736432d65a
commit 87745322cc
22 changed files with 145 additions and 151 deletions

View File

@ -1 +1 @@
v1.1.2.3
v1.1.2.5

View File

@ -1,42 +1,49 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<!-- Prevent caching at the proxy server -->
<meta http-equiv="expires" content="0">
<title>MAC-UI最新资讯</title>
<style>
*{
color:gray;
font-family: "Microsoft YaHei", 微软雅黑, "MicrosoftJhengHei", 华文细黑, STHeiti, MingLiu
}
.title{
color:orange;
}
.content *{
font-size: 12px;
}
.content ul{
padding-left: 1.5em;
}
.content li{
margin-top: 0.3em;
}
.red{
color:red;
}
</style>
</head>
<body>
<h3 class="title">MACUI已出炉</h3>
<div class="content">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<!-- Prevent caching at the proxy server -->
<meta http-equiv="expires" content="0">
<title>MAC-UI最新资讯</title>
<style>
* {
color: gray;
font-family: "Microsoft YaHei", 微软雅黑, "MicrosoftJhengHei", 华文细黑, STHeiti, MingLiu
}
.title {
color: orange;
}
.content * {
font-size: 12px;
}
.content ul {
padding-left: 1.5em;
}
.content li {
margin-top: 0.3em;
}
.red {
color: red;
}
</style>
</head>
<body>
<h3 class="title">MACUI已出炉</h3>
<div class="content">
<h4>编辑日期 2018/06/20</h4>
<p>MAC-UI华丽上线</p>
<p>今后产品动态,疑问解答等内容都会在<a href="http://www.bycodes.net/" target="_blank"><b>码外社区</b></a>内进行,感谢各位一如既往的支持与厚爱。</p>
</div>
</body>
</html>
<p>今后产品动态,疑问解答等内容都会在<a href="http://www.apecloud.cn/" target="_blank"><b>猿码云</b></a>内进行,感谢各位一如既往的支持与厚爱。</p>
</div>
</body>
</html>

View File

@ -1,12 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>子页测试</title>
<script src="./js/jquery-2.2.4.min.js"></script>
<script src="./js/win10.child.js"></script>
<style>
.btn{
.btn {
margin: 20px;
width: 160px;
height: 40px;
@ -19,25 +18,29 @@
cursor: pointer;
text-align: center;
}
.btn:hover{
.btn:hover {
background-color: #256d95;
}
</style>
<script>
function f1() {
Win10_child.newMsg('子页的问候','这是从iframe页调用APi发送的消息哦');
}
function f2() {
Win10_child.openUrl('http://win10ui.yuri2.cn','<img class=\'icon\' src=\'./img/icon/win10.png\'/>Win10-UI官网')
}
function f3() {
Win10_child.close();
}
</script>
</head>
<body>
<div class="btn" onclick="f1()">子页给父页发消息</div>
<div class="btn" onclick="f2()">子页打开子窗口</div>
<div class="btn" onclick="f3()">关闭子页</div>
</body>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="./js/win10.child.min.js"></script>
<script>
function f1() {
Win10_child.newMsg('子页的问候', '这是从iframe页调用APi发送的消息哦');
}
function f2() {
Win10_child.openUrl('http://win10ui.yuri2.cn', '<img class=\'icon\' src=\'./img/icon/win10.png\'/>', 'Win10-UI官网')
}
function f3() {
Win10_child.close();
}
</script>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
component/layer/layer.js Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,2 @@
/*! layer mobile-v2.0.0 Web弹层组件 MIT License http://layer.layui.com/mobile By 贤心 */
/*! layer mobile-v2.0.0 Web 通用层组件 MIT License */
;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 701 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -668,30 +668,16 @@ body {
cursor: pointer;
}
.win10-new-msg{
/*繁华年间许你一世安宁提供*/
background-color: transparent;
/* border: 1px solid #323232; */
border: #f0f6f6 solid 1px !important;
-webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
-moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
border-radius: 6px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
}
.win10-open-iframe{
/*繁华年间许你一世安宁提供*/
background-color: transparent;
/* border: 1px solid #323232; */
border: #f0f6f6 solid 1px !important;
border: #f0f6f6 solid 1px;
-webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
-moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
border-radius: 6px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px !important;
-webkit-border-radius: 6px !important;
-moz-border-radius: 6px !important;
}
.win10-open-iframe .layui-layer-content{
@ -717,7 +703,6 @@ body {
display: none;
}
.win10-open-iframe .layui-layer-min cite{display: none;}
.win10-open-iframe .layui-layer-max:hover{background-image:none}
.win10-open-iframe .layui-layer-max,.layui-layer-maxmin{background:none}
@ -951,9 +936,7 @@ body {
#win10_btn_group_middle{
width:calc(100% - 160px);
}
#win10_btn_group_middle .btn{
padding: 0 3px;
}
#win10_btn_group_right{
max-width:150px;
}

View File

@ -5,10 +5,13 @@
<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"/>
<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 href="./css/animate.css" rel="stylesheet">
<link rel="stylesheet" href="./component/font-awesome-4.7.0/css/font-awesome.min.css">
<link href="./css/index.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.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="win10">
@ -132,11 +135,10 @@
</div>
</div>
</body>
<script type="text/javascript" src="./js/jquery-2.2.4.min.js"></script>
<script type="text/javascript" src="./component/layer-v3.1.1/layer/layer.js"></script>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/layer/3.5.1/layer.min.js"></script>
<script type="text/javascript" src="./js/interface.js"></script>
<script type="text/javascript" src="./js/mac.min.js"></script>
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>
Win10.onReady(function () {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 643 KiB

After

Width:  |  Height:  |  Size: 204 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 KiB

After

Width:  |  Height:  |  Size: 92 KiB

View File

@ -4,12 +4,12 @@
<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" />
<title>macOS</title>
<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 href="./css/animate.css" rel="stylesheet">
<link href="./component/font-awesome-4.7.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link href="./css/index.min.css" rel="stylesheet">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
</head>
@ -30,7 +30,7 @@
</div>
<div class="desktop">
<div id="win10-shortcuts" class="shortcuts-hidden">
<div class="shortcut" onclick="Win10.openUrl('http://mac.apecloud.cn','<img class=\'icon\' src=\'./img/icon/computer.png\'/>','UI官网')">
<div class="shortcut" onclick="Win10.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>
@ -96,42 +96,43 @@
</div>
</div>
</div>
<script type="text/javascript" src="./js/jquery-2.2.4.min.js"></script>
<script type="text/javascript" src="./component/layer-v3.1.1/layer/layer.js"></script>
<script type="text/javascript" src="./js/interface.js"></script>
<script type="text/javascript" src="./js/mac.min.js"></script>
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>
Win10.onReady(function () {
//设置壁纸
Win10.setBgUrl({
main: './img/wallpapers/main.jpg',
mobile: './img/wallpapers/mobile.jpg',
});
Win10.setAnimated([
'animated flip',
'animated bounceIn',
], 0.01);
setTimeout(function () {
Win10.newMsg('推荐全屏', '按下F11全屏以达到最佳视觉效果(点击进入)', function () {
Win10.enableFullScreen();
})
}, 1500);
setTimeout(function () {
layer.open({
type: 2,
title: '最新资讯',
area: ['300px', '380px'],
shade: 0,
skin: 'win10-open-iframe',
offset: 'rb',
content: 'broadcast.html'
})
}, 2000);
});
</script>
</body>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/layer/3.5.1/layer.min.js"></script>
<script type="text/javascript" src="./js/interface.js"></script>
<script type="text/javascript" src="./js/mac.min.js"></script>
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>
Win10.onReady(function () {
//设置壁纸
Win10.setBgUrl({
main: './img/wallpapers/main.jpg',
mobile: './img/wallpapers/mobile.jpg',
});
Win10.setAnimated([
'animated flip',
'animated bounceIn',
], 0.01);
setTimeout(function () {
Win10.newMsg('推荐全屏', '按下F11全屏以达到最佳视觉效果(点击进入)', function () {
Win10.enableFullScreen();
})
}, 1500);
setTimeout(function () {
layer.open({
type: 2,
title: '最新资讯',
area: ['300px', '380px'],
shade: 0,
skin: 'win10-open-iframe',
offset: 'rb',
content: 'broadcast.html'
})
}, 2000);
});
</script>
</html>

View File

@ -719,7 +719,7 @@ window.Win10 = {
let viewdate = {};
let date = new Date();
//秒
viewdate.second = date.getSeconds();;
viewdate.second = date.getSeconds();
//分钟
viewdate.minute = get_min(date);
//小时
@ -753,28 +753,26 @@ window.Win10 = {
return viewdate;
},
//消息中心渲染
renderCommand: function (todayHtml = null) {
console.log(todayHtml);
let active = $("#win10_command_center .command-body.today").hasClass('active');
if (!active) {
if (!todayHtml) {
let lunarDate = Win10.getLunarObj();
todayHtml = '<div class="command-body-calendar">\n' +
' <div class="command-body-calendar-date normal-date">' + lunarDate.month + '月' + lunarDate.day + '日 \n' + lunarDate.week + '</div>\n' +
' <div class="command-body-calendar-date lunar-date">' + lunarDate.ganzhi + '年' + lunarDate.lunarmonth + lunarDate.lunarday + '</div>\n' +
'</div>\n' +
'<div class="notice">' +
' <div class="notice-header">' +
' <span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>\n' +
' <span class="notice-header-title">天气</span>\n' +
' </div>\n' +
' <div class="notice-body">\n' +
' <iframe scrolling="no" src="https://tianqiapi.com/api.php?style=tw&skin=pitaya" frameborder="0" width="280" height="500" allowtransparency="true"></iframe>\n' +
' </div>\n' +
'</div>\n';
}
console.log(todayHtml);
$("#win10_command_center .command-body.today").html(todayHtml).addClass('active');
renderCommand: function (todayHtml = null) {
let active = $("#win10_command_center .command-body.today").hasClass('active');
if (!active) {
if (!todayHtml) {
let lunarDate = Win10.getLunarObj();
todayHtml = '<div class="command-body-calendar">\n' +
' <div class="command-body-calendar-date normal-date">' + lunarDate.month + '月' + lunarDate.day + '日 \n' + lunarDate.week + '</div>\n' +
' <div class="command-body-calendar-date lunar-date">' + lunarDate.ganzhi + '年' + lunarDate.lunarmonth + lunarDate.lunarday + '</div>\n' +
'</div>\n' +
'<div class="notice">' +
' <div class="notice-header">' +
' <span class="notice-header-icon"><img src="./img/icon/weather.png" class="notice-header-icon-img" /></span>\n' +
' <span class="notice-header-title">天气</span>\n' +
' </div>\n' +
' <div class="notice-body">\n' +
' <iframe scrolling="no" src="https://tianqiapi.com/api.php?style=tw&skin=durian" frameborder="0" width="100%" height="500" allowtransparency="true"></iframe>\n' +
' </div>\n' +
'</div>\n';
}
$("#win10_command_center .command-body.today").html(todayHtml).addClass('active');
}
},
menuOpen: function () {
@ -1125,7 +1123,7 @@ window.Win10 = {
window.close();
layer.close(index);
layer.alert(Win10.lang('哎呀,好像失败了呢。', 'Ops...There seems to be a little problem.'), {
skin: 'layui-layer-lan'
skin: 'layui-layer-lan',
, closeBtn: 0
});
});