Procházet zdrojové kódy

Merge branch 'feature-201835-wangcz'

# Conflicts:
#	jpress-web-template-mallcms/src/main/webapp/templates/mallcms/_layout.html
wangcz před 7 roky
rodič
revize
ed948f3ddd

+ 4 - 0
jpress-web-template-mallcms/src/main/webapp/templates/mallcms/_layout.html

@@ -39,6 +39,10 @@
   </#if>
 </head>
 <body class="blog-body">
+    <!--top 公告-->
+    <div class="article-top">
+        公告:B2B商务和商城合并啦,<a href="https://mall.usoftchina.com/">【立即前往】</a>了解更多元化的服务体验!  <span>【关闭】</span>
+    </div>
     <!--header-->
     <div class="header">
         <div class="container">

+ 22 - 0
jpress-web-template-mallcms/src/main/webapp/templates/mallcms/assets/css/index.css

@@ -2324,6 +2324,28 @@ a.x_gray_text.x_more{
     color: #fff;
 }
 /*sidebar*/
+
+/* 头部公告样式 */
+.article-top{
+    position:relative;
+    line-height: 30px;
+    height:30px;
+    text-align: center;
+    color:#473D16;
+    font-size:12px;
+    background: #FFFABE;
+}
+.article-top span{
+    margin-left:40px;
+    cursor:pointer;
+}
+
+.article-top a{
+    cursor:pointer;
+    color:#E30011;
+    text-decoration:none;
+}
+
 /*返回顶部*/
 #sidebar .sidebar-content .go-top{
     margin-top: 8px;

+ 5 - 0
jpress-web-template-mallcms/src/main/webapp/templates/mallcms/assets/js/index.js

@@ -1,4 +1,9 @@
 $(function () {
+    // 公告关闭
+    $('.article-top span').click(function() {
+        $('.article-top').hide(500)
+    })
+
     // 自动轮播
     $('#myCarousel').carousel({
         interval: 5000