From 1e2723460a7e0274f159738931ae1e1e67307306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 25 Apr 2025 17:34:48 +0800
Subject: [PATCH] =?UTF-8?q?task=2043078=20=E5=9B=9B=E8=AE=AE=E4=B8=A4?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infoport/discussions.html                 | 259 ++++++++++------------
 infoport/static/js/project/discussions.js |  33 ++-
 2 files changed, 150 insertions(+), 142 deletions(-)

diff --git a/infoport/discussions.html b/infoport/discussions.html
index 3e519e0..05cc914 100644
--- a/infoport/discussions.html
+++ b/infoport/discussions.html
@@ -69,7 +69,7 @@
 
         <div class="new" style="height: 56vh;">
 
-            <div id="loginF" style="display: none;width: 100%;">
+            <div id="loginF" style="display: flex;width: 100%;">
                 <div class="login_form_main">
                     <img src="./static/images/sunVillage_info_login_code_header.png" alt="">
                     <div class="login_from">
@@ -94,169 +94,156 @@
 
                     </div>
                 </div>
-
-                <div class="personalTit-banner">
-                    <div class="swiper-container" id="bannerFocusNextWrap">
-                        <div class="swiper-wrapper" id="bannerFocusNextContent">
-                            <script id="newListDataImg" type="text/html">
-                                {{if newImgList.length>0}}
-                                    {{each newImgList as value i}}
-                                    <div class="swiper-slide">
-                                        <a href="#"><img src="/api{{value}}" alt=""></a>
-                                    </div>
-                                    {{/each}}
-                                {{else}}
-                                    <div class="swiper-slide">
-                                        <a href="#"><img src="static/images/news2.jpg" alt=""></a>
-                                    </div>
-                                {{/if}}
-                            </script>
-                        </div>
-                        <div class="page-pagination a2"></div>
-                    </div>
-                </div>
+                <img src="static/images/news2.jpg" alt="">
             </div>
 
-            <div class="tab_box">
-
-                <img src="./static/images/index_code_btn_1.png" alt="" onclick="changeList('1')">
-                <img src="./static/images/index_code_btn_2.png" alt="" onclick="changeList('2')">
-                <img src="./static/images/index_code_btn_3.png" alt="" onclick="changeList('3')">
-                <img src="./static/images/index_code_btn_4.png" alt="" onclick="changeList('4')">
-                <img src="./static/images/index_code_btn_5.png" alt="" onclick="changeList('5')">
-                <img src="./static/images/index_code_btn_6.png" alt="" onclick="changeList('6')">
+            <div id="listB" style="display: none;width: 100%;position:relative;">
+                <div style="position:absolute;top: 0;left: 0;display: flex;align-items: center;cursor: pointer;" onclick="clearCook()">
+                    <img src="static/images/back.png" alt="" style="display: block;">
+                    <p style="line-height: 1;color: #1663ff;margin-left: 5px;">切换验证</p>
+                </div>
+                <div class="tab_box">
 
-            </div>
+                    <img src="./static/images/index_code_btn_1.png" alt="" onclick="changeList('1')">
+                    <img src="./static/images/index_code_btn_2.png" alt="" onclick="changeList('2')">
+                    <img src="./static/images/index_code_btn_3.png" alt="" onclick="changeList('3')">
+                    <img src="./static/images/index_code_btn_4.png" alt="" onclick="changeList('4')">
+                    <img src="./static/images/index_code_btn_5.png" alt="" onclick="changeList('5')">
+                    <img src="./static/images/index_code_btn_6.png" alt="" onclick="changeList('6')">
 
-            <div class="new_list" id="new_list_1" style="display: block;">
-                <div class="new_list_tit">
-                    <p>财务公开</p>
-                    <p id="nowDateNYR1">2023.03.15</p>
                 </div>
 
