Browse Source

公告调整、logo链接分离成两个

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7953 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
8ffcc032f5

+ 4 - 1
src/main/webapp/WEB-INF/views/normal/index.html

@@ -36,7 +36,10 @@
 	<div class="navbar navbar-inverse" id="header" ng-controller="MyCtrl">
 		<div class="container" style="padding: 0">
 			<div class="navbar-header">
-				<a href="#/index" class="navbar-brand"></a>
+				<span class="navbar-brand">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云"></a>
+					<a href="#/index" title="B2B平台"></a>
+				</span>
 			</div>
 			<nav class="navbar-collapse">
 				<ul class="nav navbar-nav">

+ 5 - 2
src/main/webapp/WEB-INF/views/normal/public.html

@@ -19,9 +19,12 @@
 <body>
 	<!-- header Start -->
 	<div class="navbar navbar-inverse" id="header">
-		<div class="container" style="padding: 0">
+		<div class="container" style="padding: 0; height: 50px; overflow: hidden;">
 			<div class="navbar-header">
-				<a href="/platform-b2b/#/index" class="navbar-brand"></a>
+				<span class="navbar-brand">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云"></a>
+					<a href="#/index" title="B2B平台"></a>
+				</span>
 			</div>
 			<div class="navbar-right">
 				<p class="navbar-text">

+ 4 - 1
src/main/webapp/WEB-INF/views/normal/serve.html

@@ -115,7 +115,10 @@
 	<div class="navbar navbar-inverse" id="header" ng-controller="MyCtrl">
 		<div class="container">
 			<div class="navbar-header">
-				<a href="./" class="navbar-brand"></a>
+				<span class="navbar-brand">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云"></a>
+					<a href="#/index" title="B2B平台"></a>
+				</span>
 			</div>
 			<nav class="navbar-collapse">
 				<ul class="nav navbar-nav">

+ 11 - 1
src/main/webapp/resources/css/index.css

@@ -901,8 +901,18 @@ ul>li.item-link>a {
 	background: url("../img/logo/logo.png") no-repeat center;
 	width: 218px;
 	margin: 0;
+	padding: 0;
+	line-height: 50px;
+}
+#header .navbar-header .navbar-brand a{
+	width: 44%;
+	float: left;
+	display: inline-block;
+	height: 50px;
+}
+#header .navbar-header .navbar-brand a:first-child{
+	width: 56%;
 }
-
 #header .dropdown:hover>.dropdown-menu {
 	margin-top: 0;
 }

+ 41 - 3
src/main/webapp/resources/css/serve.css

@@ -520,9 +520,20 @@ a.none:hover {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/ubtob.png") no-repeat;
-	width: 195px;
-	margin: 0
+	background: url("../img/logo/logo.png") no-repeat center;
+	width: 218px;
+	margin: 0;
+	padding: 0;
+	line-height: 50px;
+}
+#header .navbar-header .navbar-brand a{
+	width: 44%;
+	float: left;
+	display: inline-block;
+	height: 50px;
+}
+#header .navbar-header .navbar-brand a:first-child{
+	width: 56%;
 }
 
 #header .dropdown:hover>.dropdown-menu {
@@ -959,6 +970,33 @@ a.none:hover {
 	margin-left: 15px;
 	content: "|"
 }
