修复官网的bug

.idea/workspace.xml

@@ -2,9 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="16049291-669a-47fb-8e5c-99449ef4a199" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/videoTest.html" afterDir="false" />
       <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$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/licheng.html" beforeDir="false" afterPath="$PROJECT_DIR$/licheng.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$/projects-1-1.html" beforeDir="false" afterPath="$PROJECT_DIR$/projects-1-1.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/projects.html" beforeDir="false" afterPath="$PROJECT_DIR$/projects.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/water/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/water/js/main.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -18,70 +25,70 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/index.html">
+        <entry file="file://$PROJECT_DIR$/do.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3956">
-              <caret line="172" column="22" selection-start-line="172" selection-start-column="16" selection-end-line="172" selection-end-column="22" />
-              <folding>
-                <element signature="n#style#0;n#div#2;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="5451">
+              <caret line="237" selection-start-line="237" selection-end-line="237" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/news.html">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/do-damai.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="521">
-              <caret line="598" lean-forward="true" selection-start-line="598" selection-end-line="598" />
-              <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>
+            <state relative-caret-position="2944">
+              <caret line="128" column="40" selection-start-line="128" selection-start-column="40" selection-end-line="128" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/careers.html">
+        <entry file="file://$PROJECT_DIR$/do-future.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="920">
-              <caret line="40" column="35" selection-start-line="40" selection-start-column="35" selection-end-line="40" selection-end-column="35" />
+            <state relative-caret-position="1035">
+              <caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/contact.html">
+        <entry file="file://$PROJECT_DIR$/licheng.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="552">
-              <caret line="24" column="100" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="100" />
+            <state relative-caret-position="270">
+              <caret line="813" column="33" selection-start-line="813" selection-start-column="25" selection-end-line="813" selection-end-column="33" />
+              <folding>
+                <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/do.html">
+      <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="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="826">
+              <caret line="286" column="45" selection-start-line="286" selection-start-column="41" selection-end-line="286" selection-end-column="45" />
+              <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>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/licheng.html">
+        <entry file="file://$PROJECT_DIR$/css/index.css">
           <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="19274">
+              <caret line="838" column="26" selection-start-line="838" selection-start-column="26" selection-end-line="838" selection-end-column="26" />
             </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="73853">
+              <caret line="3211" column="19" selection-start-line="3211" selection-start-column="19" selection-end-line="3211" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -89,26 +96,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/projects-1.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6532">
-              <caret line="284" column="19" selection-start-line="284" selection-start-column="19" selection-end-line="284" selection-end-column="19" />
+            <state relative-caret-position="2829">
+              <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="5612">
-              <caret line="244" column="36" selection-start-line="244" selection-start-column="36" selection-end-line="244" selection-end-column="36" />
+            <state relative-caret-position="8993">
+              <caret line="391" column="34" selection-start-line="391" selection-start-column="34" selection-end-line="391" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/style.css">
+        <entry file="file://F:/WorlkResource/时光轴/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="2235" column="12" selection-start-line="2235" selection-start-column="1" selection-end-line="2235" selection-end-column="12" />
+            <state relative-caret-position="667">
+              <caret line="29" selection-start-line="29" selection-end-line="29" />
             </state>
           </provider>
         </entry>
@@ -124,36 +131,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>$_list</find>
-      <find>closeContact</find>
-      <find>footer</find>
-      <find>top-menu-news</find>
-      <find>left</find>
-      <find>news-footer</find>
-      <find>newsItem-mark</find>
-      <find>30px</find>
-      <find>foot</find>
-      <find>newsItem_1</find>
-      <find>item-title</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>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>news-detail</find>
-      <find>parentDiv</find>
-      <find>iframeParent</find>
+      <find>imgForParts2</find>
+      <find>ouer-values</find>
+      <find>parts3</find>
+      <find>ouer-rules</find>
+      <find>parts4</find>
+      <find>jobs-layer</find>
+      <find>.desc</find>
+      <find>hidden-small</find>
+      <find>tab</find>
+      <find>tab-head</find>
+      <find>getMyDate</find>
+      <find>tab-body</find>
+      <find>.tab-body</find>
+      <find>job-inner</find>
+      <find>.detail</find>
+      <find>fadeIn</find>
+      <find>font0</find>
+      <find>tab-cell</find>
+      <find>list-arrow</find>
+      <find>showDetail</find>
+      <find>words1</find>
+      <find>.inner-icon</find>
+      <find>words2</find>
+      <find>close-bar</find>
+      <find>showWho</find>
+      <find>licheng</find>
+      <find>swiper-wrapper</find>
+      <find>swiper</find>
+      <find>frameWho</find>
+      <find>myswiper</find>
     </findStrings>
     <replaceStrings>
       <replace>750</replace>
@@ -172,19 +179,21 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/projects-1-1.html" />
         <option value="$PROJECT_DIR$/chuangshiren.html" />
         <option value="$PROJECT_DIR$/js/gray.svg" />
-        <option value="$PROJECT_DIR$/loading.html" />
-        <option value="$PROJECT_DIR$/careers.html" />
         <option value="$PROJECT_DIR$/contact.html" />
         <option value="$PROJECT_DIR$/do.html" />
         <option value="$PROJECT_DIR$/licheng.html" />
+        <option value="$PROJECT_DIR$/projects-1-1.html" />
+        <option value="$PROJECT_DIR$/loading.html" />
+        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/water/js/main.js" />
+        <option value="$PROJECT_DIR$/test11111.html" />
+        <option value="$PROJECT_DIR$/news.html" />
         <option value="$PROJECT_DIR$/projects.html" />
         <option value="$PROJECT_DIR$/projects-1.html" />
-        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/careers.html" />
         <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/news.html" />
       </list>
     </option>
   </component>
@@ -194,7 +203,7 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -205,7 +214,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -213,24 +221,47 @@
               <item name="ElabGuanWang" type="b2602c69:ProjectViewProjectNode" />
               <item name="ElabGuanWang" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="ElabGuanWang" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ElabGuanWang" type="462c0819:PsiDirectoryNode" />
+              <item name="css" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ElabGuanWang" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ElabGuanWang" type="462c0819:PsiDirectoryNode" />
+              <item name="images" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ElabGuanWang" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ElabGuanWang" type="462c0819:PsiDirectoryNode" />
+              <item name="images" type="462c0819:PsiDirectoryNode" />
+              <item name="slider" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ElabGuanWang" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ElabGuanWang" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <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="1544189755358" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548740796055" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../h5dm-mini-program-testpages" />
     <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" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="F:\WorkPlace\Elab\GitWorkPlace\ElabGuanWang\water\js" />
       <recent name="F:\WorkPlace\Elab\GitWorkPlace\ElabGuanWang\css" />
       <recent name="F:\WorkPlace\Elab\GitWorkPlace\ElabGuanWang\images\news" />
     </key>
