Merge branch 'master' of http://git.cc-lotus.info/service-platform/mobile-official into master

src/views/live/detail.vue

@@ -2,12 +2,13 @@
   <div id="roomDetail">
     <el-row>
       <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
+        <videoDetail2></videoDetail2>
+        <!-- <el-col :span="24" class="top">
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <videoDetail></videoDetail>
-        </el-col>
+          <videoDetail2></videoDetail2>
+        </el-col> -->
       </el-col>
     </el-row>
   </div>
@@ -17,14 +18,14 @@
 import { mapState, createNamespacedHelpers } from 'vuex';
 import NavBar from '@/layout/common/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
-import videoDetail from './parts/videoDetail.vue';
+import videoDetail2 from './parts/videoDetail2.vue';
 
 export default {
   name: 'roomDetail',
   props: {},
   components: {
-    NavBar,
-    videoDetail, //视频
+    // NavBar,
+    videoDetail2, //视频
   },
   data: function() {
     return {

src/views/live/parts/videoDetail2.vue

@@ -0,0 +1,88 @@
+<template>
+  <div id="videoDetail2">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="video">
+          <el-link :underline="false" class="back" @click="back()"><i class="el-icon-arrow-left"></i></el-link>
+        </el-col>
+        <el-col :span="24" class="chat">
+          聊天
+        </el-col>
+        <el-col :span="24" class="market">
+          科技超市
+        </el-col>
+        <el-col :span="24" class="jbxm">
+          嘉宾，项目
+        </el-col>
+        <el-col :span="24" class="company">
+          主办单位
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'videoDetail2',
+  props: {},
+  components: {},
+  data: function() {
+    return {
+      // 展会id
+      dock_id: '',
+    };
+  },
+  created() {
+    if (this.id) {
+      this.$set(this, `dock_id`, this.id);
+    }
+  },
+  methods: {
+    // 返回
+    back() {
+      this.$router.push({ path: '/live/index' });
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  // 视频
+  .video {
+    height: 240px;
+    background: red;
+    .back {
+      i {
+        font-size: 30px;
+        font-weight: bold;
+        margin: 5px 0 0px 5px;
+        color: blue;
+      }
+    }
+  }
+  // 聊天
+  .chat {
+  }
+  // 科技超市
+  .market {
+  }
+  // 嘉宾，项目
+  .jbxm {
+  }
+  // 主办方
+  .company {
+  }
+}
+</style>