更新官网

.idea/workspace.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="16049291-669a-47fb-8e5c-99449ef4a199" name="Default" comment="" />
+    <list default="true" id="16049291-669a-47fb-8e5c-99449ef4a199" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/style.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/news.html" beforeDir="false" afterPath="$PROJECT_DIR$/news.html" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -28,8 +32,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/news.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="378" column="30" lean-forward="true" selection-start-line="378" selection-start-column="30" selection-end-line="378" selection-end-column="30" />
+            <state relative-caret-position="431">
+              <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="15" />
               <folding>
                 <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -103,8 +107,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="53015">
-              <caret line="2305" column="23" selection-start-line="2305" selection-start-column="17" selection-end-line="2305" selection-end-column="23" />
+            <state relative-caret-position="316">
+              <caret line="2203" column="17" lean-forward="true" selection-start-line="2203" selection-start-column="17" selection-end-line="2203" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -120,22 +124,16 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>menu-close-news</find>
-      <find>menu-contact</find>
-      <find>main-menu-news</find>
       <find>inner-main</find>
       <find>item-time</find>
-      <find>news-iframe</find>
       <find>newsItem_3</find>
       <find>newsBody</find>
-      <find>article-close</find>
       <find>news_tab_img</find>
       <find>$_list</find>
       <find>closeContact</find>
       <find>footer</find>
       <find>top-menu-news</find>
       <find>left</find>
-      <find>news-detail</find>
       <find>news-footer</find>
       <find>newsItem-mark</find>
       <find>30px</find>
@@ -143,13 +141,19 @@
       <find>newsItem_1</find>
       <find>item-title</find>
       <find>news_narrow</find>
-      <find>news-body</find>
-      <find>news-list-item</find>
-      <find>news-list</find>
       <find>newsListBottom</find>
       <find>scale-down</find>
       <find>itemBg</find>
       <find>106.14.225.13</find>
+      <find>window.newsList</find>
+      <find>article-close</find>
+      <find>news-detail</find>
+      <find>lineUrl</find>
+      <find>news-list-item</find>
+      <find>news-iframe</find>
+      <find>news-list-item-left</find>
+      <find>news-list</find>
+      <find>news-body</find>
     </findStrings>
     <replaceStrings>
       <replace>750</replace>
@@ -229,7 +233,7 @@
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544169978669" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544183911239" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -285,18 +289,20 @@
       <workItem from="1544080830485" duration="10667000" />
       <workItem from="1544094293008" duration="37000" />
       <workItem from="1544167194982" duration="2510000" />
-      <workItem from="1544170883585" duration="446000" />
+      <workItem from="1544170883585" duration="2826000" />
+      <workItem from="1544177630507" duration="14000" />
+      <workItem from="1544177742847" duration="6121000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="157315000" />
+    <option name="totallyTimeSpent" value="165830000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22441365" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22867803" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info id="Image Layers" order="3" />
@@ -305,7 +311,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.20824295" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.20824295" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -445,15 +451,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53015">
-          <caret line="2305" column="23" selection-start-line="2305" selection-start-column="17" selection-end-line="2305" selection-end-column="23" />
+        <state relative-caret-position="316">
+          <caret line="2203" column="17" lean-forward="true" selection-start-line="2203" selection-start-column="17" selection-end-line="2203" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/news.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="378" column="30" lean-forward="true" selection-start-line="378" selection-start-column="30" selection-end-line="378" selection-end-column="30" />
+        <state relative-caret-position="431">
+          <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="15" />
           <folding>
             <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>

css/style.css

@@ -2202,7 +2202,7 @@ body {
 .news-body{
 	width: 100%;
 	height: 100%;
-	padding-bottom: 10px;
+	padding-bottom: 35px;
 	top: 64px;
 	z-index: 200;
 	position: relative;
@@ -2398,6 +2398,7 @@ body {
 	}
 	.news-list-item{
 		width: 91.6%;
+        height: 100%;
 		margin-bottom: 30px;
 		margin-left: 4.2%;
 		position: relative;
@@ -2410,6 +2411,7 @@ body {
 @media only screen and (min-width: 750px){
 	.news-list-item{
 		width: 91.6%;
+        height: 100%;
 		margin-bottom: 30px;
 		margin-left: 4.2%;
 		position: relative;

news.html

@@ -132,7 +132,7 @@
     </div>
     <div class="news-detail">
         <div class="article-close"></div>
-        <iframe frameborder="0" height="100%" scrolling="yes" class="news-iframe" width="100%"></iframe>
+        <iframe frameborder="0" height="100%" scrolling="yes" name="newsIframe" class="news-iframe" width="100%"></iframe>
     </div>
     <div class="news-body">
         <div class="news-list"></div>
@@ -151,6 +151,8 @@
     var lastIdx = 0;
     var menuList = ["elab_who","elab_what","elab_news","elab_project","elab_contact"];
     var lastClassName ='';
+    var lineUrl = null;
+    var item = null;
     $(function () {
 
         $("news-body").on("touchmove",(e)=>{
@@ -171,6 +173,8 @@
         $('.news-detail').on('click', function (e) {
             $(".news-detail").removeClass("active");
             iframeShow = false;
+            lineUrl = "";
+            item = "";
             $(".inner-main").attr("src", "http://yun-image.elab-plus.com/images/contact/1_objects@2x_3.png");
             $(".inner-menu").attr("src", "http://yun-image.elab-plus.com/images/contact/1_objects@2x_4.png");
             $(".inner-artcle").attr("src", "http://yun-image.elab-plus.com/images/contact/1_objects@2x_5.png");
@@ -376,6 +380,7 @@
 
         var $_list;
         var $_listV;
+        // 192.168.0.16
         //读取分类数据 106.14.225.13
         $.get("http://106.14.225.13:8081/rest/listNews", function (result) {
             console.log("Result Data:" + JSON.stringify(result.result));
@@ -442,7 +447,7 @@
                         var data1 = new Date(tmp1['created']);
                         $_html = `
                                   <div class="newsBody">
-				                    <div class="newsItem_2 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i}})">
+				                    <div class="newsItem_2 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i})">
 				                        <img class="itemBg" src="${$_img0}"/>
 				                        <div class="newsItem-mark item-inner"><a>${tmp0['tag']}</a></div>
 					                    <div class="item-title item-inner item-title-sub">${tmp0['title']}<p>${tmp0['subTitle']}</p></div>
@@ -571,18 +576,17 @@
     }
 
     function turnToArticle(data) {
-        var lineUrl = window.newsList[data]['linkUrl'];
+        item = window.newsList[data];
+        lineUrl = item["linkUrl"];
         var frame = document.getElementsByClassName("news-iframe")[0];
+        // document.getElementsByClassName('news-iframe').window.location.reload(true);
+        window.frames.newsIframe.window.location.reload(true);
         $(".top-menu-news").css("background-color","#FFFFFF");
-        console.log('turnToArticle：'+lineUrl);
         if(!lineUrl){
             return
         }
         frame.src = lineUrl;
-        // $(".news-iframe").src = lineUrl;
-        // $(".news-iframe",parent.document.body).attr("src",lineUrl);
-        // $(window.parent.document).find(".news-iframe").attr("src",lineUrl);
-
+        // $(".news-iframe").attr("src",lineUrl);
         $(".inner-main").attr("src", "http://yun-image.elab-plus.com/images/index/1_objects@2x_2.png");
         $(".inner-menu").attr("src", "http://yun-image.elab-plus.com/images/index/1_objects@2x_3.png");
         $(".inner-artcle").attr("src", "http://yun-image.elab-plus.com/images/index/1_objects@2x_4.png");