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

src/layout/detail/content.vue

@@ -9,9 +9,6 @@
             <el-breadcrumb-item>数据详情</el-breadcrumb-item>
           </el-breadcrumb>
         </el-col>
-        <el-col :span="24" class="fenxiang">
-          分享
-        </el-col>
         <el-col :span="24" class="info">
           <el-col :span="24">
             <el-col :span="24" class="title">

src/layout/index/foot.vue

@@ -1,7 +1,10 @@
 <template>
   <div id="foot">
     <el-row>
-      <el-col :span="24" class="down">
+      <el-col :span="24" class="foot">
+        <div class="w_1200">
+          {{content}}
+        </div>
         <!-- <el-col :span="24">
           <p class="text">{{downList.title}}</p>
         </el-col>
@@ -16,7 +19,6 @@
           <p class="text">{{downList.email}}</p>
         </el-col> -->
         <!-- {{downList.content}} -->
-{{content}}
       </el-col>
     </el-row>
   </div>
@@ -25,27 +27,33 @@
 export default {
   name: 'foot',
   props: {
-    content:null,
+    content: null,
   },
   components: {},
   data: () => ({}),
-  created() {},
+  created() { },
   computed: {},
   methods: {},
 };
 </script>
 
 <style lang="less" scoped>
-p{
-  margin:0;
-  padding:0;
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
 }
