Merge remote-tracking branch 'origin/master'

@@ -30,24 +30,56 @@ div.subject {
 /*新闻  */
 div.top-logo {
     width: 1200px;
+    height: 70px;
+    padding-top: 20px;
+}
+
+div.top-logo ::-webkit-input-placeholder { /* WebKit browsers */
+    font-size: 13px;
+  }
+  
+  div.top-logo ::-moz-placeholder { /* Mozilla Firefox 19+ */
+    font-size: 13px;
+  }
+  
+  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;
+    top: 11px;
+    cursor: pointer;
+}
+
 /*end*/
 
 .top-logo h1 {
     display: inline-block;
-    padding: 21px 0;
-}
-
-.top-logo ul {
-    list-style: none;
-    float: right;
-    clear: right;
-    margin-top: 33px;
+    float: left;
 }
 /*------------------首页 end------------*/
 
 .top-logo ul li {
-    float: left;
+    display: inline-block;
     padding: 0 8px;
 }
 
@@ -55,16 +87,25 @@ div.top-logo {
     border-right: 1px solid grey;
 }
 
-div.nav {
-    width: 100%;
-    background: #006cff;
+div.navigation {
     text-align: center;
 }
+.navigation .layui-nav-item {
+    width: 100px;
+    position: relative;
+    margin: 0 22px;
+}
+.layui-bg-blue {
+    background-color: #006CFF!important;
+}
 
-div.nav ul {
-    list-style: none;
-    width: 1200px;
-    display: inline-block;
+.layui-nav-item:not(:first-child)::before {
+    content: '';
+    position: absolute;
+    height: 22px;
+    border-left: 1px solid #ccc;
+    top: 21px;
+    left: -20px;
 }
 
 div.nav ul li {
@@ -72,6 +113,7 @@ div.nav ul li {
     margin: 21px auto;
     width: 149px;
     border-left: 1px solid #3389ff;
+    cursor: pointer;
 }
 
 div.nav ul li:first-child {
@@ -93,18 +135,32 @@ div.banner, div.c_one, div.c_two, div.c_three, div.c_four, div.c_five, div.foote
 }
 
 div.banner {
-    background: yellow;
     height: 500px;
+    background-color: #7ed74e;
+    position: relative;
+}
+
+.banner .swiper_img {
+    width: 100%;
+    height: 100%;
+}
+
+.banner .banner_title {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 50px;
+    margin: auto;
 }
 
-div.banner ul {
+div.banner .banner_title {
     list-style: none;
     width: 1200px;
     display: inline-block;
     margin-top: 350px;
 }
 
-div.banner ul li {
+div.banner .banner_title li {
     width: 250px;
     height: 100px;
     background-color: #ffffff;
@@ -123,7 +179,47 @@ div.banner ul li a {
     cursor: pointer;
 }
 
+/* ---------------法律法规 start----------------------- */
+.laws_regulations {
+    width: 1200px;
+    margin: 0 auto;
+    padding: 60px 0;
+}
+.laws_regulations .regulations, .policy {
+    border-radius: 2px;
+    width: 48%;
+    height: 370px;
+    border: 1px solid #DEDEDE;
+}
+.laws_regulations .policy{
+    float: right;
+    padding-right: 5px;
+}
+
+.laws_regulations .regulations{
+    float: left;
+    padding-left: 5px;
+}
+.laws_regulations .regulations h2 a{
+    display: block;
+    padding: 20px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #E6E6E6;
+}
+.laws_regulations .regulations h2 a p{
+    font-weight: 600;
+    color: #4A4A4A;
+    line-height: 20px;
+}
+.laws_regulations .regulations h2 i{
+    font-style: normal;
+    float: right;
+    font-size: 14px;
+    color: #9B9B9B;
+    line-height: 14px;
+}
 
+/* ---------------end----------------------- */
 div.c_one {
 }
 
@@ -267,7 +363,7 @@ div.c_two ul li {
     overflow: hidden;
     margin-left: 2.88%;
     padding: 40px 36px;
-    border: 2px solid #e3e3e3;
+    border: 1px solid #E6E6E6;
 }
 
 div.c_two ul li:first-child {

@@ -28,6 +28,15 @@
                 <div>条目5</div>
             </div>
         </div>
+        <div class="layui-carousel" id="test1">
+            <div carousel-item>
+                <div>条目1</div>
+                <div>条目2</div>
+                <div>条目3</div>
+                <div>条目4</div>
+                <div>条目5</div>
+            </div>
+        </div>
         <div id="test1"></div>
         <button type="button" class="layui-btn">一个标准的按钮</button>
     </div>
@@ -63,4 +72,14 @@
             , count: 50 //数据总数，从服务端得到
         });
     });
+    layui.use('carousel', function () {
+        var carousel = layui.carousel;
+        //建造实例
+        carousel.render({
+            elem: '#test1'
+            , width: '100%' //设置容器宽度
+            , arrow: 'always' //始终显示箭头
+            //,anim: 'updown' //切换动画方式
+        });
+    });
 </script>
\ No newline at end of file