Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-live

src/layout/live/head.vue

@@ -36,7 +36,7 @@
                 <a @click="turnTo('home')" target="">首页</a>
               </li> -->
               <li class="">
-                <a @click="turnTo('hall_index')">直播大厅</a>
+                <a href="/static/liveIndex.html" target="_blank">直播大厅</a>
               </li>
               <li :class="isTab('market') ? 'active' : ''">
                 <a @click="turnTo('market')" target="">科技超市</a>

src/views/home.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="home">
-    <iframe width="100%" style="height:99vh;" frameborder="0" src="/static/home.html"></iframe>
+    <!-- <iframe width="100%" style="height:99vh;" frameborder="0" src="/static/home.html"></iframe> -->
   </div>
 </template>
 
@@ -11,7 +11,9 @@ export default {
   props: {},
   components: {},
   data: () => ({}),
-  created() {},
+  created() {
+    window.open('/static/home.html');
+  },
   methods: {},
   computed: {
     ...mapState(['user']),