-.down{
-  padding:10px 0;
+p {
+  margin: 0;
+  padding: 0;
+}
+.foot {
+  height: 100px;
+  padding: 10px 0;
   text-align: center;
-  color:#fff;
+  color: #fff;
+  background-color: #336699;
 }
-.text{
-  padding:5px 0;
+.text {
+  padding: 5px 0;
 }
 </style>

src/layout/list/mainLeft.vue

@@ -8,22 +8,13 @@
           </el-link>
         </el-col>
       </el-col>
-      <!-- <el-col :span="24">
+      <el-col :span="24">
         <el-menu default-active="2" class="el-menu-vertical-demo">
-          <el-menu-item index="2">
-            <i class="el-icon-menu"></i>
-            <span slot="title">导航二</span>
-          </el-menu-item>
-          <el-menu-item index="3">
-            <i class="el-icon-document"></i>
-            <span slot="title">导航三</span>
-          </el-menu-item>
-          <el-menu-item index="4">
-            <i class="el-icon-setting"></i>
-            <span slot="title">导航四</span>
-          </el-menu-item>
-        </el-menu>
-      </el-col> -->
+        <el-menu-item index="1">科技要闻</el-menu-item>
+        <el-menu-item index="2">学术资讯</el-menu-item>
+        <el-menu-item index="3">工作动态</el-menu-item>
+      </el-menu>
+      </el-col>
     </el-row>
   </div>
 </template>

src/layout/list/top.vue

@@ -1,44 +0,0 @@
-<template>
-  <div id="top">
-    <el-row>
-      <el-col :span="24" class="top">
-        <el-col :span="2">
-          <el-image style="width:100px;height:100px" :src="topInfo.logo || ''"></el-image>
-        </el-col>
-        <el-col :span="22" class="topTit">
-          <el-link :underline="false">
-            {{ topInfo.title }}
-          </el-link>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'top',
-  props: {
-    topInfo:null,
-  },
-  components: {},
-  data: () => ({}),
-  created() { },
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped>
-.top .topTit{
-  height: 104px;
-  line-height: 104px;
-  padding: 0 10px;
-}
-.top .topTit .el-link.el-link--default {
-  font-size: 3em;
-  font-family: cursive;
-  color: #850000;
-  text-shadow: 2px 2px 0 #fff;
-}
-</style>

src/views/detail/detail.vue

@@ -3,31 +3,44 @@
     <el-row>
       <el-col :span="24" class="top">
         <div class="w_1200">
-          头部
+          <top :logolist="logolist"></top>
         </div>
       </el-col>
       <el-col :span="24" class="menu">
-        <div class="w_1200">
-          导航
+        <div class="w_1200" >
+          <native></native>
         </div>
       </el-col>
       <el-col :span="24" class="content">
         <div class="w_1200">
-          内容
+          <contentinfo :contentList="contentList"></contentinfo>
         </div>
       </el-col>
       <el-col :span="24" class="down">
-        <div class="w_1200">底部</div>
+          <footinfo :content="content"></footinfo>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+import top from '../../layout/index/top.vue';
+import native from '../../layout/index/native.vue';
+import contentinfo from '../../layout/detail/content.vue';
+import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'detail',
-  props: {},
-  components: {},
+  props: {
+    logolist:null,
+    contentList:null,
+    content:null,
+  },
+  components: {
+    top,
+    native,
+    contentinfo,
+    footinfo,
+  },
   data: () => ({}),
   created() {},
   computed: {},
@@ -41,18 +54,15 @@ export default {
   margin: 0 auto;
 }
 .top {
-  height: 100px;
-  border: 1px solid #ccc;
+  height: 150px;
 }
 .menu {
   margin-bottom: 20px;
   height: 40px;
-  border: 1px solid #ccc;
 }
 .content{
   margin-bottom:20px;
   min-height:500px;
-  border:1px solid #ccc;
 }
 .down {
   height: 100px;

src/views/index/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="index">
-    <el-row>
+    <el-row style="overflow-y: hidden;">
       <el-col :span="24" class="top">
         <div class="w_1200">
           <top :logolist="logolist"></top>
@@ -32,9 +32,7 @@
         </div>
       </el-col>
       <el-col :span="24" class="down">
-        <div class="w_1200">
           <footinfo :content="content"></footinfo>
-        </div>
       </el-col>
     </el-row>
   </div>
@@ -121,6 +119,5 @@ export default {
 .down {
   height: 100px;
   border: 1px solid #ccc;
-  background-color:#336699;
 }
 </style>

src/views/list/list.vue

@@ -3,36 +3,51 @@
     <el-row>
       <el-col :span="24" class="top">
         <div class="w_1200">
-          头部
+          <top :logolist="logolist"></top>
         </div>
       </el-col>
       <el-col :span="24" class="menu">
         <div class="w_1200">
-          导航
+          <native></native>
         </div>
       </el-col>
       <el-col :span="24" class="main">
         <div class="w_1200">
           <el-col :span="6" class="mainLeft">
-            左侧导航
+            <mainLeft></mainLeft>
           </el-col>
           <el-col :span="17" class="mainRight">
-            右侧列表展示
+            <mainRight :mainRightList="mainRightList"></mainRight>
           </el-col>
         </div>
       </el-col>
       <el-col :span="24" class="down">
-        <div class="w_1200">底部</div>
+          <footinfo :content="content"></footinfo>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+import top from '../../layout/index/top.vue';
+import native from '../../layout/index/native.vue';
+import mainLeft from '../../layout/list/mainLeft.vue';
+import mainRight from '../../layout/list/mainRight.vue';
+import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'list',
-  props: {},
-  components: {},
+  props: {
+    logolist: null,
+    mainRightList:null,
+    content: null,
+  },
+  components: {
+    top,
+    native,
+    footinfo,
+    mainLeft,
+    mainRight,
+  },
   data: () => ({}),
   created() { },
   computed: {},
@@ -46,13 +61,11 @@ export default {
   margin: 0 auto;
 }
 .top {
-  height: 100px;
-  border: 1px solid #ccc;
+  height: 150px;
 }
 .menu {
   margin-bottom: 20px;
   height: 40px;
-  border: 1px solid #ccc;
 }
 .main {
   min-height: 500px;
@@ -64,6 +77,7 @@ export default {
   border: 1px solid #ccc;
 }
 .main .mainRight {
+  padding: 20px;
   float: right;
   width: 880px;
   min-height: 500px;