@@ -247,13 +278,21 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="JavaScript Debug.index.html">
     <configuration name="index.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ElabGuanWang/html/index.html">
       <method v="2" />
     </configuration>
+    <configuration name="news.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ElabGuanWang/html/news.html">
+      <method v="2" />
+    </configuration>
+    <configuration name="videoTest.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ElabGuanWang/html/videoTest.html">
+      <method v="2" />
+    </configuration>
     <recent_temporary>
       <list>
         <item itemvalue="JavaScript Debug.index.html" />
+        <item itemvalue="JavaScript Debug.videoTest.html" />
+        <item itemvalue="JavaScript Debug.news.html" />
       </list>
     </recent_temporary>
   </component>
@@ -282,27 +321,54 @@
       <workItem from="1544170883585" duration="2826000" />
       <workItem from="1544177630507" duration="14000" />
       <workItem from="1544177742847" duration="6587000" />
-      <workItem from="1544184995399" duration="4830000" />
+      <workItem from="1544184995399" duration="5479000" />
+      <workItem from="1544254433610" duration="472000" />
+      <workItem from="1544412349647" duration="6624000" />
+      <workItem from="1544425081429" duration="9570000" />
+      <workItem from="1544506065273" duration="1977000" />
+      <workItem from="1544596251672" duration="2117000" />
+      <workItem from="1545627642092" duration="14930000" />
+      <workItem from="1545644293561" duration="2002000" />
+      <workItem from="1545822513653" duration="860000" />
+      <workItem from="1545823453827" duration="1630000" />
+      <workItem from="1546004563398" duration="2260000" />
+      <workItem from="1546007157111" duration="15908000" />
+      <workItem from="1546065876761" duration="27000" />
+      <workItem from="1546395674154" duration="10879000" />
+      <workItem from="1546426534858" duration="16365000" />
+      <workItem from="1546517644747" duration="5987000" />
+      <workItem from="1546598842803" duration="4288000" />
+      <workItem from="1546675292636" duration="52000" />
+      <workItem from="1546681235698" duration="2222000" />
+      <workItem from="1546914937973" duration="26784000" />
+      <workItem from="1547092937094" duration="31358000" />
+      <workItem from="1547275448988" duration="14520000" />
+      <workItem from="1547608979666" duration="14268000" />
+      <workItem from="1548127315820" duration="7713000" />
+      <workItem from="1548219734202" duration="5842000" />
+      <workItem from="1548296289083" duration="17209000" />
+      <workItem from="1550469217930" duration="596000" />
+      <workItem from="1551321283259" duration="232000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="171126000" />
+    <option name="totallyTimeSpent" value="388467000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="1936" height="1056" extended-state="0" />
+    <frame x="1358" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23134328" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14765458" />
       <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" />
       <window_info id="Designer" order="4" />
       <window_info id="Capture Tool" order="5" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.20824295" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.34273317" />
       <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" />
@@ -335,124 +401,205 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/index.css">
+    <entry file="file://$PROJECT_DIR$/js/gray.svg" />
+    <entry file="file://$PROJECT_DIR$/css/gray.svg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/chuangshiren.html">
       <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 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$/js/gray.svg" />
-    <entry file="file://$PROJECT_DIR$/css/gray.svg">
+    <entry file="file://$PROJECT_DIR$/more.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3243" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/contact.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="24" column="100" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="100" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/progress/img/LOGO.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2015.collection.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="31" column="4" selection-start-line="31" selection-start-column="4" selection-end-line="31" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/water/img/dmaps/2048x2048/clouds.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/water/img/dmaps/2048x2048/crystalize.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/water/js/TweenMax.min.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="16" column="42" lean-forward="true" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/water/js/main5.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/loading.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4945">
+          <caret line="215" column="63" selection-start-line="215" selection-start-column="63" selection-end-line="215" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/reset.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1104">
+          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/jquery-1.11.3.min.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="23">
+          <caret line="13" column="11590" selection-start-line="13" selection-start-column="11590" selection-end-line="13" selection-end-column="11590" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/projects-1-1.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2047">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        <state relative-caret-position="314">
+          <caret line="174" column="29" selection-start-line="174" selection-start-column="29" selection-end-line="174" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/chuangshiren.html">
+    <entry file="file://F:/WorlkResource/时光轴/index.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 relative-caret-position="621">
+          <caret line="27" column="41" selection-start-line="27" selection-start-column="41" selection-end-line="27" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/do-damai.html">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/videoTest.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/do-future.html">
+    <entry file="file://$PROJECT_DIR$/water/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3519" />
+        <state relative-caret-position="230">
+          <caret line="10" column="6" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/more.html">
+    <entry file="file://$PROJECT_DIR$/careers.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3243" />
+        <state relative-caret-position="109">
+          <caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="160" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/news.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="826">
+          <caret line="286" column="45" selection-start-line="286" selection-start-column="41" selection-end-line="286" selection-end-column="45" />
+          <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>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3956">
-          <caret line="172" column="22" selection-start-line="172" selection-start-column="16" selection-end-line="172" selection-end-column="22" />
+        <state relative-caret-position="276">
+          <caret line="12" column="61" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
           <folding>
             <element signature="n#style#0;n#div#2;n#div#7;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/careers.html">
+    <entry file="file://$PROJECT_DIR$/do.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="920">
-          <caret line="40" column="35" selection-start-line="40" selection-start-column="35" selection-end-line="40" selection-end-column="35" />
+        <state relative-caret-position="5451">
+          <caret line="237" selection-start-line="237" selection-end-line="237" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/contact.html">
+    <entry file="file://$PROJECT_DIR$/do-damai.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="24" column="100" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="100" />
+        <state relative-caret-position="2944">
+          <caret line="128" column="40" selection-start-line="128" selection-start-column="40" selection-end-line="128" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/do.html">
+    <entry file="file://$PROJECT_DIR$/do-future.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="1035">
+          <caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/licheng.html">
+    <entry file="file://$PROJECT_DIR$/css/index.css">
       <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="19274">
