Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/hqzc/layui/css/modules/code.css

@@ -0,0 +1 @@
+html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view .layui-code-ol li:first-child{padding-top:10px}.layui-code-view .layui-code-ol li:last-child{padding-bottom:10px}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}

nngkxxdp/src/main/resources/static/hqzc/navigation.css

@@ -55,10 +55,9 @@ li {
 
 .line {
     width: 100%;
-    height: 2px;
-    border: 1px solid #666666;
+    height: 1px;
     opacity: 0.2;
-    margin-top: 20px;
+    margin-top: 10px;
     background-color: #666666;
 }
 
@@ -79,13 +78,12 @@ li {
 }
 
 .center {
-    margin:auto;
+    margin: auto;
     width: 100%;
     background-color: #ffffff;
 }
 
 .nav {
-    width: 200px;
     padding: 0 23px;
 }
 
@@ -100,10 +98,10 @@ li {
 }
 
 .nav .nav-line {
-    width: 89px;
-    height: 8px;
+    width: 45px;
+    height: 4px;
     background: #1D498E;
-    margin-top: 18px;
+    margin: 9px 0 0 22px;
 }
 
 .hqdh {
@@ -117,12 +115,18 @@ li {
     align-items: center;
 }
 
+.hqdh-fold {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
 .hqdh .hqdh-nav .hqdh-title {
-    font-size: 13px;
+    font-size: 14px;
     font-family: PingFang SC;
-    font-weight: 400;
+    font-weight: 600;
     color: #333333;
-    line-height: 60px;
+    line-height: 31px;
 }
 
 .hqdh .hqdh-nav .hqdh-fold span {
@@ -132,6 +136,7 @@ li {
     color: #666666;
     line-height: 60px;
     cursor: pointer;
+    margin-right: 10px;
 }
 
 .hqdh .hqdh-content {
@@ -141,7 +146,7 @@ li {
 }
 
 .hqdh .hqdh-content.up {
-    height: 80px;
+    height: 40px;
     overflow: hidden;
 }
 
@@ -151,11 +156,11 @@ li {
 }
 
 .hqdh .hqdh-content .type-item p {
-    margin-right: 39px;
+    margin-right: 10px;
     font-size: 12px;
     font-family: PingFang SC;
     font-weight: 400;
-    line-height: 60px;
+    line-height: 20px;
     cursor: pointer;
 }
 
@@ -173,6 +178,7 @@ li {
     justify-content: space-between;
     align-items: center;
     background: #EFEFEF;
+    padding-left: 10px;
 }
 
 .hqsx-title-left {
@@ -229,7 +235,7 @@ li {
 }
 
 .hqsx dl {
-    margin-bottom: 39px;
+    margin-bottom: 10px;
 }
 
 .hqsx dl.on {
@@ -259,7 +265,7 @@ li {
     font-family: PingFang SC;
     font-weight: 400;
     color: #333333;
-    line-height: 60px;
+    line-height: 30px;
 }
 
 .hqsx dl dt p.on {
@@ -267,8 +273,8 @@ li {
 }
 
 .hqsx dl dt img {
-    width: 18px;
-    height: 29px;
+    width: 12px;
+    height: 16px;
 }
 
 .hqsx dl dd {
@@ -277,9 +283,9 @@ li {
 }
 
 .hqsx dl dd div {
-    margin-top: 20px;
     display: flex;
     justify-content: start;
+    margin-top: 20px;
 }
 
 .hqsx dl dd div p {
@@ -298,7 +304,7 @@ li {
     font-family: PingFang SC;
     font-weight: 400;
     color: #333333;
-    line-height: 60px;
+    line-height: 37px;
 }
 
 .hqsx dl dd>p {
@@ -306,18 +312,18 @@ li {
     font-family: PingFang SC;
     font-weight: 400;
     color: #999999;
-    margin-top: 20px;
 }
 
 .footer {
     padding: 0 23px;
     display: flex;
     justify-content: space-between;
+    align-items: baseline;
 }
 
-.footer button{
+.footer button {
     width: 82px;
-    line-height: 65px;
+    line-height: 36px;
     background: #FFFFFF;
     border: 1px solid #E0E0E0;
     border-radius: 10px;
@@ -330,7 +336,6 @@ li {
 }
 
 .footer>div:nth-child(2) {
-    line-height: 65px;
     font-size: 13px;
     font-family: PingFang SC;
     font-weight: 400;
@@ -346,4 +351,29 @@ li {
     text-align: center;
     margin-right: 19px;
     cursor: pointer;
+}
+
+#laypage {
+    text-align: center;
+}
+
+.layui-box {
+    width: 100%;
+}
+
+.layui-box a {
+    border-radius: 5px !important;
+}
+
+.layui-laypage-prev {
+    margin-right: 10px !important;
+}
+
+.layui-laypage-next {
+    margin-left: 10px !important;
+}
+
+.layui-laypage-em {
+    background-color: #004a93 !important;
+    border-radius: 5px !important;
 }

nngkxxdp/src/main/resources/static/hqzc/navigation.html

@@ -6,6 +6,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=0.5">
     <link rel="stylesheet" href="./navigation.css">
+    <link rel="stylesheet" href="./layui/css/layui.css">
+    <script src="./layui/layui.js"></script>
     <script src="./jquery-3.6.1.js"></script>
     <title>惠企导航</title>
 </head>
@@ -163,7 +165,8 @@
 
             <div class="hqsx"></div>
 
-            <div class="footer"></div>
+            <!-- <div class="footer"></div> -->
+            <div id="laypage"></div>
         </div>
     </div>
 </body>
@@ -244,8 +247,8 @@
         if (target.nodeName == 'P') {
             if (target.className == 'active') {
                 target.className = 'deActive'
-                zzbm=''
-            }else{
+                zzbm = ''
+            } else {
                 target.className = 'active'
                 zzbm = target.innerHTML
             }
@@ -277,13 +280,13 @@
         $('.hqsx dl dt').removeClass('on')
         $('.hqsx dl dt p').removeClass('on')
         $('.hqsx dl dt p').addClass('deploiement')
-        $('.hqsx dl dt img').attr('src', './image/zclx-right.png').css('width', '18px').css('height', '29px')
+        $('.hqsx dl dt img').attr('src', './image/zclx-right.png').css('width', '12px').css('height', '16px')
         if ($(this).attr('active')) {
             $(this).next().show()
             $(this).addClass('on')
             $(this).children('p').addClass('on')
             $(this).children('p').removeClass('deploiement')
-            $(this).children('img').attr('src', './image/zclx-bottom.png').css('width', '28px').css('height', '15px')
+            $(this).children('img').attr('src', './image/zclx-bottom.png').css('width', '19px').css('height', '9px')
             $(this).parent().addClass('on')
             $('html,body').animate({ scrollTop: $(this).offset().top }, 100);
         } else {
@@ -296,21 +299,21 @@
     })
 
     //分页事件
-    $('.footer').on('click', 'button', function (e) {
-        var event = e || window.event
-        var target = e.target
-        if (target.innerHTML == '上一页') {
-            if (page > 1) {
-                page -= 1
-            }
-            getData()
-        } else {
-            if (page > 0 && page < Math.ceil(total / limit)) {
-                page += 1
-            }
-            getData()
-        }
-    })
+    // $('.footer').on('click', 'button', function (e) {
+    //     var event = e || window.event
+    //     var target = e.target
+    //     if (target.innerHTML == '上一页') {
+    //         if (page > 1) {
+    //             page -= 1
+    //         }
+    //         getData()
+    //     } else {
+    //         if (page > 0 && page < Math.ceil(total / limit)) {
+    //             page += 1
+    //         }
+    //         getData()
+    //     }
+    // })
 
     //获取数据
     function getData() {
@@ -331,14 +334,14 @@
 
                     //渲染分页
                     total = res.count
-                    if(total==0){
-                        $('.footer').hide()
-                    }else{
-                        $('.footer').show()
-                    }
-                    var pageHtml = "";
-                    pageHtml += '<button id="prev">上一页</button><div><span style="color:#004a93">' + page + '</span><span>/ ' + Math.ceil(res.count / limit) + '</span></div><button id="next">下一页</button>'
-                    $('.footer').html(pageHtml)
+                    // if (total == 0) {
+                    //     $('.footer').hide()
+                    // } else {
+                    //     $('.footer').show()
+                    // }
+                    // var pageHtml = "";
+                    // pageHtml += '<button id="prev">上一页</button><div><span style="color:#004a93">' + page + '</span><span>/ ' + Math.ceil(res.count / limit) + '</span></div><button id="next">下一页</button>'
+                    // $('.footer').html(pageHtml)
 
                     //渲染列表
                     var html = "";
@@ -399,6 +402,22 @@
         });
     }
 
+    setTimeout(() => {
+        //渲染分页
+        layui.use(['laypage', 'layer'], function () {
+            var laypage = layui.laypage,
+                layer = layui.layer;
+            laypage.render({
+                elem: 'laypage', count: total, limit: limit, groups: 2,
+                jump: function (obj) {
+                    console.log(obj);
+                    page = obj.curr
+                    getData()
+                }
+            });
+        });
+    }, 500);
+
     //选择条件
     function clickCheckbox() {
         page = 1