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

src/layout/live/head.vue

@@ -76,7 +76,7 @@ export default {
       if (type == 'index') {
         console.log('首页未出');
       } else if (type == 'hall_index') this.$router.push({ path: '/live/hall/index' });
-      else this.$router.push({ path: `/live/${type}` });
+      else this.$router.push({ path: `/${type}` });
     },
     isTab(type) {
       if (type == 'index') return this.$route.path.includes('/live/index');

src/router/index.js

@@ -9,10 +9,10 @@ const live = [
     component: () => import('../views/index.vue'),
     children: [
       {
-        path: '/test',
-        name: 'live_test',
-        meta: { title: '测试', subSite: true },
-        component: () => import('../views/test.vue'),
+        path: '/market',
+        name: 'market',
+        meta: { title: '科技超市', subSite: true },
+        component: () => import('../views/market.vue'),
       },
       {
         path: '/kejipeixun/index',
@@ -28,12 +28,6 @@ const live = [
       },
     ],
   },
-  {
-    path: '/test2',
-    name: 'live_test',
-    meta: { title: '测试', subSite: true },
-    component: () => import('../views/test2.vue'),
-  },
   {
     path: '/direct',
     name: 'live_direct',

src/views/market.vue

@@ -0,0 +1,119 @@
+<template>
+  <el-row>
+    <el-col class="main">
+      <el-col :span="24">
+        <el-image :src="superOne" style="margin:10px 0 30px 0;"></el-image>
+        <el-col :span="12" class="left">
+          <el-col :span="1" class="leftTitle">
+            <p>科<br />技<br />产<br />品</p>
+            <p></p>
+          </el-col>
+          <el-col :span="23" class="leftList">
+            <el-col :span="12" class="productList" v-for="item in productList" :key="item.name">
+              <el-image :src="item.image[0].url"></el-image>
+              <p>{{ item.name }}</p>
+            </el-col>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+export default {
+  name: 'market',
+  props: {},
+  components: {},
+  data: () => ({
+    superOne: require('@/assets/live/main2.png'),
+    productList: [
+      { name: '浮台式水质监测系统', image: [{ url: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2715796529,1359347299&fm=26&gp=0.jpg' }] },
+      {
+        name: '摄影无人机',
+        image: [
+          {
+            url:
+              'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1587962054329&di=3a9930b7e5a83db61fba036ac7a5dc03&imgtype=0&src=http%3A%2F%2Fimg1.juimg.com%2F160618%2F330830-16061QQF646.jpg',
+          },
+        ],
+      },
+      {
+        name: '水上大型载货游轮',
+        image: [
+          {
+            url:
+              'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1587962011329&di=f01d3682fa964d134b1802aafcff3b2d&imgtype=0&src=http%3A%2F%2Fwww.people.com.cn%2Fmediafile%2Fpic%2F20150114%2F36%2F15561862656200381244.jpg',
+          },
+        ],
+      },
+    ],
+  }),
+  created() {
+    this.initaaa();
+  },
+  computed: {},
+  methods: {
+    async initaaa() {
+      console.log(this.superOne);
+
+      console.log(this.productList);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  width: 80%;
+  margin: 0 auto;
+  float: none;
+}
+.left {
+  height: 500px;
+  margin: 0 20px 0 0;
+}
+.leftTitle {
+  text-align: center;
+  position: relative;
+}
+.leftTitle p:first-child {
+  font-size: 18px;
+  color: #044b79;
+  font-weight: bold;
+}
+.leftTitle p:last-child {
+  float: left;
+  width: 2px;
+  height: 402px;
+  background-color: #044b79;
+  margin: 0 5px;
+  position: absolute;
+  left: 9px;
+}
+.leftList .productList {
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 282px;
+  height: 220px;
+}
+.leftList .productList:nth-child(2n) {
+  margin: 0 0 10px 0;
+}
+.leftList .productList .el-image {
+  width: 200px;
+  height: 220px;
+}
+.leftList .productList p {
+  position: absolute;
+  text-align: left;
+  bottom: 0;
+  height: 50px;
+  line-height: 50px;
+  padding: 0 10px;
+  background: #044b799f;
+  color: #fff;
+  width: 180px;
+  font-size: 18px;
+}
+</style>