+          <caret line="838" column="26" selection-start-line="838" selection-start-column="26" selection-end-line="838" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <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="73853">
+          <caret line="3211" column="19" selection-start-line="3211" selection-start-column="19" selection-end-line="3211" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/projects-1.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6532">
-          <caret line="284" column="19" selection-start-line="284" selection-start-column="19" selection-end-line="284" selection-end-column="19" />
+        <state relative-caret-position="2829">
+          <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
         </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="5612">
-          <caret line="244" column="36" selection-start-line="244" selection-start-column="36" selection-end-line="244" selection-end-column="36" />
+        <state relative-caret-position="8993">
+          <caret line="391" column="34" selection-start-line="391" selection-start-column="34" selection-end-line="391" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://F:/WorlkResource/时光轴/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="2235" column="12" selection-start-line="2235" selection-start-column="1" selection-end-line="2235" selection-end-column="12" />
+        <state relative-caret-position="667">
+          <caret line="29" selection-start-line="29" selection-end-line="29" />
         </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="521">
-          <caret line="598" lean-forward="true" selection-start-line="598" selection-end-line="598" />
+        <state relative-caret-position="270">
+          <caret line="813" column="33" selection-start-line="813" selection-start-column="25" selection-end-line="813" selection-end-column="33" />
           <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" />
+            <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>

css/style.css

