修改官网

.idea/workspace.xml

@@ -3,12 +3,12 @@
   <component name="ChangeListManager">
     <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$/contact.html" beforeDir="false" afterPath="$PROJECT_DIR$/contact.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/style.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/loading.html" beforeDir="false" afterPath="$PROJECT_DIR$/loading.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/news.html" beforeDir="false" afterPath="$PROJECT_DIR$/news.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/water/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/water/js/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/videoTest.html" beforeDir="false" afterPath="$PROJECT_DIR$/videoTest.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -21,11 +21,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="193">
-              <caret line="173" column="96" lean-forward="true" selection-start-line="173" selection-start-column="96" selection-end-line="173" selection-end-column="96" />
+            <state relative-caret-position="198">
+              <caret line="289" column="13" lean-forward="true" selection-start-line="289" selection-start-column="13" selection-end-line="289" selection-end-column="13" />
               <folding>
                 <element signature="n#style#0;n#a#0;n#div#0;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#2;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -35,29 +35,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/jquery-1.11.3.min.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="69">
-              <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/water/js/main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
+      <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="243">
-              <caret line="537" column="52" lean-forward="true" selection-start-line="537" selection-start-column="52" selection-end-line="537" selection-end-column="52" />
+            <state relative-caret-position="260">
+              <caret line="429" column="35" lean-forward="true" selection-start-line="429" selection-start-column="35" selection-end-line="429" selection-end-column="35" />
               <folding>
                 <element signature="n#style#0;n#a#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -68,46 +50,28 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/do.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9959">
