Merge branch 'master' of yun.pashanhoo.com:renchao/portalStaticPage

任超
Showing 5 changed files with 79 additions and 20 deletions
views/gsgg/index.html
views/xwdt/css/index.css
views/xwdt/index.html
views/xwxq/css/index.css
views/xwxq/index.html
--- a/views/gsgg/index.html
View file @000cdd4
+++ b/views/gsgg/index.html
View file @000cdd4
@@ -244,8 +244,13 @@
 <script type="text/javascript" src="../../js/main.min.js?t=1"></script>
 <script type="text/javascript" src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
+    $(function () {
+        $('.gg').click(function () {
+            window.location.href = "./../ggxq/index.html"
+        })
+    })
    layui.use('laypage', function () {
-        var laypage = layui.laypage;
+        let laypage = layui.laypage;
        //执行一个laypage实例
        laypage.render({
            elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
--- a/views/xwdt/css/index.css
View file @000cdd4
+++ b/views/xwdt/css/index.css
View file @000cdd4
@@ -188,9 +188,9 @@ div.navigation {
    margin-top: 20px;
    text-align: center;
 }
 .right {
    width: 200px;
+    margin-top: 20px;
    margin-left: 15px;
 }
@@ -198,7 +198,6 @@ div.navigation {
    width: 100px;
    height: 18px;
    font-size: 18px;
-    font-family: PingFangSC-Medium, PingFang SC;
    font-weight: 500;
    color: #4A4A4A;
    line-height: 18px;
--- a/views/xwdt/index.html
View file @000cdd4
+++ b/views/xwdt/index.html
View file @000cdd4
@@ -271,3 +271,10 @@
        });
    });
 </script>
+<script type="text/javascript">
+    $(function () {
+        $('.xw').click(function () {
+            window.location.href = "./../xwxq/index.html";
+        })
+    })
+</script>
\ No newline at end of file
--- a/views/xwxq/css/index.css
View file @000cdd4
+++ b/views/xwxq/css/index.css
View file @000cdd4
@@ -5,10 +5,12 @@
 .main {
 }
-.mainbody{
+.mainbody {
    width: 1200px;
    margin: 0 auto;
 }
 /*================首页 start=====================*/
 div a {
    color: #000000;
@@ -26,6 +28,7 @@ div.subject {
    position: relative;
    min-width: 1200px;
 }
 /*新闻  */
 div.top-logo {
    width: 1200px;
@@ -44,24 +47,29 @@ div.top-logo ::-moz-placeholder { /* Mozilla Firefox 19+ */
 div.top-logo :-ms-input-placeholder { /* Internet Explorer 10+ */
    font-size: 13px;
 }
 .top_logo_content {
    height: 40px;
    width: 100%;
    margin: 0 auto;
 }
 div.top-logo .top_logo_search {
    float: left;
    width: 350px;
    position: relative;
    margin-left: 400px;
 }
 div.top-logo .top_logo_search input {
    border-radius: 50px;
 }
 div.top-logo .login {
    float: right;
    margin-top: 8px;
 }
 div.top-logo .top_logo_search i {
    position: absolute;
    right: 10px;
@@ -75,6 +83,7 @@ div.top-logo .top_logo_search i {
    display: inline-block;
    float: left;
 }
 /*------------------首页 end------------*/
 .top-logo ul li {
@@ -89,13 +98,15 @@ div.top-logo .top_logo_search i {
 div.navigation {
    text-align: center;
 }
 .navigation .layui-nav-item {
    width: 100px;
    position: relative;
    margin: 0 22px;
 }
 .layui-bg-blue {
-    background-color: #006CFF!important;
+    background-color: #006CFF !important;
 }
 .layui-nav-item:not(:first-child)::before {
@@ -108,7 +119,6 @@ div.navigation {
 }
 .title {
    height: 30px;
    font-size: 30px;
@@ -183,7 +193,6 @@ div.navigation {
 }
 .date div:nth-child(2) {
-    width: 61px;
    height: 24px;
    font-size: 24px;
    font-weight: 500;
@@ -192,7 +201,8 @@ div.navigation {
 }
 .left-right {
-    width: 830px;
+    width: 765px;
+    float: right;
 }
 .body {
@@ -276,7 +286,7 @@ div.navigation {
 }
 .layui-textarea {
-    width: 93%!important;
+    width: 93% !important;
 }
 .commentInput button {
@@ -288,6 +298,10 @@ div.navigation {
    margin-top: 20px;
 }
+.Commentdetails {
+    margin-bottom: 20px;
+}
 .CommentdetailsTitle {
    height: auto;
    margin-top: 20px;
@@ -389,7 +403,7 @@ div.navigation {
 .plhf-main {
    background-color: #F7F7F7;
    margin-top: 20px;
-    width: 800px;
+    width: 750px;
    margin-left: 15px;
 }
@@ -446,17 +460,17 @@ div.navigation {
    margin-left: 50px;
 }
-.right {
-    width: 400px;
-}
 .left, .right {
    float: left;
 }
+.left2{
+    width: 80px;
+    float: left;
+}
 .right {
    width: 200px;
    margin-left: 15px;
+    margin-top: 20px;
 }
 .right-top {
--- a/views/xwxq/index.html
View file @000cdd4
+++ b/views/xwxq/index.html
View file @000cdd4
@@ -25,10 +25,11 @@
        <div class="subject top-logo">
            <div class="top_logo_content">
-                <h1><a href="index.html"><img src="./../../images/logo.jpg" alt="西安市不动产登记平台" /></a></h1>
+                <h1><a href="index.html"><img src="./../../images/logo.jpg" alt="西安市不动产登记平台"/></a></h1>
                <div class="top_logo_search">
-                    <input type="text" name="title" required lay-verify="required" placeholder="请输入关键字搜索" autocomplete="off"
+                    <input type="text" name="title" required lay-verify="required" placeholder="请输入关键字搜索"
+                           autocomplete="off"
                           class="layui-input">
                    <i class="layui-icon layui-icon-search" style="font-size: 14px;"></i>
                </div>
@@ -65,9 +66,10 @@
                        <span>党的十八大以来双拥工作综述:为实现中国梦强军梦凝聚强大力量</span>
                    </div>
                </div>
+                <div class="left2">
                    <div class="left-left">
                        <div class="date">
-                        <div>2020</div>
+                            <div></div>
                            <div>10/27</div>
                            <div>20:53</div>
                        </div>
@@ -94,6 +96,7 @@
                            <div>评论图标</div>
                        </div>
                    </div>
+                </div>
                <div class="left-right">
                    <div class="body">
                <span>
@@ -222,8 +225,6 @@
                    </div>
                </div>
            </div>
-        </div>
            <div class="right">
                <div class="right-top">
                    <h2>新闻推荐</h2>
@@ -279,6 +280,8 @@
                </div>
            </div>
        </div>
+    </div>
    <div class="footer">
        <div class="system_service">
            <ul class="">
@@ -351,6 +354,13 @@
 </div>
 </body>
 </html>
+<style type="text/css">
+    .middle_active {
+        position: fixed;
+        top: 0;
+        z-index: 99;
+    }
+</style>
 <!--[if (gte IE 9)|!(IE)]><!-->
 <script type="text/javascript" src="../../lib/jquery/jquery.min.js"></script>
 <!--<![endif]-->
@@ -360,3 +370,27 @@
 <script type="text/javascript" src="../../lib/raty/jquery.raty.js"></script>
 <script type="text/javascript" src="../../js/main.min.js?t=1"></script>
 <script type="text/javascript" src="../../lib/layui/layui.js"></script>
+<script type="text/javascript">
+    $(window).scroll(function () {
+        let juli = $(document).scrollTop();
+        if (juli > 550) {
+            $('.left-left').addClass('middle_active');
+        } else {
+            $('.left-left').removeClass('middle_active');
+        }
+    })
+</script>
+<script type="text/javascript">
+    $(function () {
+        let Mydate = new Date()
+        let year = Mydate.getFullYear();
+        let minutes = Mydate.getMinutes()
+        let hour=Mydate.getHours();
+        let date = Mydate.getDate()
+        let month = Mydate.getMonth();
+        $('.date div:first-child').text(year)
+        $('.date div:nth-child(2)').text(month+1 + "/" + date)
+        $('.date div:last-child').text(hour+":"+minutes)
+    })
+</script>
\ No newline at end of file