@@ -15,13 +15,13 @@ body {
 .page {
 	width: 100%;
 	height: 100%;
-	/*max-width: 1440px;*/
-	/*max-height: 1024px;*/
 	position: relative;
-	margin: 0 auto;
+	/*margin: 0 auto;*/
+	margin-left: auto;
+	margin-right: auto;
+	text-align: center;
 	background: #fff;
 	overflow: hidden;
-	/*opacity: 0;*/
 }
 
 .inner-icon {
@@ -358,7 +358,7 @@ body {
 	.menu-list {
 		width: 100%;
 		margin: 0 auto;
-		margin-top: 9%;
+		margin-top: 10%;
 	}
 
 	.menu-list li {
@@ -430,7 +430,6 @@ body {
 	margin: 0 auto;
 	position: relative;
 	z-index: 10;
-	background: #fff;
 }
 .slideCanvas{
 	width: 100%;
@@ -841,6 +840,8 @@ body {
 /*****main for who we are****/
 .pageLayer{
 	z-index: 200;
+	width: 100%;
+	height: 100%;
 	-webkit-overflow-scrolling: touch;
 	overflow-y: scroll;
 }
@@ -977,8 +978,8 @@ body {
 	overflow-x: hidden;
 	overflow-y: auto;
 	position: absolute;
-	left: 0;
-	top: 0;
+	/*left: 0;*/
+	/*top: 0;*/
 	z-index: 210;
 	display: none;
 	line-height: 0;
@@ -1903,166 +1904,188 @@ body {
 		position: absolute;
 		top: 82%;
 		left: 30%;
+	}.menu-contact-map{
+         width: 33%;
+         height: 96px;
+         position: absolute;
+         left: 0%;
+     }
+    .menu-contact-phone{
+        width: 33%;
+        height: 96px;
+        position: absolute;
+        left: 33%;
+    }
+
+    .menu-contact-mail{
+        width: 33%;
+        height: 96px;
+        position: absolute;
+        left: 67%;
+    }
+    .map-icon{
+        width: 100%;
+        height: 32px;
+        position: relative;
+        text-align: center;
+    }
+    .map-img{
+        opacity: 0.2;
+        transform: scale(1);
+        animation: animationIcon 0.5s linear 1;
+    }
+    .map-address{
+        text-align: center;
+        width: 100%;
+        height: 32px;
+        position: relative;
+    }
+    .map-address p{
+        color: #FFFFFF;
+        opacity: 0;
+        font-size: 17px;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        animation: animationAddressDis 0.5s linear 1;
+    }
+    .map-desc{
+        text-align: center;
+        width: 120%;
+        height: 32px;
+        left: -10%;
+        position: relative;
+    }
+    .map-desc p{
+        opacity: 0;
+        animation: animationDescDis 0.5s linear 1;
+        color: #FFFFFF;
+        font-size: 13px;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        white-space:nowrap;
+    }
+
+    .phone-img{
+        opacity: 0.2;
+        transform: scale(1);
+        animation: animationIcon 0.5s linear 1;
+    }
+    .phone-icon{
+        width: 100%;
+        height: 32px;
+        position: relative;
+        text-align: center;
+    }
+    .phone-address{
+        text-align: center;
+        width: 100%;
+        height: 32px;
+        position: relative;
+    }
+    .phone-address p{
+        opacity: 0;
+        color: #FFFFFF;
+        font-size: 17px;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        animation: animationAddressDis 0.5s linear 1;
+    }
+    .phone-desc{
+        text-align: center;
+        width: 120%;
+        height: 32px;
+        left: -10%;
+        position: relative;
+    }
+    .phone-desc p{
+        opacity: 0;
+        font-size: 13px;
+        color: #FFFFFF;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        white-space:nowrap;
+        animation: animationDescDis 0.5s linear 1;
+    }
+
+    .email-img{
+        opacity: 0.2;
+        transform: scale(1);
+        animation: animationIcon 0.5s linear 1;
+    }
+    .email-icon{
+        width: 100%;
+        height: 32px;
+        position: relative;
+        text-align: center;
+    }
+    .email-address{
+        text-align: center;
+        width: 100%;
+        height: 32px;
+        position: relative;
+    }
+    .email-address p{
+        opacity: 0;
+        color: #FFFFFF;
+        font-size: 17px;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        animation: animationAddressDis 0.5s linear 1;
+    }
+    .email-desc{
+        text-align: center;
+        width: 120%;
+        height: 32px;
+        left: -10%;
+        position: relative;
+    }
+    .email-desc p{
+        opacity: 0;
+        color: #FFFFFF;
+        font-size: 13px;
+        height: 32px;
+        line-height: 32px;
+        vertical-align: center;
+        white-space:nowrap;
+        animation: animationDescDis 0.5s linear 1;
+    }
+
+
+}
+@media only screen and (max-height: 730px){
+	.menu-contact{
+		top: 80%;
+	}
+	.menu-list{
+		margin-top: 4%;
+	}
+}
+
+@media only screen and (width: 1024px){
+
+	.menu-contact{
+		width: 70%;
+		left: 15%;
 	}
 
 	.menu-contact-map{
 		width: 33%;
-		height: 96px;
-		position: absolute;
 		left: 0%;
 	}
 	.menu-contact-phone{
 		width: 33%;
-		height: 96px;
-		position: absolute;
 		left: 33%;
 	}
 
 	.menu-contact-mail{
 		width: 33%;
-		height: 96px;
-		position: absolute;
 		left: 67%;
 	}
-	.map-icon{
-		width: 100%;
-		height: 32px;
-		position: relative;
-		text-align: center;
-	}
-	.map-img{
-		opacity: 0.2;
-		transform: scale(1);
-		animation: animationIcon 0.5s linear 1;
-	}
-	.map-address{
-		text-align: center;
-		width: 100%;
-		height: 32px;
-		position: relative;
-	}
-	.map-address p{
-		color: #FFFFFF;
-		opacity: 0;
-		font-size: 17px;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		animation: animationAddressDis 0.5s linear 1;
-	}
-	.map-desc{
-		text-align: center;
-		width: 120%;
-		height: 32px;
-		left: -10%;
-		position: relative;
-	}
-	.map-desc p{
-		opacity: 0;
-		animation: animationDescDis 0.5s linear 1;
-		color: #FFFFFF;
-		font-size: 13px;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		white-space:nowrap;
-	}
-
-	.phone-img{
-		opacity: 0.2;
-		transform: scale(1);
-		animation: animationIcon 0.5s linear 1;
-	}
-	.phone-icon{
-		width: 100%;
-		height: 32px;
-		position: relative;
-		text-align: center;
-	}
-	.phone-address{
-		text-align: center;
-		width: 100%;
-		height: 32px;
-		position: relative;
-	}
-	.phone-address p{
-		opacity: 0;
-		color: #FFFFFF;
-		font-size: 17px;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		animation: animationAddressDis 0.5s linear 1;
-	}
-	.phone-desc{
-		text-align: center;
-		width: 120%;
-		height: 32px;
-		left: -10%;
-		position: relative;
-	}
-	.phone-desc p{
-		opacity: 0;
-		font-size: 13px;
-		color: #FFFFFF;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		white-space:nowrap;
-		animation: animationDescDis 0.5s linear 1;
-	}
-
-	.email-img{
-		opacity: 0.2;
-		transform: scale(1);
-		animation: animationIcon 0.5s linear 1;
-	}
-	.email-icon{
-		width: 100%;
-		height: 32px;
-		position: relative;
-		text-align: center;
-	}
-	.email-address{
-		text-align: center;
-		width: 100%;
-		height: 32px;
-		position: relative;
-	}
-	.email-address p{
-		opacity: 0;
-		color: #FFFFFF;
-		font-size: 17px;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		animation: animationAddressDis 0.5s linear 1;
-	}
-	.email-desc{
-		text-align: center;
-		width: 120%;
-		height: 32px;
-		left: -10%;
-		position: relative;
-	}
-	.email-desc p{
-		opacity: 0;
-		color: #FFFFFF;
-		font-size: 13px;
-		height: 32px;
-		line-height: 32px;
-		vertical-align: center;
-		white-space:nowrap;
-		animation: animationDescDis 0.5s linear 1;
-	}
-}
-@media only screen and (max-height: 680px){
-	.menu-contact{
-		top: 75%;
-	}
-	.menu-list{
-		margin-top: 3%;
-	}
 }
 /**
 *hover disapper animation
@@ -2230,16 +2253,16 @@ body {
 }
 .news-sample-list{
 	position: relative;
+	width: 100%;
+	height: 100%;
 }
 .news-detail{
 	position: fixed;
 	left: 0;
-	top: 64px;
-	z-index: 900;
+	z-index: 1001;
 	width: 100%;
 	height: 100%;
 	background-color: #FFFFFF;
-	/*max-height: 1500px;*/
 	transform: translateY(100%);
 	opacity: 0;
 	transition: all ease 1s
@@ -2251,8 +2274,10 @@ body {
 .article-close{
 	width: 40px;
 	height: 40px;
-	margin: 1px auto;
+	margin: 0px auto;
 	color: #ffffff;
+	/*margin-top: 64px;*/
+	text-align: center;
 	/*transform: scale(0.6);*/
 	font-family: "Arial";
 	font-size: 40px;
@@ -2264,6 +2289,10 @@ body {
 	position: relative;
 	z-index: 10;
 }
+.iframe-news{
+	width: 100%;
+	height: 100%;
+}
 .item-time{
 	bottom: 6%;
 	font-size: 16px;
@@ -2285,16 +2314,7 @@ body {
 	letter-spacing: 2.46px;
     opacity: 0.8;
 }
-.newsItem-mark{
-	top: 23%;
-}
-.newsItem-mark a{
-	font-size: 12px;
-	color: #fff;
-	line-height: 38px;
-	padding: 8px 30px;
-	background: #3FACBF;
-}
+
 @media only screen and (min-width: 750px){
 	.newsItem_1{
 		width: 91.6%;
@@ -2336,14 +2356,49 @@ body {
 		width: 100%;
 		object-fit: cover;
 	}
+	.item-title{
+		top: 35%;
+		font-size: 42px;
+		letter-spacing: 8px;
+	}
+	.item-title p{
+		font-size: 24px;
+		font-weight: 400;
+		letter-spacing: 2.46px;
+		opacity: 0.8;
+		padding-top: 15px;
+	}
+	.newsItem-mark a{
+		font-size: 12px;
+		color: #fff;
+		line-height: 38px;
+		padding: 8px 18px;
+		background: #3FACBF;
+	}
+	.newsItem-mark{
+		top: 23%;
+	}
+	.item-title-sub{
+		font-size: 33px;
+	}
+	.item-title-sub p{
+		font-size: 14px;
+	}
+	.news-body{
+		padding-top: 0%;
+	}
+	.item-time p{
+		font-size: 16px;
+		opacity: 0.8;
+	}
 }
 
 @media only screen and (max-width: 750px) and (-webkit-min-device-pixel-ratio:1.5){
     .newsBody{
         position: relative;
         width: 100%;
-        height: 662px;
-        margin-bottom: 25px;
+        /*height: 400px;*/
+        margin-bottom: 1px;
     }
     .newsItem_1{
 		width: 91.6%;
@@ -2353,7 +2408,7 @@ body {
 		position: relative;
 	}
 	.newsItem_1 .itemBg{
-		height: 331px;
+		height: 200px;
 		width: 100%;
 		object-fit: cover;
 	}
@@ -2364,7 +2419,7 @@ body {
 		margin-left: 4.2%;
 	}
 	.newsItem_2 .itemBg{
-		height: 331px;
+		height: 200px;
 		object-fit: cover;
 		width: 100%;
 	}
@@ -2375,10 +2430,48 @@ body {
 		margin-left: 4.2%;
 	}
 	.newsItem_3 .itemBg{
-		height: 331px;
+		height: 200px;
 		width: 100%;
 		object-fit: cover;
 	}
+	.item-title{
+		top: 35%;
+		font-size: 18px;
+		letter-spacing: 8px;
+		width: 90%;
+		margin-left: 5%;
+
+	}
+	.item-title p{
+		font-size: 12px;
+		font-weight: 400;
+		letter-spacing: 2.46px;
+		opacity: 0.8;
+		padding-top: 15px;
+	}
+	.newsItem-mark{
+		top: 12%;
+	}
+	.newsItem-mark a{
+		font-size: 12px;
+		color: #fff;
+		line-height: 38px;
+		padding: 6px 6px;
+		background: #3FACBF;
+	}
+	.item-title-sub{
+		font-size: 18px;
+	}
+	.item-title-sub p{
+		font-size: 8px;
+	}
+	.news-body{
+		padding-top: 11.5%;
+	}
+	.item-time p{
+		font-size: 10px;
+		opacity: 0.8;
+	}
 }
 /**
  *新闻列表页
@@ -2461,7 +2554,7 @@ body {
 	margin-top: 1px;
 }
 .news-list-item-title p{
-	font-size: 24px;
+	font-size: 16px;
 	color: #fff;
 	line-height: 68px;
 	vertical-align: center;

index.html

@@ -15,7 +15,6 @@
         .page {
             opacity: 0;
         }
-
         .top-menu {
             background: none;
         }
@@ -131,17 +130,17 @@
             <ul></ul>
             <div class="slider-title wow fadeIn" data-wow-delay="4s" data-wow-duration="1s" id="slider-title">测试字体位置
             </div>
-            <div class="link-box">
-                <a class="slider-links wow fadeIn" data-wow-delay="4s" data-wow-duration="1s" id="slider-links">了解详情</a>
-            </div>
+            <!--<div class="">-->
+                <!--<a class="slider-links wow fadeIn" data-wow-delay="4s" data-wow-duration="1s" id="slider-links">了解详情</a>-->
+            <!--</div>-->
         </div>
         <div class="small-slider">
             <img class="slider-img wow fadeIn" data-wow-delay="1s" data-wow-duration="2s"
                  src="http://yun-image.elab-plus.com/images/index/1_objects@2x.png"/>
-            <div class="link-box">
-                <a class="slider-links wow fadeIn" data-wow-delay="5.2s" data-wow-duration="1s"
-                   href="javascript:showProjects();">了解详情</a>
-            </div>
+            <!--<div class="">-->
+                <!--<a class="slider-links wow fadeIn" data-wow-delay="5.2s" data-wow-duration="1s"-->
+                   <!--href="javascript:showProjects();">了解详情</a>-->
+            <!--</div>-->
         </div>
     </div>
 
@@ -202,7 +201,7 @@
 
 <!--news center-->
 <div class="newsLayer pageLayer" hidden>
-    <iframe frameborder="0" height="100%" name="frameNews" scrolling="yes" src="news.html" width="100%"></iframe>
+    <iframe frameborder="0" name="frameNews" scrolling="yes" src="news.html" width="100%" height="100%"></iframe>
 </div>
 <!--/news center-->
 
@@ -345,7 +344,7 @@
                     // 	var $_html = `<li>
                     // <img class="slider-img animation" src="${host+img['image']}" />
                     // <div class="slider-title">${img['name']}</div>
-                    // <div class="link-box">
+                    // <div class="">
                     // 	<a href="javascript:showSliderLink('${img['url']}');" class="slider-links wow fadeIn" data-wow-duration="1s" data-wow-delay="4s">浏览作品</a>
                     // </div>
                     //   </li>`;
@@ -403,7 +402,8 @@
             console.log(tmpImgs[i].src + "|" + tmpImgs[i].width + tmpImgs[i].height);
             // Imgs.set(tmpImgs[i].src, {width :tmpImgs[i].width, height:tmpImgs[i].height});
             if (ImgLoaded == Count) {
-                console.log(Imgs);
+                console.log("onLoad:"+JSON.stringify(Imgs));
+                debugger
                 var initCanvasSlideshow = new CanvasSlideshow({
                     sprites: spriteImagesSrc,
                     displacementImage: 'water/img/dmaps/2048x2048/clouds.jpg',

licheng.html

@@ -271,7 +271,7 @@
 			<div class="section2 wrap wow fadeInUp" data-wow-duration="1s">
 				<h3>公司简介</h3>
 				<p>ELAB是一家以技术和数据驱动的新型未来人居空间开发的互联网平台型公司。我们以客户需求为核心，实现创新性产品的预制性开发，并为开发商提供系统性整体解决方案。</p>
-				<p>ELAB致力于实现居者及开发企业的价值最大化。通过技术、数据、产品赋能，逆转传统从土地到客户充满不确定性高风险的开发旧模式（B2C）为从客户到土地的新型房地产开发模式（C2B），从源头解行业痛点，帮助企业长期可持续发展，同时从居者出发，挖掘居者真实居住需求，打造未来人居产品。</p>
+				<p>ELAB致力于实现居者及开发企业的价值最大化。通过技术、数据、产品赋能，逆转传统从土地到客户充满不确定性高风险的开发旧模式（B2C）为从客户到土地的新型房地产开发模式（C2B），从源头解决行业痛点，帮助企业长期可持续发展，同时从居者出发，挖掘居者真实居住需求，打造未来人居产品。</p>
 			</div>
 			<div class="section3 wrap">
 				<h3 class="wow fadeInRight" data-wow-duration="1s" data-wow-delay="0.5s">业务范畴</h3>

loading.html

@@ -26,7 +26,7 @@
     	}
     	.logo{
     		margin-top: -10%;
-    		margin-bottom: 0;
+    		margin-bottom: 3.5%;
     	}
     	.progress-num{
     		margin: 0 auto;
@@ -213,7 +213,7 @@
     var mock = setInterval(function () {
         var mock = mockloaded();
         $("#progress-num").text(mock);
-        $(".number-pb-shown").css("width", "" + mock + "%");
+        $(".number-pb-shown").css("width", "" + mock + "%"Arita);
     },100);
 
     //预加载图片

news.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
     <title>NEWS CENTER</title>
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <link href="css/reset.css" rel="stylesheet"/>
     <link href="css/style.css?v=0.346785347683" rel="stylesheet"/>
     <link href="css/animate.min.css" rel="stylesheet"/>
@@ -181,148 +182,45 @@
             $(".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");
             $(".top-menu-news").css("background-color","#2C2E34");
-            // var parentDiv = document.getElementById("iframeParent");
             $("#iframeParent").empty();
         });
 
         <!-- menu hover start-->
         $('.elab_who').hover(function () {
             currentIdx = 1;
-
-            // $(".elab_who").css("opacity","1");
-            // $(".elab_who").removeClass("animate_fadeIn");
-            // $(".elab_what").removeClass("animate_fadeIn");
-            // $(".elab_news").removeClass("animate_fadeIn");
-            // $(".elab_project").removeClass("animate_fadeIn");
-            // $(".elab_contact").removeClass("animate_fadeIn");
-            //
-            // $(".elab_what").addClass("animate_fadeOut");
-            // $(".elab_news").addClass("animate_fadeOut");
-            // $(".elab_project").addClass("animate_fadeOut");
-            // $(".elab_contact").addClass("animate_fadeOut");
         },function () {
             currentIdx = 0;
-            // $(".elab_who").css("opacity","1");
-            //
-            // $(".elab_who").removeClass("animate_fadeOut");
-            // $(".elab_what").removeClass("animate_fadeOut");
-            // $(".elab_news").removeClass("animate_fadeOut");
-            // $(".elab_project").removeClass("animate_fadeOut");
-            // $(".elab_contact").removeClass("animate_fadeOut");
-
-            // $(".elab_what").addClass("animate_fadeIn");
-            // $(".elab_news").addClass("animate_fadeIn");
-            // $(".elab_project").addClass("animate_fadeIn");
-            // $(".elab_contact").addClass("animate_fadeIn");
         });
 
         $('.elab_what').hover(function () {
             currentIdx = 2;
-            // $(".elab_what").css("opacity","1");
-            // $(".elab_who").removeClass("animate_fadeIn");
-            // $(".elab_what").removeClass("animate_fadeIn");
-            // $(".elab_news").removeClass("animate_fadeIn");
-            // $(".elab_project").removeClass("animate_fadeIn");
-            // $(".elab_contact").removeClass("animate_fadeIn");
 
         },function () {
             currentIdx = 0;
-           /* $(".elab_what").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeOut");
-            $(".elab_what").removeClass("animate_fadeOut");
-            $(".elab_news").removeClass("animate_fadeOut");
-            $(".elab_project").removeClass("animate_fadeOut");
-            $(".elab_contact").removeClass("animate_fadeOut");*/
-
-            // $(".elab_who").addClass("animate_fadeIn");
-            // $(".elab_news").addClass("animate_fadeIn");
-            // $(".elab_project").addClass("animate_fadeIn");
-            // $(".elab_contact").addClass("animate_fadeIn");
         });
 
         $('.elab_news').hover(function () {
             currentIdx = 3;
-            /*$(".elab_news").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeIn");
-            $(".elab_what").removeClass("animate_fadeIn");
-            $(".elab_news").removeClass("animate_fadeIn");
-            $(".elab_project").removeClass("animate_fadeIn");
-            $(".elab_contact").removeClass("animate_fadeIn");*/
 
         },function () {
             currentIdx = 0;
-            /*$(".elab_news").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeOut");
-            $(".elab_what").removeClass("animate_fadeOut");
-            $(".elab_news").removeClass("animate_fadeOut");
-            $(".elab_project").removeClass("animate_fadeOut");
-            $(".elab_contact").removeClass("animate_fadeOut");*/
-
-            // $(".elab_who").addClass("animate_fadeIn");
-            // $(".elab_what").addClass("animate_fadeIn");
-            // $(".elab_project").addClass("animate_fadeIn");
-            // $(".elab_contact").addClass("animate_fadeIn");
         });
 
         $('.elab_project').hover(function () {
             currentIdx = 4;
-            /*$(".elab_project").css("opacity","1");
-
-            $(".elab_who").removeClass("animate_fadeIn");
-            $(".elab_what").removeClass("animate_fadeIn");
-            $(".elab_news").removeClass("animate_fadeIn");
-            $(".elab_project").removeClass("animate_fadeIn");
-            $(".elab_contact").removeClass("animate_fadeIn");
-
-            $(".elab_who").addClass("animate_fadeOut");
-            $(".elab_what").addClass("animate_fadeOut");
-            $(".elab_news").addClass("animate_fadeOut");
-            $(".elab_contact").addClass("animate_fadeOut");*/
         },function () {
             currentIdx = 0;
-            /*$(".elab_project").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeOut");
-            $(".elab_what").removeClass("animate_fadeOut");
-            $(".elab_news").removeClass("animate_fadeOut");
-            $(".elab_project").removeClass("animate_fadeOut");
-            $(".elab_contact").removeClass("animate_fadeOut");
-
-            $(".elab_who").addClass("animate_fadeIn");
-            $(".elab_what").addClass("animate_fadeIn");
-            $(".elab_news").addClass("animate_fadeIn");
-            $(".elab_contact").addClass("animate_fadeIn");*/
         });
 
         $('.elab_contact').hover(function () {
             currentIdx = 5;
-            /*$(".elab_contact").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeIn");
-            $(".elab_what").removeClass("animate_fadeIn");
-            $(".elab_news").removeClass("animate_fadeIn");
-            $(".elab_project").removeClass("animate_fadeIn");
-            $(".elab_contact").removeClass("animate_fadeIn");
-
-            $(".elab_who").addClass("animate_fadeOut");
-            $(".elab_what").addClass("animate_fadeOut");
-            $(".elab_news").addClass("animate_fadeOut");
-            $(".elab_project").addClass("animate_fadeOut");*/
         },function () {
             currentIdx = 0;
-           /* $(".elab_contact").css("opacity","1");
-            $(".elab_who").removeClass("animate_fadeOut");
-            $(".elab_what").removeClass("animate_fadeOut");
-            $(".elab_news").removeClass("animate_fadeOut");
-            $(".elab_project").removeClass("animate_fadeOut");
-            $(".elab_contact").removeClass("animate_fadeOut");
-
-            $(".elab_who").addClass("animate_fadeIn");
-            $(".elab_what").addClass("animate_fadeIn");
-            $(".elab_news").addClass("animate_fadeIn");
-            $(".elab_project").addClass("animate_fadeIn");*/
         });
         <!-- menu hover end -->
         <!--mouse over listener start-->
         <!--mouse over listener end-->
+
         setInterval(function () {
             if(markIdx !== currentIdx){
                 markIdx = currentIdx;
@@ -385,7 +283,7 @@
         var $_list;
         var $_listV;
         // 192.168.0.16
-        //读取分类数据 106.14.225.13
+        //读取分类数据 106.14.225.13(正式)
         $.get("http://106.14.225.13:8081/rest/listNews", function (result) {
             console.log("Result Data:" + JSON.stringify(result.result));
             window.newsList = result.result;
@@ -416,27 +314,32 @@
                         var $_img2 = tmp2['bgImage'] || 'http://yun-image.elab-plus.com/images/projects/1_objects@2x_14.jpg';
 
                         var data0 = new Date(tmp0['created']);
+                        var data1 = new Date(tmp1['created']);
+                        var data2 = new Date(tmp2['created']);
+                        if(this.isSafari()){
+                            data0 = new Date(this.getDateForSafari(tmp0['created']));
+                            data1 = new Date(this.getDateForSafari(tmp1['created']));
+                            data2 = new Date(this.getDateForSafari(tmp2['created']));
+                        }
                         console.log("tmp0['created']:"+tmp0['created']);
                         console.log("data0:"+data0.getFullYear());
                         console.log("data0:"+data0.getMonth());
                         console.log("data0:"+data0.getDate());
-                        var data1 = new Date(tmp1['created']);
-                        var data2 = new Date(tmp2['created']);
 
-                        $_html = `<div class="newsItem_1 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i})" >
+                        $_html = `<div class="newsItem_1 " 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">${tmp0['title']}<p>${tmp0['subTitle']}</p></div>
 					                  <div class="item-time item-time-inner"><p>${data0.getFullYear()+'.'+(data0.getMonth()+1)+'.'+data0.getDate()}</p></div>
 				                  </div>
 				                  <div class="newsBody">
-				                    <div class="newsItem_2 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i+1})">
+				                    <div class="newsItem_2" target="_self" onclick="turnToArticle(${i+1})">
 				                        <img class="itemBg" src="${$_img1}" />
 				                        <div class="newsItem-mark item-inner"><a>${tmp1['tag']}</a></div>
 					                    <div class="item-title item-inner item-title-sub">${tmp1['title']}<p>${tmp1['subTitle']}</p></div>
 					                    <div class="item-time item-time-inner"><p>${data1.getFullYear()+'.'+(data1.getMonth()+1)+'.'+data1.getDate()}</p></div>
                                     </div>
-                                    <div class="newsItem_3 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i+2})">
+                                    <div class="newsItem_3 " target="_self" onclick="turnToArticle(${i+2})">
 				                        <img class="itemBg" src="${$_img2}" />
 				                        <div class="newsItem-mark item-inner"><a>${tmp2['tag']}</a></div>
 					                    <div class="item-title item-inner item-title-sub">${tmp2['title']}<p>${tmp2['subTitle']}</p></div>
@@ -449,15 +352,19 @@
                         var $_img1 = tmp1['bgImage'] || 'http://yun-image.elab-plus.com/images/projects/1_objects@2x_14.jpg';
                         var data0 = new Date(tmp0['created']);
                         var data1 = new Date(tmp1['created']);
+                        if(this.isSafari()){
+                            data0 = new Date(this.getDateForSafari(tmp0['created']));
+                            data1 = new Date(this.getDateForSafari(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 " 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>
 					                    <div class="item-time item-time-inner"><p>${data0.getFullYear()+'.'+(data0.getMonth()+1)+'.'+data0.getDate()}</p></div>
                                     </div>
-                                    <div class="newsItem_3 wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s" target="_self" onclick="turnToArticle(${i+1})">
+                                    <div class="newsItem_3 " target="_self" onclick="turnToArticle(${i+1})">
 				                        <img class="itemBg" src="${$_img1}" />
 				                        <div class="newsItem-mark item-inner"><a>${tmp1['tag']}</a></div>
 					                    <div class="item-title item-inner item-title-sub">${tmp1['title']}<p>${tmp1['subTitle']}</p></div>
@@ -468,9 +375,12 @@
                     }else if(tmp0 && !tmp1 && !tmp2){
                         var $_img0 = tmp0['bgImage'] || 'http://yun-image.elab-plus.com/images/projects/1_objects@2x_14.jpg';
                         var data0 = new Date(tmp0['created']);
+                        if(this.isSafari()){
+                            data0 = new Date(this.getDateForSafari(tmp0['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" 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>
@@ -502,14 +412,14 @@
 
                                       <div class="news-list-item-left" onclick="turnToArticle(${i})">
 
-                                        <div class="news-list-item-box"><p>${item1['id']}</p></div>
+                                        <div class="news-list-item-box"><p>${$_listV.length-i}</p></div>
                                         <div class="news-list-item-description">
                                             <div class="news-list-item-title"><p>${item1['title'].replace("<br>","")}</p></div>
                                             <div class="news-list-item-bottom"></div>
                                         </div>
                                       </div>
-                                      <div class="news-list-item-right" onclick="turnToArticle(${i+1})">
-                                        <div class="news-list-item-box"><p>${item2['id']}</p></div>
+                                      <div class="news-list-item-right" onclick="turnToArticle(${(i+1)})">
+                                        <div class="news-list-item-box"><p>${$_listV.length-i-1}</p></div>
                                         <div class="news-list-item-description">
                                             <div class="news-list-item-title"><p>${item2['title'].replace("<br>","")}</p></div>
                                             <div class="news-list-item-bottom"></div>
@@ -519,8 +429,8 @@
                                  `;
                 }else if(!item2 && item1){
                     $_html = `<div class="news-list-item wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="${$_t}s">
-                                      <div class="news-list-item-left" onclick="turnToArticle(${i})">
-                                        <div class="news-list-item-box"><p>${item1['id']}</p></div>
+                                      <div class="news-list-item-left" onclick="turnToArticle(${(i)})">
+                                        <div class="news-list-item-box"><p>${$_listV.length-i}</p></div>
                                         <div class="news-list-item-description">
                                             <div class="news-list-item-title"><p>${item1['title'].replace("<br>","")}</p></div>
                                             <div class="news-list-item-bottom"></div>
@@ -554,8 +464,14 @@
                 $(".news_tab_img").attr("src", "https://dm.static.elab-plus.com/elabGuanWang/List@2x.png");
                 $(".news-list").empty();
                 handleModuleShow();
-                $(".news-body").css("padding-top","0%");
+
                 $(".top-menu-news").css("background-color","#2C2E34");
+                if(this.devicePc()){
+                    $(".news-body").css("padding-top","0%");
+                }else {
+                    $(".news-body").css("padding-top","11.5%");
+                }
+
             }
         }
         $(".news_tab_img").on("click", function (e) {
@@ -575,13 +491,38 @@
         wow.init();
     }
 
+    /**
+     * check safari浏览器
+     * @returns {boolean}
+     */
+    function isSafari() {
+        return !!(navigator.userAgent.match('Safari') && !navigator.userAgent.match('CriOS') && !navigator.userAgent.match('QQBrowser') && !navigator.userAgent.match('Chrome'));
+    }
+
+    /**
+     * 获取safari环境下的时间戳
+     * @param date 2018-12-10T02:35:08.000+0000
+     */
+    function getDateForSafari(date){
+        var year = date.substr(0,4);
+        var month = date.substr(5,2);
+        var day = date.substr(8,2);
+        console.log("year："+year);
+        console.log("month："+month);
+        console.log("day："+day);
+        return year+"/"+month+"/"+day;
+    }
+
     function menuShowProjects() {
         top.closeAndShowPro('projectsLayer');
     }
 
     function turnToArticle(data) {
         item = window.newsList[data];
-        lineUrl = item["linkUrl"];
+        lineUrl = item["linkPcUrl"];
+        if(!this.devicePc()){
+            lineUrl = item["linkUrl"];
+        }
         var parentDiv = document.getElementById("iframeParent");
         articleCloseBtn = document.createElement("Div");
         articleCloseBtn.setAttribute('class',"article-close");
@@ -589,12 +530,16 @@
         parentDiv.appendChild(articleCloseBtn);
         iframeHtml = document.createElement("iframe");
         iframeHtml.setAttribute('frameborder','0');
-        iframeHtml.setAttribute('height','100%');
+        iframeHtml.setAttribute('height','100vh');
         iframeHtml.setAttribute('width','100%');
         iframeHtml.setAttribute('scrolling','yes');
         iframeHtml.setAttribute('name','newsIframe');
+        iframeHtml.setAttribute('class',"iframe-news");
+        iframeHtml.setAttribute('id',"iframe-news");
+        iframeHtml.onload = function(){
+            // reinitIframe();
+        };
         parentDiv.appendChild(iframeHtml);
-        // window.frames.newsIframe.window.location.reload(true);
         iframeHtml.setAttribute('src',lineUrl);
 
         $(".top-menu-news").css("background-color","#FFFFFF");
@@ -608,8 +553,56 @@
         $(".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() {
+        // var iframe = document.getElementById("iframe-news");
+        var iframe = $("#iframe-news");
+        setTimeout(function () {
+            var height = iframe.contents().find("body").height();
+            console.log("reinitIframe："+height);
+        },500);
+    }
+
+    function setIframeHeight(iframeId){
+        var iframe = document.getElementById(iframeId);
+        console.log("setIframeHeight");
+        if (document.getElementById){
+            if (iframe && !window.opera){
+                if (iframe.contentDocument && iframe.contentDocument.body.offsetHeight){
+                    iframe.height = iframe.contentDocument.body.offsetHeight + 20; //FF NS
+                }else if(iframe.Document && iframe.Document.body.scrollHeight){
+                    iframe.height = iframe.Document.body.scrollHeight + 10;
+                }else{
+                    if(iframe.contentWindow.document && iframe.contentWindow.document.body.scrollHeight) {
+                        iframe.height = iframe.contentWindow.document.body.scrollHeight;
+                    }
+                }
+            }
+        }
+    }
+
+    function devicePc() {
+        var sUserAgent = navigator.userAgent.toLowerCase();
+        var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
+        var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
+        var bIsMidp = sUserAgent.match(/midp/i) == "midp";
+        var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
+        var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
+        var bIsAndroid = sUserAgent.match(/android/i) == "android";
+        var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
+        var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
+
+        if (bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM) {
+            return false;
+        } else {
+            return true;
+        }
+
+    }
 </script>
 </body>
 </html>

projects-1-1.html

@@ -86,7 +86,7 @@
 						<p>90天内完成产品创新及可行性的验证</p>
 					</div>
 					<div class="words2 wow fadeInRight" data-wow-duration="1s" data-wow-delay="0.5s">
-						我们在线收集了大量C端的产品设计需求热度数据，并在2016年举办 全球新锐设计师大赛，众智众筹，向全球300多家知名设计单位和个人征集作品。大师评 审团最终评选出20家入围作品和8家优胜奖，这些作品成为了大量量的创新产品原型。
+						我们在线收集了大量C端的产品设计需求热度数据，并在2016年举办全球新锐设计师大赛，众智众筹，向全球300多家知名设计单位和个人征集作品。大师评审团最终评选出20家入围作品和8家优胜奖，这些作品成为了大量的创新产品原型。
 					</div>
 					<div class="item-link item-inner wow fadeInUp" data-wow-duration="1s" data-wow-delay="0.5s"><a id='video_btn_global' href="javascript:;" class="parts-links">查看视频</a></div>
 				</div>

projects.html

@@ -404,7 +404,6 @@
                     $(".project-list").append($_html);
                 }
             }
-
         });
 
     });

videoTest.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang='en'>
+
+<head>
+    <meta charset="UTF-8">
+    <meta content='width=device-width, initial-scale=1.0,user-scalable=no' name='viewport'>
+    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
+    <style type="text/css">
+        .videoContent{
+            width: 100vw;
+            height: 100vh;
+            object-fit: fill;
+        }
+        .videoBg{
+            width: 100vw;
+            height:100vh;
+            background-color: white;
+        }
+    </style>
+</head>
+<body>
+<div class="videoBg">
+    <video class="videoContent" controls src="https://dm.static.elab-plus.com/bjJinMaoFu/item_video_0.mp4"></video>
+</div>
+</body>
+<script></script>
+</html>

water/js/main.js

@@ -3,13 +3,12 @@
     window.CanvasSlideshow = function( options ) {
 
 
-
+        console.log("CanvasSlideshow:"+JSON.stringify(options));
       //  SCOPE
       /// ---------------------------
       var that  =   this;
 
-
-
+      debugger
       //  OPTIONS
       /// ---------------------------
       options                     = options || {};
@@ -153,7 +152,7 @@
 				var origImages = options.origImages;
 				var scaleX;
 				var scaleY;
-
+          console.log("origImages:"+JSON.stringify(origImages));
         for ( var i = 0; i < rSprites.length; i++ ) {
 
 					var texture   = new PIXI.Texture.fromImage( sprites[i]);