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

src/layout/index/notice.vue

@@ -7,8 +7,8 @@
     </el-col>
     <el-col :span="24">
       <el-col :span="24" class="leftcontext" v-for="(item, index) in noticeList" :key="index">
-        <el-col :span="21" class="title"> <span></span>{{ item.title }} </el-col>
-        <el-col :span="3" class="date">{{ item.date }}</el-col>
+        <el-col :span="18" class="title"> <span></span>{{ item.title }} </el-col>
+        <el-col :span="6" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
   </div>

src/layout/index/service.vue

@@ -7,8 +7,8 @@
     </el-col>
     <el-col :span="24">
       <el-col :span="24" class="leftcontext" v-for="(item, index) in serviceList" :key="index">
-        <el-col :span="20" class="title"> <span></span>{{ item.title }} </el-col>
-        <el-col :span="4" class="date">{{ item.date }}</el-col>
+        <el-col :span="16" class="title"> <span></span>{{ item.title }} </el-col>
+        <el-col :span="8" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
   </div>
@@ -95,6 +95,6 @@ export default {
 .date {
   float: right;
   color: #777777;
-  text-indent: 11px;
+  text-indent: 24px;
 }
 </style>

src/layout/index/technology.vue

@@ -7,8 +7,8 @@
     </el-col>
     <el-col :span="24">
       <el-col :span="24" class="leftcontext" v-for="(item, index) in jishuList" :key="index">
-        <el-col :span="21" class="title"> <span></span>{{ item.title }} </el-col>
-        <el-col :span="3" class="date">{{ item.date }}</el-col>
+        <el-col :span="18" class="title"> <span></span>{{ item.title }} </el-col>
+        <el-col :span="6" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
   </div>

src/views/index.vue

@@ -21,7 +21,7 @@
               <notice :noticeList="noticeList"></notice>
             </el-col>
             <el-col :span="8" class="between">
-              <service :servicelist="serviceList"></service>
+              <service :serviceList="serviceList"></service>
             </el-col>
             <el-col :span="8" class="context">
               <technology :jishuList="jishuList"></technology>
@@ -69,33 +69,33 @@ export default {
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
-        date: '03-04',
+        date: '2018-03-04',
       },
       {
         title: '6条数据',
-        date: '03-04',
+        date: '2018-03-04',
       },
     ],
     jishuList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
-        date: '03-04',
+        date: '2018-03-04',
       },
       {
         title: '6条数据',
-        date: '03-04',
+        date: '2018-03-04',
       },
     ],
     noticeList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
-        date: '03-04',
+        date: '2018-03-04',
       },
       {
         title: '6条数据',
-        date: '03-04',
+        date: '2018-03-04',
       },
     ],
     jobsList: [