Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/views/news/listDetail.vue

@@ -29,7 +29,13 @@
               </el-col>
             </el-col>
             <el-col :span="18" class="right">
-              <listDetails></listDetails>
+              <el-col :span="24" class="top">
+                <span></span>
+                <span>{{ columnName }}</span>
+              </el-col>
+              <el-col :span="24" class="list">
+                liebao
+              </el-col>
             </el-col>
           </div>
         </el-col>
@@ -49,14 +55,13 @@ import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'listDetail',
   props: {},
-  components: {
-    listDetails, //列表+详情
-  },
+  components: {},
   data: function() {
     return {
       menuList: [{ name: '科技资讯' }, { name: '技术前沿' }, { name: '工作动态' }, { name: '通知通告' }],
       menuColor: 'rgb(254, 149, 14)',
       menuIndex: '0',
+      columnName: '',
     };
   },
   created() {
@@ -134,6 +139,24 @@ export default {
       width: 78%;
       min-height: 600px;
       background: #fff;
+      padding: 0 20px;
+      .top {
+        height: 35px;
+        margin: 20px 0;
+        border-bottom: 1px dashed #ccc;
+        span:first-child {
+          display: inline-block;
+          width: 4px;
+          height: 20px;
+          background: #005293;
+          margin: 0 10px -3px 0;
+        }
+        span:nth-child(2) {
+          font-size: 20px;
+          color: #005293;
+          font-weight: bold;
+        }
+      }
     }
   }
   .foot {