修复iframe跨域的问题

.idea/workspace.xml

@@ -32,8 +32,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/news.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="431">
-              <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="15" />
+            <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>
@@ -107,8 +107,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="316">
-              <caret line="2203" column="17" lean-forward="true" selection-start-line="2203" selection-start-column="17" selection-end-line="2203" selection-end-column="17" />
+            <state 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>
           </provider>
         </entry>
@@ -124,11 +124,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inner-main</find>
-      <find>item-time</find>
-      <find>newsItem_3</find>
-      <find>newsBody</find>
-      <find>news_tab_img</find>
       <find>$_list</find>
       <find>closeContact</find>
       <find>footer</find>
@@ -147,13 +142,18 @@
       <find>106.14.225.13</find>
       <find>window.newsList</find>
       <find>article-close</find>
-      <find>news-detail</find>
       <find>lineUrl</find>
       <find>news-list-item</find>
       <find>news-iframe</find>
       <find>news-list-item-left</find>
       <find>news-list</find>
       <find>news-body</find>
+      <find>newsIframe</find>
+      <find>item</find>
+      <find>iframeHtml</find>
+      <find>news-detail</find>
+      <find>parentDiv</find>
+      <find>iframeParent</find>
     </findStrings>
     <replaceStrings>
       <replace>750</replace>
@@ -194,7 +194,7 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -213,16 +213,6 @@
               <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="js" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -233,7 +223,7 @@
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544183911239" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544189755358" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -291,18 +281,19 @@
       <workItem from="1544167194982" duration="2510000" />
       <workItem from="1544170883585" duration="2826000" />
       <workItem from="1544177630507" duration="14000" />
-      <workItem from="1544177742847" duration="6121000" />
+      <workItem from="1544177742847" duration="6587000" />
+      <workItem from="1544184995399" duration="4830000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="165830000" />
+    <option name="totallyTimeSpent" value="171126000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="1358" y="-8" width="1936" height="1056" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22867803" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23134328" />
       <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" />
@@ -451,15 +442,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="2203" column="17" lean-forward="true" selection-start-line="2203" selection-start-column="17" selection-end-line="2203" selection-end-column="17" />
+        <state 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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/news.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="431">
-          <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="15" />
+        <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>

news.html

@@ -130,9 +130,9 @@
     <div class="news_narrow">
         <img class="news_tab_img" src = "https://dm.static.elab-plus.com/elabGuanWang/List@2x.png"/>
     </div>
-    <div class="news-detail">
-        <div class="article-close"></div>
-        <iframe frameborder="0" height="100%" scrolling="yes" name="newsIframe" class="news-iframe" width="100%"></iframe>
+    <div class="news-detail" id="iframeParent">
+        <!--<div class="article-close" id="articleCloseBtn"></div>-->
+        <!--<iframe frameborder="0" height="100%" scrolling="yes" name="newsIframe" class="news-iframe" width="100%"></iframe>-->
     </div>
     <div class="news-body">
         <div class="news-list"></div>
@@ -153,6 +153,8 @@
     var lastClassName ='';
     var lineUrl = null;
     var item = null;
+    var articleCloseBtn;
+    var iframeHtml;
     $(function () {
 
         $("news-body").on("touchmove",(e)=>{
@@ -179,6 +181,8 @@
             $(".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-->
@@ -578,15 +582,27 @@
     function turnToArticle(data) {
         item = window.newsList[data];
         lineUrl = item["linkUrl"];
-        var frame = document.getElementsByClassName("news-iframe")[0];
-        // document.getElementsByClassName('news-iframe').window.location.reload(true);
-        window.frames.newsIframe.window.location.reload(true);
+        var parentDiv = document.getElementById("iframeParent");
+        articleCloseBtn = document.createElement("Div");
+        articleCloseBtn.setAttribute('class',"article-close");
+        articleCloseBtn.setAttribute('id','articleCloseBtn');
+        parentDiv.appendChild(articleCloseBtn);
+        iframeHtml = document.createElement("iframe");
+        iframeHtml.setAttribute('frameborder','0');
+        iframeHtml.setAttribute('height','100%');
+        iframeHtml.setAttribute('width','100%');
+        iframeHtml.setAttribute('scrolling','yes');
+        iframeHtml.setAttribute('name','newsIframe');
+        parentDiv.appendChild(iframeHtml);
+        // window.frames.newsIframe.window.location.reload(true);
+        iframeHtml.setAttribute('src',lineUrl);
+
         $(".top-menu-news").css("background-color","#FFFFFF");
         if(!lineUrl){
             return
         }
-        frame.src = lineUrl;
-        // $(".news-iframe").attr("src",lineUrl);
+        // 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");