Merge branch 'master' of http://git.cc-lotus.info/smart-center/web-common

src/layout/index/chengguo.vue

@@ -31,7 +31,7 @@
               <el-carousel-item v-for="(item, index) in tag.children" :key="index">
                 <el-col :span="24" class="link" @click.native="$router.push({ name: 'detail', params:{id:item.id} })">
                   <el-col :span="24">
-                    <el-image style="width:100%;height:345px;" :src="item.pic"></el-image>
+                    <el-image style="width:100%;height:345px;" :src="getPic(index + 1)"></el-image>
                   </el-col>
                   <el-col :span="24" class="title" :unerline="false">
                     <p>{{item.title}}</p>
@@ -57,11 +57,21 @@ export default {
     borderColor: '#850000',
     Color: '#850000',
     title: '成果展示',
+    img1:require('../../assets/cg1.png'),
+    img2:require('../../assets/cg2.jpg'),
+    img3:require('../../assets/cg3.jpg'),
   }),
   created() {
   },
   computed: {},
-  methods: {},
+  methods: {
+    getPic(index) {
+      let res= index % 3;
+      if(res === 1) return this.img1;
+      else if(res === 2) return this.img2;
+      else return this.img3
+    }
+  },
 };
 </script>
 

src/layout/index/native.vue

@@ -62,7 +62,7 @@ export default {
       window.open(url);
     },
     handleSelect(key, keyPath) {
-      console.log(key, keyPath);
+      // console.log(key, keyPath);
     }
   },
 };

src/layout/list/noLeft.vue

@@ -21,7 +21,7 @@
           <el-col :span="24" class="mainRightList" v-for="(item, index) in mainRightList" :key="index"
                   :type="item.type">
             <el-col :span="24" class="bigTitle">{{item.title}}</el-col>
-            <span v-if="item.children.length >0">
+            <span v-if="item.children && item.children.length >0">
               <el-row v-for="child in item.children" :key="child.id">
                 <el-col :span="20" class="title" @click.native="$router.push({ name: 'detail', params:{id:child.id} })">
                   <p class="textOver">{{ child && child.title }}</p>