-                <div id="review_box1" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent1">
-                        <script id="newListData1" type="text/html">
-                            {{each newList1 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail_01.html?id={{value.id}}">{{value.openName}}</a>
-                                    <p>{{value.openNy}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_1" style="display: block;">
+                    <div class="new_list_tit">
+                        <p>财务公开</p>
+                        <p id="nowDateNYR1">2023.03.15</p>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_1"></div>
-                </div>
-            </div>
 
-            <div class="new_list" id="new_list_2" style="display: none;">
-                <div class="new_list_tit">
-                    <p>合同公开</p>
-                    <p id="nowDateNYR2">2023.03.15</p>
+                    <div id="review_box1" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent1">
+                            <script id="newListData1" type="text/html">
+                                {{each newList1 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_01.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.openNy}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_1"></div>
+                    </div>
                 </div>
 
-                <div id="review_box2" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent2">
-                        <script id="newListData2" type="text/html">
-                            {{each newList2 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail_02.html?id={{value.code}}">{{value.name}}</a>
-                                    <p>{{value.code}}</p>
-                                    <p>{{value.buildingTime}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_2" style="display: none;">
+                    <div class="new_list_tit">
+                        <p>合同公开</p>
+                        <p id="nowDateNYR2">2023.03.15</p>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_2"></div>
-                </div>
-            </div>
 
-            <div class="new_list" id="new_list_3" style="display: none;">
-                <div class="new_list_tit">
-                    <p>重大事项</p>
-                    <p id="nowDateNYR3">2023.03.15</p>
+                    <div id="review_box2" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent2">
+                            <script id="newListData2" type="text/html">
+                                {{each newList2 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_02.html?id={{value.code}}">{{value.name}}</a>
+                                        <p>{{value.code}}</p>
+                                        <p>{{value.buildingTime}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_2"></div>
+                    </div>
                 </div>
 
-                <div id="review_box3" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent3">
-                        <script id="newListData3" type="text/html">
-                            {{each newList3 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail_03.html?id={{value.id}}">{{value.openName}}</a>
-                                    <p>{{value.bookName}}</p>
-                                    <p>{{value.openNy}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_3" style="display: none;">
+                    <div class="new_list_tit">
+                        <p>重大事项</p>
+                        <p id="nowDateNYR3">2023.03.15</p>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_3"></div>
-                </div>
-            </div>
 
-            <div class="new_list" id="new_list_4" style="display: none;">
-                <div class="new_list_tit">
-                    <p>四议两公开</p>
-                    <p id="nowDateNYR4">2023.03.15</p>
+                    <div id="review_box3" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent3">
+                            <script id="newListData3" type="text/html">
+                                {{each newList3 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_03.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.bookName}}</p>
+                                        <p>{{value.openNy}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_3"></div>
+                    </div>
                 </div>
 
-                <div id="review_box4" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent4">
-                        <script id="newListData4" type="text/html">
-                            {{each newList4 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
-                                    <p>{{value.bookName}}</p>
-                                    <p>{{value.jueyiAt}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_4" style="display: none;">
+                    <div class="new_list_tit">
+                        <p>四议两公开</p>
+                        <p id="nowDateNYR4">2023.03.15</p>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_4"></div>
-                </div>
-            </div>
 
-            <div class="new_list" id="new_list_5" style="display: none;">
-                <div class="new_list_tit">
-                    <p>工程项目</p>
-                    <p id="nowDateNYR5">2023.03.15</p>
+                    <div id="review_box4" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent4">
+                            <script id="newListData4" type="text/html">
+                                {{each newList4 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.bookName}}</p>
+                                        <p>{{value.jueyiAt}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_4"></div>
+                    </div>
                 </div>
 
-                <div id="review_box5" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent5">
-                        <script id="newListData5" type="text/html">
-                            {{each newList5 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
-                                    <p>{{value.bookName}}</p>
-                                    <p>{{value.jueyiAt}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_5" style="display: none;">
+                    <div class="new_list_tit">
+                        <p>工程项目</p>
+                        <p id="nowDateNYR5">2023.03.15</p>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_5"></div>
-                </div>
-            </div>
 
-            <div class="new_list" id="new_list_6" style="display: none;">
-                <div class="new_list_tit">
-                    <p>事务公开</p>
-                    <p id="nowDateNYR6">2023.03.15</p>
+                    <div id="review_box5" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent5">
+                            <script id="newListData5" type="text/html">
+                                {{each newList5 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.bookName}}</p>
+                                        <p>{{value.jueyiAt}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_5"></div>
+                    </div>
                 </div>
 
-                <div id="review_box6" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
-                    <div class="new_list_ul" id="newListContent6">
-                        <script id="newListData6" type="text/html">
-                            {{each newList6 as value i}}
-                                <div class="new_list_li">
-                                    <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
-                                    <p>{{value.bookName}}</p>
-                                    <p>{{value.jueyiAt}}</p>
-                                </div>
-                            {{/each}}
-                        </script>
+                <div class="new_list" id="new_list_6" style="display: none;">
+                    <div class="new_list_tit">
+                        <p>事务公开</p>
+                        <p id="nowDateNYR6">2023.03.15</p>
+                    </div>
+
+                    <div id="review_box6" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent6">
+                            <script id="newListData6" type="text/html">
+                                {{each newList6 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.bookName}}</p>
+                                        <p>{{value.jueyiAt}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_6"></div>
                     </div>
-                    <div class="new_list_ul" id="newListContent_ul_6"></div>
                 </div>
+
             </div>
         </div>
 
diff --git a/infoport/static/js/project/discussions.js b/infoport/static/js/project/discussions.js
index fab81c5..bb421d3 100644
--- a/infoport/static/js/project/discussions.js
+++ b/infoport/static/js/project/discussions.js
@@ -16,8 +16,13 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
     var tools = new Tools();
 
     module.init = function (page) {
-        //新闻列表
-        tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList4 , true);
+        // //新闻列表
+        // tools.doGet(listSiyigongkai, {
+        //     pageNum:1,
+        //     pageSize:10,
+        //     bookId: JSON.parse(tools.getCookie('user')).bookId,
+        //     deptId: JSON.parse(tools.getCookie('user')).deptId
+        // }, module.newsList4 , true);
         tools.doGet(webList, {}, module.webList , true);
         // new Swiper('#bannerFocusNextWrap', {
         //     paginationClickable: true,
@@ -25,8 +30,11 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         //     autoplay : 2000,
         //     loop:true
         // })
-        changeList('1');
-
+        if (tools.getCookie('user')){
+            $("#loginF").css('display','none');
+            $("#listB").css('display','flex');
+            changeList('1');
+        }
     };
 
     module.newsList4 = function (data) {
@@ -61,6 +69,13 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
 
     }
 
+    clearCook = function () {
+        tools.setCookie('user','');
+        tools.setCookie('farmerCode','');
+        $('#loginF').css('display','flex');
+        $('#listB').css('display','none');
+    }
+
     module.checkFarmer = function (data) {
         if (data.code == 200) {
             let seconds = 3600;
@@ -77,7 +92,8 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
             const farmerCode = data.rows[0].farmerCode;
             tools.setCookie("farmerCode",farmerCode, { expires: 30 });
             $('#loginF').css('display','none');
-            $('#new_list').css('display','block');
+            $('#listB').css('display','flex');
+            changeList('1');
         }
     }
 
@@ -133,7 +149,12 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
             case '4':
                 $('#new_list_4').css('display','block');
                 $("#nowDateNYR4").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
-                tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList4 , true);
+                tools.doGet(listSiyigongkai, {
+                    pageNum:1,
+                    pageSize:10,
+                    bookId: JSON.parse(tools.getCookie('user')).bookId,
+                    deptId: JSON.parse(tools.getCookie('user')).deptId
+                }, module.newsList4 , true);
                 break;
 
             case '5':