Merge branch 'master' into xqc_1017

pages.json

@@ -269,6 +269,14 @@
             "navigationBarTitleText": "策略系列培训",
             "enablePullDownRefresh": false
           }
+        },
+        {
+        	"path" : "otherReport/otherReport",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "报告",
+        		"enablePullDownRefresh" : false
+        	}
         }
       ]
     },

reportPages/otherReport/otherReport.vue

@@ -0,0 +1,48 @@
+<template>
+  <block>
+    <view class="container reportDetail-container">
+      <web-view :src="linkUrl">
+        <cover-view class="search-view"> </cover-view>
+      </web-view>
+    </view>
+  </block>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      linkUrl: "",
+    };
+  },
+
+  methods: {},
+  onLoad(option) {
+    this.linkUrl = decodeURIComponent(option.reportUrl) || "";
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.reportDetail-container {
+  background-color: #fff;
+  padding-bottom: 200rpx;
+  padding-bottom: calc(200rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(200rpx + env(safe-area-inset-bottom));
+  .search-view {
+    position: fixed;
+    width: 100%;
+    height: 100rpx;
+    background: #fff;
+    z-index: 99999;
+    font-size: 24rpx;
+    box-sizing: border-box;
+    .search-icon {
+      width: 147rpx;
+      height: 40rpx;
+      margin: 0 15rpx;
+      z-index: 99999;
+    }
+  }
+}
+</style>