bding преди 2 години
родител
ревизия
f4b073fed7
променени са 2 файла, в които са добавени 51 реда и са изтрити 38 реда
  1. 46 36
      pageMy/reportPage/reportPage.vue
  2. 5 2
      pageMy/reportRevolve/reportRevolve.vue

+ 46 - 36
pageMy/reportPage/reportPage.vue

@@ -1,43 +1,43 @@
 <template>
   <view class="container reportDetail-container">
     <block v-if="haveAuth === 1">
-      <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl">
-        <cover-view class="search-view">
-          <cover-view class="search-view-box" v-if="reportInfo.IsShowFollowButton">
-            <cover-view>若对该赛道不感兴趣,可点击</cover-view>
-            <cover-image
-              class="search-icon"
-              @click="isFollowHandler"
-              :src="reportInfo.IsFollowButton ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/close_follow.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/follow_.png'"
-            ></cover-image>
-          </cover-view>
+      <!-- <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl"> -->
+      <cover-view class="search-view">
+        <cover-view class="search-view-box" v-if="reportInfo.IsShowFollowButton">
+          <cover-view>若对该赛道不感兴趣,可点击</cover-view>
+          <cover-image
+            class="search-icon"
+            @click="isFollowHandler"
+            :src="reportInfo.IsFollowButton ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/close_follow.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/follow_.png'"
+          ></cover-image>
         </cover-view>
-        <cover-view class="footer-con">
-          <cover-view class="handle-item" @click="goRevolvePage">
-            <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/report-revolve.png"></cover-image>
-            <cover-view>全屏</cover-view>
-          </cover-view>
-          <cover-view class="handle-item" @click="leavingMessage">
-            <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/leaving_message.png"></cover-image>
-            <cover-view>留言</cover-view>
-          </cover-view>
-          <cover-view class="handle-item" @click="collectHandle">
-            <cover-image
-              class="download-img"
-              :src="isCollection ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png'"
-            ></cover-image>
-            <cover-view>收藏</cover-view>
-          </cover-view>
-          <cover-view class="handle-item" v-if="fileLink" @click="downloadFile">
-            <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/down_ico.png"></cover-image>
-            <cover-view>下载</cover-view>
-          </cover-view>
+      </cover-view>
+      <cover-view class="footer-con">
+        <cover-view class="handle-item" @click="goRevolvePage">
+          <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/report-revolve.png"></cover-image>
+          <cover-view>全屏</cover-view>
         </cover-view>
-        <cover-view class="footer-free-charge free-charge" v-if="isShowFree">
-          <cover-image class="img" @click="toggle" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/free_icon.png"></cover-image>
-          <cover-image @click="removeBton" class="remove-icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/free_%20remove.png"></cover-image>
+        <cover-view class="handle-item" @click="leavingMessage">
+          <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/leaving_message.png"></cover-image>
+          <cover-view>留言</cover-view>
         </cover-view>
-      </web-view>
+        <cover-view class="handle-item" @click="collectHandle">
+          <cover-image
+            class="download-img"
+            :src="isCollection ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png'"
+          ></cover-image>
+          <cover-view>收藏</cover-view>
+        </cover-view>
+        <cover-view class="handle-item" v-if="fileLink" @click="downloadFile">
+          <cover-image class="download-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/down_ico.png"></cover-image>
+          <cover-view>下载</cover-view>
+        </cover-view>
+      </cover-view>
+      <cover-view class="footer-free-charge free-charge" v-if="isShowFree">
+        <cover-image class="img" @click="toggle" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/free_icon.png"></cover-image>
+        <cover-image @click="removeBton" class="remove-icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/free_%20remove.png"></cover-image>
+      </cover-view>
+      <!-- </web-view> -->
     </block>
     <view class="noauth-cont" v-else-if="haveAuth === 2 || haveAuth === 3 || haveAuth === 4 || haveAuth === 5">
       <block v-if="!isShowAlert">
@@ -307,9 +307,19 @@ export default {
     },
     // 去往横屏页面
     goRevolvePage() {
-      let token = this.reportInfo.HttpUrl.split("=")[1];
+      let token = this.reportInfo.HttpUrl;
       uni.navigateTo({
-        url: "/pageMy/reportRevolve/reportRevolve?user=" + token + "&url=" + this.reportInfo.HttpUrl,
+        url: "/pageMy/reportRevolve/reportRevolve",
+        events: {
+          // 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
+          acceptDataFromOpenedPage: function (data) {
+            console.log(data);
+          },
+        },
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据
+          res.eventChannel.emit("acceptDataFromOpenerPage", { url: JSON.stringify(token) });
+        },
       });
     },
   },

+ 5 - 2
pageMy/reportRevolve/reportRevolve.vue

@@ -25,8 +25,11 @@ export default {
     },
   },
   onLoad(option) {
-    this.reportUrl = option.url + "?token=" + option.user;
-    console.log(option, this.reportUrl);
+    const eventChannel = this.getOpenerEventChannel();
+    // 监听acceptDataFromOpenerPage事件,获取上一页面通过eventChannel传送到当前页面的数据
+    eventChannel.on("acceptDataFromOpenerPage", function ({ url }) {
+      this.reportUrl = JSON.parse(decodeURIComponent(url));
+    });
   },
 };
 </script>