提交 331c4edb 编写于 作者: doc_wei's avatar doc_wei

样式更新

上级 da91f60d
因为 它太大了无法显示 source diff 。你可以改为 查看blob
......@@ -158,7 +158,7 @@ layui.define(["layer", "laytpl", "upload"], function(i) {
return t.open({
type: 1,
area: ["260px", "520px"],
skin: "layui-box layui-layim",
skin: "layui-box layui-layim talk-mabal",
title: "​",
offset: "rb",
id: "layui-layim",
......
......@@ -309,7 +309,7 @@ button{
height: 40px;
position: fixed;
bottom: 0;
z-index: 99980;
z-index: 99980000;
}
.winui-taskbar > * {
......@@ -365,7 +365,6 @@ button{
line-height: 40px;
width: 160px;
padding: 0 10px;
text-align: center;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
......@@ -2494,6 +2493,18 @@ body .layer-ext-winconfirm {
line-height: 17px;
}
.title-icon{
width: 16px;
height: 16px;
float: left;
margin-top: 10px;
line-height: 16px;
}
.win-title-class{
margin-left: 5px;
}
.icon-child{
display: none;
}
......@@ -3063,8 +3074,12 @@ body .layer-ext-winconfirm {
padding-left: 0px;
}
.sec-clsss .layui-layer-setwin{
display: none;
.sec-clsss .layui-layer-setwin a{
background-color: white;
border-radius: 10px;
padding-right: -8px;
background-position-x: 2px;
background-position-y: -39px;
}
.sec-clsss .layui-layer-content{
......@@ -4226,6 +4241,12 @@ body .layer-ext-winconfirm {
background-color: rgba(0,0,0,0) !important;
border: 0px !important;
box-shadow: 1px 1px 50px rgba(0,0,0,0) !important;
z-index: 99980001 !important;
}
.talk-mabal{
margin-bottom: 40px!important;
z-index: 99980001 !important;
}
.qq_32{
......
......@@ -27,6 +27,7 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
maxOpen = (item.maxOpen == '' || item.maxOpen == undefined) ? '' : 'win-maxOpen="' + item.maxOpen + '"',
menuIconBg = (item.menuIconBg == '' || item.menuIconBg == undefined) ? '' : 'win-menuIconBg="' + item.menuIconBg + '"',
menuIconColor = (item.menuIconColor == '' || item.menuIconColor == undefined) ? '' : 'win-menuIconColor="' + item.menuIconColor + '"',
menuIcon = (item.icon == '' || item.icon == undefined) ? '' : 'win-icon="' + item.icon + '"',
//icon的算法存在纰漏,但出现错误几率较小
isFaIcon = (item.icon.indexOf('fa-') != -1 && item.icon.indexOf('.') == -1);
var icon;
......@@ -36,7 +37,7 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
icon = isFaIcon ? '<i class="fa ' + item.icon + ' fa-fw"></i>' : '<img src="' + item.icon + '" />';
}
if(isNull(item.childs)){
html += '<div class="winui-desktop-item" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + '>';
html += '<div class="winui-desktop-item" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + ' ' + menuIconBg + ' ' + menuIconColor + ' ' + menuIcon + '>';
if(!isNull(item.menuIconBg)){
html += '<div class="winui-icon ' + (isFaIcon ? 'winui-icon-font' : 'winui-icon-img') + '" style="background-color: ' + item.menuIconBg + '">';
}else{
......@@ -47,7 +48,7 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
html += '<p>' + item.name + '</p>';
html += '</div>';
}else{
html += '<div class="winui-desktop-item" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + '>';
html += '<div class="winui-desktop-item" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + ' ' + menuIconBg + ' ' + menuIconColor + '>';
html += '<div class="winui-icon ' + (isFaIcon ? 'winui-icon-font' : 'winui-icon-img') + '">';
html += '<div class="icon-drawer">';
var childsIconContent = '';
......@@ -60,6 +61,7 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
childsmaxOpen = (bean.maxOpen == '' || bean.maxOpen == undefined) ? '' : 'win-maxOpen="' + bean.maxOpen + '"',
childsmenuIconBg = (bean.menuIconBg == '' || bean.menuIconBg == undefined) ? '' : 'win-menuIconBg="' + bean.menuIconBg + '"',
childsmenuIconColor = (bean.menuIconColor == '' || bean.menuIconColor == undefined) ? '' : 'win-menuIconColor="' + bean.menuIconColor + '"',
childsmenuIcon = (bean.icon == '' || bean.icon == undefined) ? '' : 'win-icon="' + bean.icon + '"',
//icon的算法存在纰漏,但出现错误几率较小
childsisFaIcon = (bean.icon.indexOf('fa-') != -1 && bean.icon.indexOf('.') == -1);
var childsicon;
......@@ -83,7 +85,7 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
}
childsIconContent += childsiconsmall;
childsHtml += '<div class="winui-desktop-item sec-clsss-btn" ' + childsid + ' ' + childsurl + ' ' + childstitle + ' ' + childsopentype + ' ' + childsmaxOpen + '>';
childsHtml += '<div class="winui-desktop-item sec-clsss-btn" ' + childsid + ' ' + childsurl + ' ' + childstitle + ' ' + childsopentype + ' ' + childsmaxOpen + ' ' + childsmenuIconBg + ' ' + childsmenuIconColor + ' ' + childsmenuIcon + '>';
if(!isNull(bean.menuIconBg)){
childsHtml += '<div class="winui-icon ' + (childsisFaIcon ? 'winui-icon-font' : 'winui-icon-img') + '" style="background-color: ' + bean.menuIconBg + '">';
}else{
......
......@@ -42,7 +42,7 @@ layui.define(['jquery', 'element', 'layer', 'winui'], function (exports) {
}else{
var extend = '';
}
html += '<li class="layui-nav-item ' + isParent + ' ' + extend + '" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxopen + ' ' + winIcon + '>';
html += '<li class="layui-nav-item ' + isParent + ' ' + extend + '" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxopen + ' ' + winIcon + ' ' + menuIconBg + ' ' + menuIconColor + '>';
if(!isNull(item.menuIconBg)){
html += '<a><div class="winui-menu-icon" style="background-color: ' + item.menuIconBg + '!important;">';
}else{
......@@ -68,7 +68,7 @@ layui.define(['jquery', 'element', 'layer', 'winui'], function (exports) {
}else{
cicon = (cItem.icon.indexOf('fa-') != -1 && cItem.icon.indexOf('.') == -1) ? '<i class="fa ' + cItem.icon + ' fa-fw"></i>' : '<img src="' + cItem.icon + '" />';;
}
html += '<dd ' + cId + ' ' + cUrl + ' ' + cTitle + ' ' + cOpentype + ' ' + cMaxopen + ' ' + cWinIcon + '>';
html += '<dd ' + cId + ' ' + cUrl + ' ' + cTitle + ' ' + cOpentype + ' ' + cMaxopen + ' ' + cWinIcon + ' ' + cmenuIconBg + ' ' + cmenuIconColor + '>';
if(!isNull(cItem.menuIconBg)){
html += '<a><div class="winui-menu-icon" style="background-color: ' + cItem.menuIconBg + '!important;">';
}else{
......
......@@ -96,6 +96,7 @@ layui.define(['layer', 'winui'], function (exports) {
},
//打开回调
success: function (layero, index) {
console.log(1);
common.setWindowBody(layero);
},
//关闭回调
......
......@@ -13,7 +13,7 @@
winuiLoad = radialIndicator($('#winui-load'), {
barBgColor: '#E3E3E3',
barColor: '#FFFFFF',
barColor: '#8A2BE2',
radius: 100,
barWidth: 5,
initValue: 0,
......@@ -395,8 +395,22 @@
function OpenWindow(menuItem) {
var $this = $(menuItem);
var url = $this.attr('win-url');
console.log($this);
var title = $this.attr('win-title');
var menuIconBg = $this.attr("win-menuiconbg");
var menuIconColor = $this.attr("win-menuiconcolor");
var menuIcon = $this.attr("win-icon");
var str = '<i class="fa title-icon fa-fw ';
if(!isNull(menuIcon)){
str += menuIcon;
}
str += '" style="';
if(!isNull(menuIconBg)){
str += 'background-color: ' + menuIconBg + ';';
}
if(!isNull(menuIconColor)){
str += 'color: ' + menuIconColor + ';';
}
str += '"></i>';
var title = str + '<font class="win-title-class">' + $this.attr('win-title') + '</font>';
var id = $this.attr('win-id');
var type = parseInt($this.attr('win-opentype'));
var maxOpen = parseInt($this.attr('win-maxopen')) || -1;
......
......@@ -19,7 +19,7 @@
<div class="winui-load-mation">
<div class="winui-load-mation-box">
<div class="load-title">
<font>天眼 正在启动</font>
<font>天眼 正在加载模块</font>
</div>
<div class="load-wait">
<font>请稍后</font>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册