+#footer .qrcode-text {
+	padding: 32px 0 0 20px;
+	font-size: 14px;
+}
+.back-home {
+	width: 100px;
+	height: 30px;
+	display: inline-block;
+	background: #05acd1;
+	font-size: 14px;
+	color: #fff;
+	text-align: center;
+	line-height: 30px;
+	border-radius: 5px;
+	float: right;
+	bottom: 40px;
+	position: relative;
+}
+#footer .col-sm-4 {
+	margin-top: 30px;
+}
+#footer .col-sm-4 p {
+	font-size: 14px;
+	line-height: 25px;
+	padding: 0;
+	margin: 0;
+}
 /*loading*/
 .loading {
 	display: none;

+ 1 - 1
src/main/webapp/resources/css/style.css

@@ -687,7 +687,7 @@ body {
 
 .box_list dl dd .jiantou:before {
 	content: "";
-	width: 26px;
+	width: 22px;
 	height: 8px;
 	display: inline-block;
 	background: url("../img/approvalFlow/inco_list.png") no-repeat;

+ 35 - 1
src/main/webapp/resources/tpl/public/info/notice.html

@@ -1,9 +1,43 @@
+<style>
+	.notice-container table tr,.notice-container table td{
+		background: #fff;
+		border-bottom: #e8e8e8 1px solid;
+		border-top: none !important;
+	}
+	.notice-container table tr td{
+		line-height: 40px;
+		padding: 0 10px;
+		vertical-align: middle;
+	}
+	.notice-container table tr:hover td{
+		background: #e8e8e8;
+	}
+	.notice-container table  thead{
+		display: none;
+	}
+	.ng-isolate-scope{
+		margin-right: 15px;
+	}
+	.body{
+		width: 1170px;
+		padding: 0;
+		margin-top: 20px;
+	}
+	.body .panel-body{
+		min-height: 680px;
+	}
+	@media screen and (max-width: 1366px){
+		.body .panel-body{
+			min-height: 560px;
+		}
+	}
+</style>
 <div class="body notice-container">
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h3 class="panel-title">系统公告</h3>
 		</div>
-		<div class="panel-body">
+		<div class="panel-body" style="padding: 0;">
 			<table class="table table-default table-striped table-hover"
 				ng-table="tableParams">
 				<tr ng-repeat="notice in $data track by notice.id">

+ 109 - 22
src/main/webapp/resources/tpl/public/info/notice_detail.html

@@ -1,11 +1,94 @@
-<style>
-	.body .block .row .left{
-		border-right: 1px solid #e8e8e8;
-		min-height: 460px;
-	}
-	.body .row .content li {
-		border-top: 1px solid #e8e8e8;
-	}
+<style>
+	.body .block .row .left{
+		border-right: 1px solid #e8e8e8;
+		min-height: 720px;
+	}
+	.body .block .row{
+		max-width: 1170px;
+		background: #fff;
+		min-height: 720px;
+		margin: 0;
+	}
+	@media screen and (max-width: 1366px){
+		.body .block .row .left,.body .block .row{
+			min-height: 600px;
+		}
+	}
+	.body .row .content li {
+		border-top: 1px solid #e8e8e8;
+		height: 80px;
+		padding: 0px 15px;
+	}
+	.body .row .content li:last-child{
+		border-bottom: 1px solid #e8e8e8;
+	}
+	.body .row .content li a{
+		height: 100%;
+		width: 100%;
+		display: inline-block;
+		padding-top: 10px;
+		font-size: 16px;
+	}
+	.body .row .content li a span{
+		font-size: 14px;
+		color: #999;
+	}
+	.body .row .content li a p{
+		font-size: 14px;
+		margin-top: 10px;
+	}
+	.body .row .content li a em{
+		max-width: 125px;
+		display: block;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		font-style: inherit;
+		float: left;
+
+	}
+	.body .row .content li a img{
+		margin-left: 5px;
+		vertical-align: inherit;
+	}
+	.body .row .content li:hover{
+		background: #e8e8e8;
+	}
+	.body .row .content li:hover a{
+		text-decoration: none;
+	}
+	.body .row .col-lg-4{
+		padding: 0;
+		width: 320px;
+	}
+	.body{
+		padding: 0;
+		margin-top: 20px;
+	}
+	.body .right{
+		padding-top: 15px;
+	}
+	.body .sign{
+		height: 80px;
+		line-height: 80px;
+	}
+	.body .sign span{
+		font-size: 20px;
+	}
+	.body .textNotice{
+		font-size: 16px;
+		line-height: 30px;
+	}
+	.body .pull-right span{
+		font-size: 14px;
+	}
+	.body .row .head h4{
+		font-size: 14px;
+		font-weight: bold;
+	}
+	.body .row .footer{
+		line-height: 50px;
+	}
 </style>
 <div class="body notice-container">
 	<div class="block doc">
@@ -13,35 +96,39 @@
 		<div class="content" ng-bind-html="::noticeBody.text"></div>
 		<div class="sign">商务平台团队<br><span ng-bind="::noticeBody.notice.date | date:'yyyy年MM月dd'"></span></div> -->
 		<div class="row">
-			<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 left">
+			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 left">
 				<div class=" head ">
 					<h4 class="text-center">最新公告</h4>
 				</div>
 				<div class="content">
-					<ul class="list-unstyled">
-						<li ng-repeat="notice in notices">
-							公告名称<span class="pull-right text-muted" ng-bind="::notice.date | date:'yyyy-MM-dd HH:mm'"></span> <br>
-							<a href="public#/notice/{{notice.id}}" ng-bind="::notice.title"></a>
+					<ul class="list-unstyled">
+						<li ng-repeat="notice in notices">
+							<a href="public#/notice/{{notice.id}}">
+								<em>公告名称</em><img src="resources/img/home/new.png"><span class="pull-right text-muted" ng-bind="::notice.date | date:'yyyy-MM-dd HH:mm'"></span> <br>
+								<p ng-bind="::notice.title"></p>
+							</a>
 						</li>
 					</ul>
 					<div class="footer" ng-if="notices.length > 10">
-						<a href="public#/notice" class="pull-right">查看更多<i
+						<a href="public#/notice" class="pull-right" style="margin-right: 15px;">查看更多<i
 							class="fa fa-angle-double-right" style="margin-left: 3px;"></i></a>
 					</div>
 				</div>
 			</div>
-			<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"></div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8 right">
-				<div class="pull-right text-muted"  ng-bind="::noticeBody.notice.date | date:'yyyy-MM-dd HH:mm'"></div><br>
-				<div class="sign text-center">
+			<!--<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"></div>-->
+			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8 right" style="width: 840px;">
+				<div class="col-sm-12">
+					<div class="pull-right text-muted"  ng-bind="::noticeBody.notice.date | date:'yyyy-MM-dd HH:mm'"></div><br>
+				</div>
+				<div class="col-sm-12 sign text-center">
 					<span class="title" ng-bind="::noticeBody.notice.title" ></span>
 				</div>
-				<div class="content textNotice" ng-bind-html="::noticeBody.text"></div>
+				<div class="col-sm-12 content textNotice" ng-bind-html="::noticeBody.text"></div>
 				<div class="photo">
 					<img width="670px" ng-src="{{::noticeBody.imgurl}}">
-				</div>
-				<div class="pull-right">
-					<span ng-bind="::noticeBody.notice.writer"></span>
+				</div>
+				<div class="pull-right">
+					<span ng-bind="::noticeBody.notice.writer"></span>
 				</div>
 			</div>
 		</div>