From ea16bc8b3b501c770c660c84b89987f181377b33 Mon Sep 17 00:00:00 2001
From: yangfangfang <yangfangfang@reyun.com>
Date: Tue, 13 Mar 2018 16:44:47 +0800
Subject: [PATCH] 公告修改
---
src/main/websrc/js/app/directive.js | 6 ++++++
src/main/websrc/styles/style.scss | 4 +++-
src/main/websrc/template/common/notice.html | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/websrc/js/app/directive.js b/src/main/websrc/js/app/directive.js
index 65badcb..f1f8e03 100644
--- a/src/main/websrc/js/app/directive.js
+++ b/src/main/websrc/js/app/directive.js
@@ -2079,6 +2079,12 @@
$scope.backList = function(){
$scope.isDetail = false;
}
+
+ angular.element(document).on("click",function(){
+ $scope.$apply(function(){
+ $scope.isLookList = false;
+ });
+ });
}
};
}
diff --git a/src/main/websrc/styles/style.scss b/src/main/websrc/styles/style.scss
index a2ad22e..3c0aeb7 100644
--- a/src/main/websrc/styles/style.scss
+++ b/src/main/websrc/styles/style.scss
@@ -6852,6 +6852,9 @@ pre{
color:#666;
font-weight: normal;
cursor: pointer;
+ &:hover{
+ text-decoration: underline;
+ }
}
em{
display: block;
@@ -6864,7 +6867,6 @@ pre{
i{visibility: visible;}
h6{
color:#333;
- text-decoration: underline;
}
}
}
diff --git a/src/main/websrc/template/common/notice.html b/src/main/websrc/template/common/notice.html
index 2242068..f5c1d4e 100644
--- a/src/main/websrc/template/common/notice.html
+++ b/src/main/websrc/template/common/notice.html
@@ -1,4 +1,4 @@
-<div class="noticeBox">
+<div class="noticeBox" stop-event>
<div class="newInfo" ng-if="noreadList.length>0 && !isLookList" ng-click="changeLook()"><i></i>您有{{noreadList.length}}条新公告</div>
<div class="noNewInfo" ng-if="noreadList.length==0 && !isLookList" ng-click="changeLook()"></div>
<div class="noticeWin" ng-if="isLookList && !isDetail">
@@ -16,7 +16,7 @@
<div class="hideNotice" ng-click="changeLook()"></div>
</div>
<div class="noticeWin" ng-if="isLookList && isDetail">
- <div class="winTitle small" ng-click="backList()">
+ <div class="winTitle small">
<div class="noticeBack" ng-click="backList()"></div>
<div class="photo"></div>热云数据运营团队
</div>
--
libgit2 0.27.1