公告页面布局修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2724 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/Notice.java

@@ -43,7 +43,13 @@ public class Notice {
 	 */
 	@Column(name = "no_title")
 	private String title;
-
+	
+	/**
+	 * 公告发起人
+	 */
+	@Column(name = "no_writer")
+	private String writer;
+	
 	public Long getId() {
 		return id;
 	}
@@ -67,4 +73,12 @@ public class Notice {
 	public void setTitle(String title) {
 		this.title = title;
 	}
+	
+	public String getWriter() {
+		return writer;
+	}
+
+	public void setWriter(String writer) {
+		this.writer = writer;
+	}
 }

src/main/java/com/uas/platform/b2b/model/NoticeBody.java

@@ -32,7 +32,12 @@ public class NoticeBody {
 	 */
 	@Column(name = "nb_text")
 	private String text;
-
+	/**
+	 * 图片
+	 */
+	@Column(name = "nb_imgurl")
+	private String imgurl;
+ 	
 	@OneToOne(cascade = { CascadeType.ALL })
 	@JoinColumn(name = "nb_noid")
 	private Notice notice;
@@ -58,7 +63,15 @@ public class NoticeBody {
 	public void setText(String text) {
 		this.text = text;
 	}
+	
+	public String getImgurl() {
+		return imgurl;
+	}
 
+	public void setImgurl(String imgurl) {
+		this.imgurl = imgurl;
+	}
+	
 	public Notice getNotice() {
 		return notice;
 	}

src/main/webapp/resources/css/public.css

@@ -165,17 +165,53 @@ h1,h2,h3 {
 }
 
 .notice-container .doc {
-	padding: 90px 75px;
+	padding: 50px 75px;
 }
 
-.notice-container .doc .title {
-	padding-bottom: 42px;
-  	text-align: center;
-  	font-size: 18px;
+.notice-container .doc .row .title {
+ 	text-align: center;
+  	font-size: 20px;
+  	font-weight:bold;
+  	margin-bottom:3%;
+}
+.notice-container .doc hr{
+	border:none;
+	border-top:1px solid #B8B9B8;
+}
+
+.notice-container .doc .row .left .textNotice{
+	text-align:justify;
+}
+
+.notice-container .doc .photo{
+	padding-top: 10px;
+	margin: 5%  auto;
+	text-align: center;
+}
+
+.notice-container .doc .row .right{
+	background-color: #EFEFEF;
+	padding: 50px 20px;
+    line-height: 30px;
+	border: solid 1px #cccccc;
+	height: 400px;
+}
+
+.notice-container .doc .row .right .head h4{
+	display: inline;
+	font-family:"Microsoft YaHei";
+	font-weight:nobold;
+}
+
+.notice-container .doc .row .right .content .list-unstyled{
+	margin-top: 10px;
+}
+
+.notice-container .doc .row .right .footer{
+	float: right;
 }
 
 .notice-container .doc .sign {
-	padding-top: 28px;
   	text-align: right;
 }
 

src/main/webapp/resources/js/public/app.js

@@ -42,10 +42,13 @@ define([ 'toaster', 'ngTable', 'common/services', 'service/Info', 'ui.router', '
 			}
 		});
 	}]);
-	app.controller('NoticeDetailCtrl', ['$scope', 'Notice', '$stateParams', function($scope, Notice, $stateParams){
+	app.controller('NoticeDetailCtrl', ['$scope', 'Notice', '$stateParams','SnapshotService', function($scope, Notice, $stateParams,SnapshotService){
 		Notice.get({id: $stateParams.id}, function(data){
 			$scope.noticeBody = data;
 		});
+		SnapshotService.getNotice(5, function(data){
+			$scope.notices = data;
+		});
 	}]);
 	return app;
 });

src/main/webapp/resources/tpl/public/info/notice_detail.html

@@ -1,7 +1,39 @@
 <div class="body notice-container">
 	<div class="block doc">
-		<div class="title" ng-bind="::noticeBody.notice.title"></div>
+		<!-- <div class="title" ng-bind="::noticeBody.notice.title"></div>
 		<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>
-</div>
+		<div class="sign">商务平台团队<br><span ng-bind="::noticeBody.notice.date | date:'yyyy年MM月dd'"></span></div> -->
+		<div class="row">
+			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8 left">
+				<div class="title" ng-bind="::noticeBody.notice.title"></div>
+				<div class="sign">
+					<span ng-bind="::noticeBody.notice.date | date:'yyyy年MM月dd'"></span>&nbsp;&nbsp;&nbsp;&nbsp;来自：<span
+						ng-bind="::noticeBody.notice.writer"></span>
+				</div>
+				<div>
+					<hr />
+				</div>
+				<div class="content textNotice" ng-bind-html="::noticeBody.text"></div>
+				<div class="photo">
+					<img width="670px" ng-src="{{::noticeBody.imgurl}}">
+				</div>
+			</div>
+			<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"></div>
+			<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 right">
+				<div class=" head ">
+					<h4>最新公告：</h4>
+				</div>
+				<div class="content">
+					<ul class="list-unstyled">
+						<li ng-repeat="notice in notices"><a
+							href="public#/notice/{{notice.id}}" ng-bind="::notice.title"
+							target="_blank"> </a></li>
+					</ul>
+					<div class="footer">
+						<a href="public#/notice">查看更多<i
+							class="fa fa-angle-double-right" style="margin-left: 3px;"></i></a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>