task 乳山信息港 问题修改

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>
 

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>

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>
 

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>

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;

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;
-});
+});