Просмотр исходного кода

头部样式以及左侧树结构样式调整

hangb 7 лет назад
Родитель
Сommit
d28c8124c3

+ 9 - 4
src/main/webapp/resources/css/index.css

@@ -14,7 +14,11 @@ body {
 }
 }
 
 
 #top, #header, #footer {
 #top, #header, #footer {
-	min-width: 1170px;
+	min-width: 1190px;
+}
+#header{
+	padding-top: 20px;
+	background: #fff;
 }
 }
 
 
 #top .container {
 #top .container {
@@ -680,7 +684,8 @@ ul>li.item-link>a {
 /*header 顶部头*/
 /*header 顶部头*/
 #site-nav {
 #site-nav {
 	background-color: #474443;
 	background-color: #474443;
-	height: 36px;
+	height: 37px;
+	line-height: 37px;
 }
 }
 #site-nav>ul {
 #site-nav>ul {
 	list-style: none;
 	list-style: none;
@@ -707,7 +712,7 @@ ul>li.item-link>a {
 	vertical-align: middle;
 	vertical-align: middle;
 }
 }
 #site-nav ul li.uas-cloud a span {
 #site-nav ul li.uas-cloud a span {
-	margin-left: 0.5em;
+	margin-left: 5px;
 	vertical-align: middle;
 	vertical-align: middle;
 }
 }
 
 
@@ -715,7 +720,7 @@ ul>li.item-link>a {
 	color: rgb(230, 230, 230);
 	color: rgb(230, 230, 230);
 	text-decoration: none;
 	text-decoration: none;
 	display: inline-block;
 	display: inline-block;
-	line-height: 36px;
+	line-height: 37px;
 	padding: 0 1em;
 	padding: 0 1em;
 }
 }
 
 

+ 3 - 1
src/main/webapp/resources/js/index/app.js

@@ -24262,7 +24262,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             { "roleName" : "应付对账单", "roleId" : "role3-2-1", 'link' : '#/fa/arCheck', "children" : [] }
                             { "roleName" : "应付对账单", "roleId" : "role3-2-1", 'link' : '#/fa/arCheck', "children" : [] }
                         ]}
                         ]}
                 ]},
                 ]},
-            { "roleName" : "企业圈", "roleId" : "role4", 'link' : '#/baseInfo/myRequest', level: 0, "children" : [
+            { "roleName" : "企业圈", "roleId" : "role4", 'path': 'baseInfo', level: 0, collapsed: true, "children" : [
+                    { "roleName" : "我的合作伙伴", "roleId" : "role4-1-1", 'link' : '#/baseInfo/myRequest', "children" : [] },
+                    { "roleName" : "新的合作伙伴", "roleId" : "role4-1-2", 'link' : '#/baseInfo/newPartner', "children" : [] }
                 ]},
                 ]},
             { "roleName" : "基础设置", "roleId" : "role5", 'path': 'approvalFlow', collapsed: true, level: 0, "children" : [
             { "roleName" : "基础设置", "roleId" : "role5", 'path': 'approvalFlow', collapsed: true, level: 0, "children" : [
                     { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },
                     { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },

+ 1 - 1
src/main/webapp/resources/lib/treeview/css/angular.treeview.css

@@ -90,7 +90,7 @@ div.treeView>ul>li>div>ul>li>span{
   font-weight: bold;
   font-weight: bold;
   color: #666;
   color: #666;
 }
 }
-div.treeView>ul>li:nth-child(2)>div>ul>li>span,div.treeView>ul>li:nth-child(5)>div>ul>li>span{
+div.treeView>ul>li:nth-child(2)>div>ul>li>span,div.treeView>ul>li:nth-child(4)>div>ul>li>span,div.treeView>ul>li:nth-child(5)>div>ul>li>span{
   font-weight: normal;
   font-weight: normal;
 }
 }
 div.treeView>ul>li>div>ul>li>div>ul>li>span{
 div.treeView>ul>li>div>ul>li>div>ul>li>span{

+ 3 - 3
src/main/webapp/resources/tpl/index/common/header.html

@@ -3,7 +3,6 @@
 		height: 100px;
 		height: 100px;
 		width: 1190px;
 		width: 1190px;
 		margin: auto;
 		margin: auto;
-		margin-top: 20px;
 	}
 	}
 	#header .header-main > li {
 	#header .header-main > li {
 		display: inline-block;
 		display: inline-block;
@@ -41,6 +40,7 @@
 		margin-bottom: 10px;
 		margin-bottom: 10px;
 	}
 	}
 	#header .header-main .mall-search input.form-control, #header .header-main .mall-search button.btn-default {
 	#header .header-main .mall-search input.form-control, #header .header-main .mall-search button.btn-default {
+		width: 441px;
 		height: 40px;
 		height: 40px;
 		border: 2px solid #5078cb;
 		border: 2px solid #5078cb;
 		border-radius: 0;
 		border-radius: 0;
@@ -53,12 +53,12 @@
 	}
 	}
 	#header .header-main .mall-search .active-search {
 	#header .header-main .mall-search .active-search {
 		text-align: left;
 		text-align: left;
-		margin-top: 2px;
+		margin-top: 4px;
 	}
 	}
 	#header .header-main .mall-search .active-search .active-search-body .active-search-item {
 	#header .header-main .mall-search .active-search .active-search-body .active-search-item {
 		line-height: 20px;
 		line-height: 20px;
 		color: #ff0101;
 		color: #ff0101;
-		font-size: 13px;
+		font-size: 12px;
 		display: inline-block;
 		display: inline-block;
 		margin-right: 1em;
 		margin-right: 1em;
 	}
 	}

+ 3 - 1
src/main/webapp/resources/tpl/index/common/leftAll.html

@@ -56,5 +56,7 @@
 </div>
 </div>
 <!--应收宝-->
 <!--应收宝-->
 <!--<div class="jk">-->
 <!--<div class="jk">-->
-	<!--<img src="static/img/home/jingkong.png">-->
+	<!--<a href="http://www.yitoa-fintech.com/" target="_blank">-->
+		<!--<img src="static/img/home/jingkong.png">-->
+	<!--</a>-->
 <!--</div>-->
 <!--</div>-->

+ 1 - 1
src/main/webapp/resources/tpl/index/home/right.html

@@ -66,7 +66,7 @@
 	}
 	}
 	.toto-menu .row .content {
 	.toto-menu .row .content {
 		overflow: hidden;
 		overflow: hidden;
-		padding: 0 24px 91px;
+		padding: 0 24px 73px;
 		width: 100%;
 		width: 100%;
 	}
 	}
 	.toto-menu .row .content .item-list{
 	.toto-menu .row .content .item-list{