-              <caret line="433" column="19" selection-start-line="433" selection-start-column="19" selection-end-line="433" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/licheng.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14122">
-              <caret line="614" column="15" selection-start-line="614" selection-start-column="15" selection-end-line="614" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projects.html">
+        <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6762">
-              <caret line="294" column="11" selection-start-line="294" selection-start-column="11" selection-end-line="294" selection-end-column="11" />
+            <state relative-caret-position="357">
+              <caret line="2129" column="8" lean-forward="true" selection-start-line="2129" selection-start-column="8" selection-end-line="2129" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projects-1.html">
+        <entry file="file://$PROJECT_DIR$/css/index.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="209" column="66" lean-forward="true" selection-start-line="209" selection-start-column="66" selection-end-line="209" selection-end-column="66" />
+            <state relative-caret-position="611">
+              <caret line="1310" column="12" selection-start-line="1310" selection-start-column="12" selection-end-line="1310" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/style.css">
+        <entry file="file://$PROJECT_DIR$/loading.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="117" column="16" lean-forward="true" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" />
+            <state relative-caret-position="345">
+              <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -123,36 +87,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+      <find>articleCloseBtn</find>
+      <find>iframe-news</find>
+      <find>main-menu-news{</find>
+      <find>main-menu-news</find>
+      <find>max-height</find>
+      <find>max-heigh</find>
+      <find>max-height:</find>
+      <find>main-menu</find>
+      <find>min-height</find>
+      <find>page-parts</find>
+      <find>onLoad</find>
+      <find>.page</find>
       <find>news_narrow</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>lineUrl</find>
-      <find>news-list-item</find>
+      <find>page</find>
+      <find>projects</find>
+      <find>pageLayer</find>
+      <find>news.h</find>
+      <find>#news</find>
       <find>news-iframe</find>
-      <find>news-list-item-left</find>
-      <find>news-list</find>
-      <find>news-body</find>
-      <find>newsIframe</find>
-      <find>item</find>
-      <find>iframeHtml</find>
+      <find>frameNews</find>
+      <find>.main-menu</find>
+      <find>layer-frameNews</find>
       <find>news-detail</find>
-      <find>parentDiv</find>
+      <find>article-close</find>
+      <find>news</find>
+      <find>newsLayer</find>
       <find>iframeParent</find>
-      <find>mobile-hide</find>
-      <find>沪ICP备</find>
-      <find>hu</find>
-      <find>ICP</find>
-      <find>setInterval</find>
-      <find>mobile-display</find>
-      <find>left</find>
-      <find>footer</find>
-      <find>沪ICP</find>
-      <find>max-width</find>
-      <find>icpStyle</find>
+      <find>number-pb-num</find>
+      <find>progress-num</find>
+      <find>mockloaded</find>
     </findStrings>
     <replaceStrings>
       <replace>750</replace>
@@ -180,11 +144,12 @@
         <option value="$PROJECT_DIR$/projects.html" />
         <option value="$PROJECT_DIR$/projects-1.html" />
         <option value="$PROJECT_DIR$/water/js/main.js" />
+        <option value="$PROJECT_DIR$/contact.html" />
+        <option value="$PROJECT_DIR$/css/index.css" />
         <option value="$PROJECT_DIR$/loading.html" />
+        <option value="$PROJECT_DIR$/index.html" />
         <option value="$PROJECT_DIR$/news.html" />
-        <option value="$PROJECT_DIR$/contact.html" />
         <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/index.html" />
       </list>
     </option>
   </component>
@@ -195,10 +160,10 @@
     <auto-save>true</auto-save>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1357" />
+    <option name="x" value="1355" />
     <option name="y" value="-10" />
-    <option name="width" value="1938" />
-    <option name="height" value="1058" />
+    <option name="width" value="1940" />
+    <option name="height" value="1060" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -215,21 +180,21 @@
             <path>
               <item name="ElabOldHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="ElabOldHome" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <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="1551324921464" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552975325067" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../MiniEcRm" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="configurable.group.editor" />
@@ -292,18 +257,24 @@
       <workItem from="1544177630507" duration="14000" />
       <workItem from="1544177742847" duration="6587000" />
       <workItem from="1544184995399" duration="4830000" />
-      <workItem from="1551321478971" duration="2936000" />
+      <workItem from="1551321478971" duration="3654000" />
+      <workItem from="1551330810936" duration="7000" />
+      <workItem from="1551334973794" duration="876000" />
+      <workItem from="1552878508655" duration="230000" />
+      <workItem from="1552886833259" duration="21653000" />
+      <workItem from="1552975549164" duration="5395000" />
+      <workItem from="1552981669061" duration="3135000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="174062000" />
+    <option name="totallyTimeSpent" value="206076000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-6" y="-6" width="1549" height="837" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1145345" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.122572005" />
       <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" />
@@ -373,13 +344,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/index.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="29118">
-          <caret line="1266" column="1" selection-start-line="1266" selection-start-column="1" selection-end-line="1266" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/gray.svg" />
     <entry file="file://$PROJECT_DIR$/css/gray.svg">
       <provider selected="true" editor-type-id="images" />
@@ -391,13 +355,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/chuangshiren.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2737">
-          <caret line="119" column="112" selection-start-line="119" selection-start-column="112" selection-end-line="119" selection-end-column="112" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/do-damai.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -433,78 +390,73 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/do.html">
+    <entry file="file://$PROJECT_DIR$/chuangshiren.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9959">
-          <caret line="433" column="19" selection-start-line="433" selection-start-column="19" selection-end-line="433" selection-end-column="19" />
+        <state relative-caret-position="2254">
+          <caret line="98" column="23" lean-forward="true" selection-start-line="98" selection-start-column="23" selection-end-line="98" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/licheng.html">
+    <entry file="file://$PROJECT_DIR$/js/jquery-1.11.3.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14122">
-          <caret line="614" column="15" selection-start-line="614" selection-start-column="15" selection-end-line="614" selection-end-column="15" />
+        <state relative-caret-position="69">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/projects.html">
+    <entry file="file://$PROJECT_DIR$/water/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6762">
-          <caret line="294" column="11" selection-start-line="294" selection-start-column="11" selection-end-line="294" selection-end-column="11" />
+        <state relative-caret-position="207">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/water/js/main.js">
+    <entry file="file://$PROJECT_DIR$/do.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        <state relative-caret-position="7337">
+          <caret line="319" column="56" selection-start-line="319" selection-start-column="56" selection-end-line="319" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/news.html">
+    <entry file="file://$PROJECT_DIR$/licheng.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="537" column="52" lean-forward="true" selection-start-line="537" selection-start-column="52" selection-end-line="537" selection-end-column="52" />
-          <folding>
-            <element signature="n#style#0;n#a#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="6118">
+          <caret line="266" column="61" selection-start-line="266" selection-start-column="51" selection-end-line="266" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/loading.html">
+    <entry file="file://$PROJECT_DIR$/projects.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="225" column="12" lean-forward="true" selection-start-line="225" selection-start-column="12" selection-end-line="225" selection-end-column="12" />
+        <state relative-caret-position="6762">
+          <caret line="294" column="11" selection-start-line="294" selection-start-column="11" selection-end-line="294" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/jquery-1.11.3.min.js">
+    <entry file="file://$PROJECT_DIR$/projects-1.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="4807">
+          <caret line="209" column="66" selection-start-line="209" selection-start-column="66" selection-end-line="209" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/projects-1.html">
+    <entry file="file://$PROJECT_DIR$/loading.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="209" column="66" lean-forward="true" selection-start-line="209" selection-start-column="66" selection-end-line="209" selection-end-column="66" />
+        <state relative-caret-position="345">
+          <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/css/index.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="117" column="16" lean-forward="true" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" />
+        <state relative-caret-position="611">
+          <caret line="1310" column="12" selection-start-line="1310" selection-start-column="12" selection-end-line="1310" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="173" column="96" lean-forward="true" selection-start-line="173" selection-start-column="96" selection-end-line="173" selection-end-column="96" />
+        <state relative-caret-position="198">
+          <caret line="289" column="13" lean-forward="true" selection-start-line="289" selection-start-column="13" selection-end-line="289" selection-end-column="13" />
           <folding>
             <element signature="n#style#0;n#a#0;n#div#0;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#2;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -513,6 +465,25 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="2129" column="8" lean-forward="true" selection-start-line="2129" selection-start-column="8" selection-end-line="2129" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/news.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="429" column="35" lean-forward="true" selection-start-line="429" selection-start-column="35" selection-end-line="429" selection-end-column="35" />
+          <folding>
+            <element signature="n#style#0;n#a#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

css/index.css

@@ -1315,7 +1315,6 @@ body {
 	z-index: 999;
 	width: 100%;
 	height: 100%;
-	max-height: 1500px;
 	background: #34B5CB;
 	transform: translateY(-100%);
 	opacity: 0;

css/style.css

@@ -21,7 +21,7 @@ body {
 	margin-right: auto;
 	text-align: center;
 	background: #fff;
-	overflow: hidden;
+	/*overflow: hidden;*/
 }
 
 .inner-icon {
@@ -161,7 +161,6 @@ body {
 	height: 100%;
 	background-size: cover;
 	background-repeat: no-repeat;
-	/*max-height: 1500px;*/
 	background-color: #2C2E34;
 	transform: translateY(-100%);
 	opacity: 0;
@@ -181,7 +180,6 @@ body {
 	height: 100%;
 	background-size: cover;
 	background-repeat: no-repeat;
-	max-height: 1500px;
 	background-color: #2C2E34;
 	transform: translateY(-100%);
 	opacity: 0;
@@ -980,6 +978,7 @@ body {
 	overflow-x: hidden;
 	overflow-y: auto;
 	position: absolute;
+	-webkit-overflow-scrolling:touch;
 	/*left: 0;*/
 	/*top: 0;*/
 	z-index: 210;
@@ -1497,7 +1496,7 @@ body {
 /******projects******/
 #projects,#doDetail{
 	background: #1B2030;
-	height: auto;
+	height: 100%;
 }
 #projects .who-we-are,
 #projects .what-we-do{
@@ -2228,28 +2227,25 @@ body {
 	width: 100%;
 	height: 100%;
 	padding-bottom: 35px;
-	top: 64px;
+	margin-top: 64px;
 	z-index: 200;
 	position: relative;
 }
 .news_narrow{
 	position: absolute;
-	width: 100%;
-	height: 32px;
+	width: 92%;
+	margin-left: 4%;
+	height: 22px;
 	display: table-cell;
 	vertical-align: middle;
-	margin-left: 92.5%;
-	margin-top: 1%;
 	z-index: 201;
 	top: 64px;
 }
-.news_tab_img{
-	/*width: ;*/
-	/*float: right;*/
-}
+
 .news-list{
 	position: relative;
 }
+
 .newsListBottom{
 	height: 5px;
 }
@@ -2267,24 +2263,26 @@ body {
 	background-color: #FFFFFF;
 	transform: translateY(100%);
 	opacity: 0;
-	transition: all ease 1s
+	transition: all ease 1s;
+	-webkit-overflow-scrolling:touch;
+	overflow:auto;
 }
 .news-detail.active {
 	transform: translateY(0);
 	opacity: 1;
 }
 .article-close{
-	width: 40px;
-	height: 40px;
-	margin: 0px auto;
+	width: 30px;
+	height: 30px;
+	margin: 20px auto;
+	/*margin-left: auto;*/
+	/*margin-right: auto;*/
 	color: #ffffff;
-	/*margin-top: 64px;*/
 	text-align: center;
-	/*transform: scale(0.6);*/
 	font-family: "Arial";
-	font-size: 40px;
+	font-size: 30px;
 	cursor: pointer;
-	background: url(https://dm.static.elab-plus.com/elabGuanWang/Back@2x.png) no-repeat 50% 50%;
+	background: url(https://dm.static.elab-plus.com/ElabGuanWang/ic_clear@3x.png) no-repeat 50% 50%;
 	background-size: contain;
 	transition: all ease 1s;
 	transform: rotate(0) scale(0.6);
@@ -2292,8 +2290,11 @@ body {
 	z-index: 10;
 }
 .iframe-news{
+	position: relative;
 	width: 100%;
 	height: 100%;
+	-webkit-overflow-scrolling:touch;
+	overflow: auto;
 }
 .item-time{
 	bottom: 6%;
@@ -2505,8 +2506,10 @@ body {
 		position: relative;
 		height: 100px;
 	}
-	.news_narrow{
-        margin-left: 47%;
+	.news_tab_img{
+		position: relative;
+		/*right: 20px;*/
+		/*top: 20px;*/
 	}
 }
 @media only screen and (min-width: 750px){
@@ -2528,9 +2531,13 @@ body {
 		position: absolute;
 		height: 70px;
 		width: 43.7%;
-		/*margin-bottom: 30px;*/
 		margin-left: 52.1%;
 	}
+	.news_tab_img{
+		position: absolute;
+		right: 20px;
+		top: 20px;
+	}
 }
 
 .news-list-item-box{

index.html

@@ -18,6 +18,10 @@
         .top-menu {
             background: none;
         }
+        .layer-frameNews{
+            overflow: auto;
+            -webkit-overflow-scrolling:touch;
+        }
     </style>
 </head>
 
@@ -173,7 +177,6 @@
         <div class="mobile-hide left">Copyright©2015-2018, elab-plus.com. All rights reserved. | <a style="text-decoration:none;color:black" href="http://www.miitbeian.gov.cn"> 沪ICP备15047801号</a></div>
         <div class="mobile-hide right">上海定卓⽹络科技有限公司 电话：021-50753278 地址：上海市静安区彭江路602号E座408室</div>
         <div class="mobile-display left" style="visibility: hidden;">Copyright©2015-2018 | <a class="icpStyle" style="text-decoration:none;color:white" href="http://www.miitbeian.gov.cn"> 沪ICP备15047801号</a></div>
-
     </div>
 
 </div>
@@ -201,7 +204,7 @@
 
 <!--news center-->
 <div class="newsLayer pageLayer" hidden>
-    <iframe frameborder="0" name="frameNews" scrolling="yes" src="news.html" width="100%" height="100%"></iframe>
+    <iframe marginWidth=0 marginHeight=0 frameborder="0" class="layer-frameNews" name="frameNews" scrolling="auto" src="news.html" width="100%" height="100%"></iframe>
 </div>
 <!--/news center-->
 

loading.html

@@ -57,16 +57,15 @@
     </div>
 
     <div id="hidden" class="hidden">
-        <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x.png" class="hidden_img"></img>
-        <img src="http://yun-image.elab-plus.com/images/index/1_objects_6.png" class="hidden_img"></img>
-        <img src="http://yun-image.elab-plus.com/images/index/1_objects_7.png" class="hidden_img"></img>
-        <img src="http://yun-image.elab-plus.com/images/index/1_objects.png" class="hidden_img"></img>
+        <img src="https://dm.static.elab-plus.com/图-1.jpg.1539678713888" class="hidden_img"></img>
+        <img src="https://dm.static.elab-plus.com/1.jpg.1540437352665" class="hidden_img"></img>
+        <img src="https://dm.static.elab-plus.com/图-3.jpg.1539678694474" class="hidden_img"></img>
+        <!--<img src="http://yun-image.elab-plus.com/images/index/1_objects.png" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_1.png" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_2.png" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_3.png" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_4.png" class="hidden_img"></img>
-        <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_5.png" class="hidden_img"></img>
-        <!--<img src="http://yun-image.elab-plus.com/water/img/dmaps/2048x2048/clouds.jpg" class="hidden_img"></img>-->
+        <img src="http://yun-image.elab-plus.com/images/index/1_objects@2x_5.png" class="hidden_img"></img>-->
         <img src="http://yun-image.elab-plus.com/images/1.png" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/BG@2x.jpg" class="hidden_img"></img>
         <img src="http://yun-image.elab-plus.com/images/bg01.png" class="hidden_img"></img>
@@ -165,13 +164,9 @@
 </div>
 
 <script src="progress/src/jquery.min.js"></script>
-<!--<script src="http://yun-image.elab-plus.com/progress/src/jquery.velocity.min.js"></script>
-<script src="http://yun-image.elab-plus.com/progress/number-pb.js"></script>
-<script src= "https://npmcdn.com/imagesloaded@4.1/imagesloaded.pkgd.js"></script>-->
 <script>
 
 	var $_h = $(window).height();
-	//console.log($_h);
 	$(".container").height($_h+'px');
 
     localStorage.setItem("loadComplete","0");
@@ -191,7 +186,7 @@
         var cur = new Date();
         var t = (cur.getTime() - time0) / 1000;
         var s = t | 0;
-        var res = 104;
+        var res = 100;
         if (s >= 0 && s < 3) {
             res = 8 * t;
         }
@@ -204,8 +199,9 @@
         if (s >= 96 && s < 176) {
             res = 90 + 0.1 * (t - 96);
         }
+
         return res | 0;
-    }
+    };
 
     function sleep(ms) {
         return new Promise(resolve => setTimeout(resolve, ms));
@@ -213,7 +209,7 @@
     var mock = setInterval(function () {
         var mock = mockloaded();
         $("#progress-num").text(mock);
-        $(".number-pb-shown").css("width", "" + mock + "%"+Arita);
+        $(".number-pb-shown").css("width", "" + mock + "%");
     },100);
 
     //预加载图片
@@ -237,10 +233,10 @@
         } else {
             ImgLoaded++;
             percent = parseInt(ImgLoaded / Count * 100);
-            if(percent == 100) {
+            if(percent >= 100) {
+                percent = 100;
                 $("#progress-num").text(percent);
                 $(".number-pb-shown").css("width", "" + percent + "%");
-                // controlBar.reach(100);
                 //加载完毕，关闭loading
                 clearInterval(mock);
                 // parent.hideLoading();

news.html

@@ -14,17 +14,17 @@
         html,
         body {
             height: auto;
-            min-height: 100%;
             background: #2C2E34;
         }
 
         #projects {
+            position: relative;
             width: 100%;
             height: auto;
             background: #2C2E34;
-            max-width: none;
+            /*max-width: none;*/
             overflow-x: hidden;
-            overflow-y: auto;
+            overflow-y: scroll;
         }
 
         .slide-line, .slide-line1 {
@@ -132,7 +132,9 @@
         <img class="news_tab_img" src = "https://dm.static.elab-plus.com/elabGuanWang/List@2x.png"/>
     </div>
     <div class="news-detail" id="iframeParent">
+
         <!--<div class="article-close" id="articleCloseBtn"></div>-->
+        <!--src="https://dm-mng.elab-plus.cn/touFangBao/#/pages/preview?mgid=5c24b87d021f431d30206d3c&foot=no"-->
         <!--<iframe frameborder="0" height="100%" scrolling="yes" name="newsIframe" class="news-iframe" width="100%"></iframe>-->
     </div>
     <div class="news-body">
@@ -306,7 +308,6 @@
                         $_t = (1 + i) * 0.2;
                     }
                     console.log($_t);
-                    // console.log('$_img:' + $_img);
                     var $_html = '';
                     if (tmp0 && tmp1 && tmp2) {
                         var $_img0 = tmp0['bgImage'] || 'http://yun-image.elab-plus.com/images/projects/1_objects@2x_14.jpg';
@@ -530,9 +531,9 @@
         parentDiv.appendChild(articleCloseBtn);
         iframeHtml = document.createElement("iframe");
         iframeHtml.setAttribute('frameborder','0');
-        iframeHtml.setAttribute('height','100vh');
+        iframeHtml.setAttribute('height','100%');
         iframeHtml.setAttribute('width','100%');
-        iframeHtml.setAttribute('scrolling','yes');
+        iframeHtml.setAttribute('scrolling','auto');
         iframeHtml.setAttribute('name','newsIframe');
         iframeHtml.setAttribute('class',"iframe-news");
         iframeHtml.setAttribute('id',"iframe-news");
@@ -546,16 +547,12 @@
         if(!lineUrl){
             return
         }
-        // frame.src = lineUrl;
         $('.news-iframe').attr('src', $('.news-iframe').attr('src'));
         $(".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");
         $(".news-detail").addClass("active");
         iframeShow = true;
-
-        // news-detail
-        // news-body
     }
 
     function reinitIframe() {

videoTest.html

@@ -23,5 +23,9 @@
     <video class="videoContent" controls src="https://dm.static.elab-plus.com/bjJinMaoFu/item_video_0.mp4"></video>
 </div>
 </body>
-<script></script>
-</html>
+<script>
+    var str = 'love';
+    var arr5 = [a,...str];
+    console.log(arr5);
+</script>
+</html>