Skip to content

T
tl_estate
Commit 91e3856e authored by zw's avatar zw
Browse files
Options

Merge branch 'dxy' into test

parents 46b25d44 966b5457
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 64 deletions
application/index/view/global/frame_tpl.html
View file @ 91e3856e
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-us"> <html lang="en-us">
<head> <head>
<link rel="icon" href="/favicon.ico" type="image/x-icon"> <link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
{include file="global/header_tpl" /} {include file="global/header_tpl" /}
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
.hideBtn2{ .hideBtn2{
position: relative; position: relative;
right:1px; right:1px;
/*border-top: 0px solid transparent;
border-bottom: 20px solid transparent;
border-right: 0px solid #ff9419;
border-left: 22px solid #ff9419 ; */
border-top: 0px solid transparent; border-top: 0px solid transparent;
border-bottom: 0px solid transparent; border-bottom: 0px solid transparent;
border-right: 20px solid #ff9419; border-right: 20px solid #ff9419;
...@@ -65,12 +61,8 @@ ...@@ -65,12 +61,8 @@
background-color:rgba(255,255,255) !important; background-color:rgba(255,255,255) !important;
color:#333333 !important; color:#333333 !important;
opacity: 30% !important; opacity: 30% !important;
/*padding-top:0px;*/
/*padding-bottom:0px;*/
} }
.c-user{ .c-user{
/*padding-top:0px;*/
/*padding-bottom:0px;*/
border: none ; border: none ;
box-shadow: 0 0px 22px -9px ; box-shadow: 0 0px 22px -9px ;
} }
...@@ -79,10 +71,7 @@ ...@@ -79,10 +71,7 @@
.c-user li a:focus, .c-user li a:focus,
.c-user>li>a:hover { .c-user>li>a:hover {
background-color:#cccccc !important; background-color:#cccccc !important;
color:#333333 !important; color:#333333 !important;
/*padding-bottom:0px;*/
/*padding-top:0px;*/
} }
.new_btn{ .new_btn{
...@@ -109,30 +98,18 @@ ...@@ -109,30 +98,18 @@
background-color: #F8F9FB !important; background-color: #F8F9FB !important;
} }
</style> </style>
</head> </head>
<body style="margin: 0 auto !important"> <body>
<div class="navbar" style="background: #FF750E !important;" id="headTileNavBar">
<div class="navbar" style="background: #FF750E !important;">
<div class="container-fluid"> <div class="container-fluid">
<a class="brand"> <a class="brand">
<i><img src="/resource/image/logo@1x.png" class="houtai_footer_icon1"></i> <i><img src="/resource/image/logo@1x.png" class="houtai_footer_icon1"></i>
<!--<span class="hidden-phone">同联商业后台管理中心</span>-->
</a> </a>
</div> </div>
<!--<select class="form-control btn2-city ld-Marheight-city" id="user_city_choose">
<option value="310100">上海市</option>
<option value="330100">杭州市</option>
</select>-->
<i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i> <i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i>
<select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled"> <select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled"> </select>
</select>
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-default dropdown-toggle new_btn" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"></button>
<button class="btn btn-default dropdown-toggle new_btn" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
</button>
<!--<span class="caret"></span>-->
<i><img src="/resource/image/Path20@1x.png" class="down_control"></i> <i><img src="/resource/image/Path20@1x.png" class="down_control"></i>
<ul class="dropdown-menu c-user" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu c-user" aria-labelledby="dropdownMenu1">
<li><a href="#">修改密码</a></li> <li><a href="#">修改密码</a></li>
...@@ -140,23 +117,17 @@ ...@@ -140,23 +117,17 @@
<li><a href="/index/logout" id="logout">退出登录</a></li> <li><a href="/index/logout" id="logout">退出登录</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<div id="hide_menu" class="" style="width:25px;display:inline;position:absolute;z-index:10000;top:80px;left:0px;">
<!--<div id="hideLine" style="width:2px;height:80px;background-color: #000000;float:left;display:inline;display:none"></div> <div class="width-136-hide hideBtn1" style="text-align:center;">
--><!--添加隐藏按钮-->
<div id="hide_menu" class="" style="width:2%;display:inline;position:absolute;z-index:10000;top:80px;left:0px;">
<div class="width-136-hide hideBtn1" style=";text-align:center;">
<div style="width:100%;"><img src="/resource/image/-@1x.png" style="width:14px;height:14px;margin-left:6px;margin-top:14px" class="houtai_footer_icon1"></div> <div style="width:100%;"><img src="/resource/image/-@1x.png" style="width:14px;height:14px;margin-left:6px;margin-top:14px" class="houtai_footer_icon1"></div>
<span style="position:absolute;left:6px;top:34px">隐藏</span> <span style="position:absolute;left:6px;top:34px">隐藏</span>
<!--<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>-->
</div> </div>
</div> </div>
<div id="wrapper" style="width:100% !important;float:left !important;display:inline"> <div id="wrapper" style="width:100% !important;float:left !important;display:inline">
{__CONTENT__} {__CONTENT__}
{include file="global/footer_tpl" /} {include file="global/footer_tpl" /}
</div> </div>
</body>
</body>
</html> </html>
application/index/view/main_index/main_index.html
View file @ 91e3856e
...@@ -3,15 +3,11 @@ ...@@ -3,15 +3,11 @@
<input type="hidden" class="page-load" id="mainIndex" /> <input type="hidden" class="page-load" id="mainIndex" />
<style> <style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/ /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
html{ html{
font-size:640%; font-size:640%;
/*overflow:hidden !important;*/ overflow:scroll !important;
padding: 0 15px; padding: 0 15px;
} }
body {
overflow: hidden;;
}
.container{ .container{
width: 100%; width: 100%;
height:100%; height:100%;
...@@ -28,8 +24,9 @@ ...@@ -28,8 +24,9 @@
} }
#mainFrameTabs { #mainFrameTabs {
padding-left:1%; padding-left:1%;
width:86%; width:87%;
overflow-y: scroll; overflow-y: scroll;
background-color: #ffffff;
} }
.nav-tabs { .nav-tabs {
border : none ; border : none ;
...@@ -58,8 +55,6 @@ ...@@ -58,8 +55,6 @@
height: 820px!important; height: 820px!important;
overflow-y: auto; overflow-y: auto;
} }
/* 左侧目录标签的滚动条样式 */ /* 左侧目录标签的滚动条样式 */
#mainFrameTabs::-webkit-scrollbar-track{ #mainFrameTabs::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
...@@ -67,7 +62,7 @@ ...@@ -67,7 +62,7 @@
} }
/* 滚动条的滑轨背景颜色 */ /* 滚动条的滑轨背景颜色 */
#mainFrameTabs::-webkit-scrollbar{ #mainFrameTabs::-webkit-scrollbar{
width: 4px !important; width: 0px ;
background-color: #FF2F2F !important; background-color: #FF2F2F !important;
} }
/* 滑块颜色 */ /* 滑块颜色 */
...@@ -88,15 +83,9 @@ ...@@ -88,15 +83,9 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px" src="/index/PerformanceRanking"> <iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px" src="/index/PerformanceRanking">
</iframe> </iframe>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--加载图标-->
<!--<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div>-->
public/resource/css/public.css
View file @ 91e3856e
...@@ -17,12 +17,12 @@ iframe > html > body { ...@@ -17,12 +17,12 @@ iframe > html > body {
padding:0px; padding:0px;
} }
/*适配 不同屏幕*/ /*适配 不同屏幕*/
@media (min-width:1680px){ /*@media (min-width:1680px){
body{ body{
width:1560px !important; width:1560px !important;
}; };
} }*/
html { html {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
...@@ -31,6 +31,12 @@ html { ...@@ -31,6 +31,12 @@ html {
a:hover{ a:hover{
text-decoration:none; text-decoration:none;
} }
#headTileNavBar{
background: #FF750E !important;
width: 100%;
height: 40px;
margin-bottom: 15px!important;
}
.navbar{ .navbar{
background: #ff9419; background: #ff9419;
width: 100%; width: 100%;
...@@ -93,7 +99,8 @@ a:hover{ ...@@ -93,7 +99,8 @@ a:hover{
padding-left: 0; padding-left: 0;
/*height: 1300px;*/ /*height: 1300px;*/
transition: all 0.5s ease; transition: all 0.5s ease;
width: 98%!important; /*width: 98%!important;*/
display:inline-block
} }
#wrapper.toggled { #wrapper.toggled {
} }
...@@ -114,10 +121,12 @@ a:hover{ ...@@ -114,10 +121,12 @@ a:hover{
overflow-y: auto; overflow-y: auto;
/*transition: all 0.5s ease;*/ /*transition: all 0.5s ease;*/
/*width: 136px;*/ /*width: 136px;*/
width: 13%; width: 10%;
min-width : 165px;
z-index: 1000; z-index: 1000;
float: left; float: left;
height: 820px; height: 820px;
display:inline
/*animation: show-mulu-action 1.3s;*/ /*animation: show-mulu-action 1.3s;*/
/*目录显示的动画效果（from透明 to 全部显示，用时1.5秒）*/ /*目录显示的动画效果（from透明 to 全部显示，用时1.5秒）*/
} }
......
public/resource/js/mainIndex.js
View file @ 91e3856e
...@@ -16,11 +16,18 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -16,11 +16,18 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
var that = this ; var that = this ;
//只在首页显示 菜单 //只在首页显示 菜单
var height1 = $("html").height(); var height1 = $("html").height();
var height = $("html").height() -120+ "px !important" ; var height = $("html").height() -80+ "px !important" ;
// $('.tab-content').attr("style","height:"+height);
$('#mainFrameTabs').attr("style","height:"+height); $('#mainFrameTabs').attr("style","height:"+height);
$('#sidebar-wrapper').attr("style","height:"+height);
var sceenWidth = window.screen.width < 1200 ? 1200 : window.screen.width ;
var width = sceenWidth - $('#sidebar-wrapper').width() + "px !important";
var sceen = sceenWidth+ "px !important";
$('#mainFrameTabs').attr("style","min-width:959px !important");
$('#wrapper').attr("style","min-width:"+sceen );
$('#headTileNavBar').attr("style","min-width:"+sceen);
menu_bar(function(){ menu_bar(function(){
//回调部分 //回调部分
//记录tab的点击状态，对应的标签内容展开，并高亮显示 //记录tab的点击状态，对应的标签内容展开，并高亮显示
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment