From 40186d9bc95f4d6e2c37875be7ca29d472893afa 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, 12 Jul 2024 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E4=B9=B3=E5=B1=B1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B8=AF=20=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infoport/homestead.html             |  6 ++---
 infoport/index.html                 | 21 +++++++++--------
 infoport/property.html              |  6 ++---
 infoport/resourceNew.html           | 16 ++++++++++---
 infoport/static/css/index.css       |  7 +++++-
 infoport/static/js/project/index.js | 35 ++++++++++++++++++++++++++++-
 6 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/infoport/homestead.html b/infoport/homestead.html
index 9294ec9..d1aba78 100644
--- a/infoport/homestead.html
+++ b/infoport/homestead.html
@@ -138,9 +138,9 @@
                     <p><img src="static/images/dialog_icon_1.png" alt=""></p>
                     <p class="name">基本信息</p>
                     <p class="bigWin" onclick="window.location='homesteadDetail.html?id='+{{propertyDetail.id}}"><img src="static/images/dialog_icon_2.png" alt=""></p>
-                    <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>
-                    <i class="sanjiao-left"></i>
-                    <p class="phone">{{phone}} {{leader}}</p>
+<!--                    <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>-->
+<!--                    <i class="sanjiao-left"></i>-->
+<!--                    <p class="phone">{{phone}} {{leader}}</p>-->
                     <img src="static/images/dialog_icon_close.png" onclick="closeDialog()" style="margin-left: auto;" alt="">
                 </div>
 
diff --git a/infoport/index.html b/infoport/index.html
index 8c2c848..cb7f0a6 100644
--- a/infoport/index.html
+++ b/infoport/index.html
@@ -91,15 +91,18 @@
                     <p id="nowDateNYR">2023.03.15</p>
                 </div>
 
-                <div class="new_list_ul" id="newListContent">
-                    <script id="newListData" type="text/html">
-                        {{each newList as value i}}
-                            <div class="new_list_li">
-                                <a href="newDetail.html?id={{value.id}}">{{value.infoName}}</a>
-                                <p>{{value.infoTime}}</p>
-                            </div>
-                        {{/each}}
-                    </script>
+                <div id="review_box" style="height: 36vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div class="new_list_ul" id="newListContent">
+                        <script id="newListData" type="text/html">
+                            {{each newList as value i}}
+                                <div class="new_list_li">
+                                    <a href="newDetail.html?id={{value.id}}">{{value.infoName}}</a>
+                                    <p>{{value.infoTime}}</p>
+                                </div>
+                            {{/each}}
+                        </script>
+                    </div>
+                    <div class="new_list_ul" id="newListContent2"></div>
                 </div>
 
             </div>
diff --git a/infoport/property.html b/infoport/property.html
index ab9c538..c3a945f 100644
--- a/infoport/property.html
+++ b/infoport/property.html
@@ -143,9 +143,9 @@
                         <p><img src="static/images/dialog_icon_1.png" alt=""></p>
                         <p class="name">基本信息</p>
                         <p class="bigWin" onclick="window.location='propertyDetail.html?id='+{{propertyDetail.id}}"><img src="static/images/dialog_icon_2.png" alt=""></p>
-                        <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>
-                        <i class="sanjiao-left"></i>
-                        <p class="phone">{{phone}} {{leader}}</p>
+<!--                        <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>-->
+<!--                        <i class="sanjiao-left"></i>-->
+<!--                        <p class="phone">{{phone}} {{leader}}</p>-->
                         <img src="static/images/dialog_icon_close.png" onclick="closeDialog()" style="margin-left: auto;" alt="">
                     </div>
 
diff --git a/infoport/resourceNew.html b/infoport/resourceNew.html
index 53d8948..84da4be 100644
--- a/infoport/resourceNew.html
+++ b/infoport/resourceNew.html
@@ -138,9 +138,9 @@
                     <p><img src="static/images/dialog_icon_1.png" alt=""></p>
                     <p class="name">基本信息</p>
                     <p class="bigWin" onclick="window.location='resourceNewDetail.html?id='+{{propertyDetail.id}}"><img src="static/images/dialog_icon_2.png" alt=""></p>
-                    <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>
-                    <i class="sanjiao-left"></i>
-                    <p class="phone">{{phone}} {{leader}}</p>
+<!--                    <p class="phoneIcon"><img src="static/images/dialog_icon_3.png" alt=""></p>-->
+<!--                    <i class="sanjiao-left"></i>-->
+<!--                    <p class="phone">{{phone}} {{leader}}</p>-->
                     <img src="static/images/dialog_icon_close.png" onclick="closeDialog()" style="margin-left: auto;" alt="">
                 </div>
 
@@ -176,6 +176,16 @@
 
                     </table>
                 </div>
+                <div class="dialog_header">
+                    <p><img src="static/images/dialog_icon_4.png" alt=""></p>
+                    <p class="name">现场图片</p>
+                </div>
+
+                <div class="dialog_img">
+                    {{each attachment as value i}}
+                    <img src="/api{{value.fileUrl}}" alt="">
+                    {{/each}}
+                </div>
                 </script>
             </div>
         </div>
diff --git a/infoport/static/css/index.css b/infoport/static/css/index.css
index fc6e734..5bf40ff 100644
--- a/infoport/static/css/index.css
+++ b/infoport/static/css/index.css
@@ -194,10 +194,15 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-top: 2.5vh;
+  line-height: 4.5vh;
   cursor: pointer;
 }
 
+.new_list_li:first-child{
+
+  /*margin-top: 2.5vh;*/
+}
+
 .new_list_li:hover p{
   color: #1663ff!important;
   transition: all 0.4s ease-in-out;
diff --git a/infoport/static/js/project/index.js b/infoport/static/js/project/index.js
index 50940e7..91c6098 100644
--- a/infoport/static/js/project/index.js
+++ b/infoport/static/js/project/index.js
@@ -46,6 +46,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
             module.data.newImgList = newImgList;
             var newListDataImg = template('newListDataImg', module.data);
             $("#bannerFocusNextContent").html(newListDataImg);
+            roll(20)
         }
     }
 
@@ -64,5 +65,37 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         tools.doGet(newsList, {pageNum:1,pageSize:8,infoName:$("#searchInput").val()}, module.newsList , true);
     }
 
+    function roll(t) {
+        var ul1 = document.getElementById("newListContent");
+        var ul2 = document.getElementById("newListContent2");
+        var ulbox = document.getElementById("review_box");
+        ul2.innerHTML = ul1.innerHTML;
+        ulbox.scrollTop = 0; // 开始无滚动时设为0
+        var timer = setInterval(rollStart, t); // 设置定时器，参数t用在这为间隔时间（单位毫秒），参数t越小，滚动速度越快
+        // 鼠标移入div时暂停滚动
+        ulbox.onmouseover = function () {
+            clearInterval(timer);
+        }
+        // 鼠标移出div后继续滚动
+        ulbox.onmouseout = function () {
+            timer = setInterval(rollStart, t);
+        }
+    }
+
+    // 开始滚动函数
+    function rollStart() {
+        // 上面声明的DOM对象为局部对象需要再次声明
+        var ul1 = document.getElementById("newListContent");
+        var ul2 = document.getElementById("newListContent2");
+        var ulbox = document.getElementById("review_box");
+        // 正常滚动不断给scrollTop的值+1,当滚动高度大于列表内容高度时恢复为0
+        console.log(ulbox.scrollTop+'--------'+ul1.scrollHeight)
+        if (ulbox.scrollTop >= ul1.scrollHeight) {
+            ulbox.scrollTop = 0;
+        } else {
+            ulbox.scrollTop += 1;
+        }
+    }
+
     return module;
-});
\ No newline at end of file
+});