Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/index.html

@@ -146,10 +146,6 @@
                     <select-list meau-info="applistInfo" meau-id="appid" meau-data="appidInit" meau-refresh="appfresh" class="appWrap" icon-type="white" style="margin:0px;"></select-list>
                 </div>
               
-                <div ng-if="!preStatus" class="nociceInfo" ng-click="showNoticeWin()" ng-show="noticeList.length>0" ng-cloak>
-                    <span class="noticeNews" ng-class="{'noticeIcon':newNoticeInfo.isRead,'noticeNews':!newNoticeInfo.isRead}"></span>
-                    {{newNoticeInfo.title}}
-                </div>
              </div>
         </div>
         <div class="contentWrap">
@@ -177,22 +173,6 @@
                 </div>
             </div>
 
-            <div class="dialogDescWin noticeWin" ng-class="{'myNotice':showNoticew}">
-                <div class="dlgTitle">
-                   TrackingIO系统公告
-                    <div class="right closeGray" ng-click="hideNoticeWin()"></div>
-                </div>
-                <div class="dlgCnt">
-                    <div class="noticeItem" ng-repeat="news in noticeList track by $index">
-                        <div class="noticeTitle" ng-click="clickNotice(news)">
-                            <h6><span ng-class="{'redSpan':!news.isTop && !news.isRead,'noticeTopIcon':news.isTop}"></span>{{news.title}}</h6>
-                            <em>{{news.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}</em>
-                        </div>
-                        <div class="noticeContent" ng-bind-html="news.content | filterHtml" ng-if="curNoticeId==news.id"></div>
-                    </div>
-                </div>
-            </div>
-
             <div class="openTipWin" ng-if="tipCustom" ng-controller="collectCtrl" ng-cloak>
                 <div class="closeGray" ng-click="closeTip()"></div>
                 <div class="tipCont">

src/main/websrc/styles/style.scss

@@ -3647,9 +3647,7 @@ pre{
 	margin-bottom:20px;
 	padding-bottom:10px;
 }
-.dialogDescWin.noticeWin.myNotice, .dialogDescWin.addWin.myNotice{
-	display:block;
-}
+
 .noticeWin .dlgTitle{
 	height:52px;
 	text-align:left;
@@ -6911,10 +6909,10 @@ pre{
 
 			.noticeDetail{
 				padding-top: 22px;
-				h5{
+				.h5{
 					font-size:16px;
 				}
-				p{
+				.p{
 					color:#999999;
 				}
 				.noticeNews{

src/main/websrc/template/common/notice.html

@@ -22,11 +22,11 @@
     </div>
     <div class="winCont">
       <div class="noticeDetail">
-        <h5>{{curNoticeInfo.title}}</h5>
-        <p>{{curNoticeInfo.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}</p>
+        <div class="h5">{{curNoticeInfo.title}}</div>
+        <div class="p">{{curNoticeInfo.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}</div>
         <div class="noticeNews" ng-bind-html="curNoticeInfo.content | filterHtml"></div>
-        <div class="noticeLogo"></div>
       </div>
+      <div class="noticeLogo"></div>
     </div>
     <div class="hideNotice" ng-click="changeLook()"></div>
   </div>