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

src/layout/detail/content.vue

@@ -15,7 +15,7 @@
               {{contentList.title}}
             </el-col>
             <el-col :span="24" class="time">
-              {{contentList.publish_time}}
+              发布时间：{{contentList.publish_time}}
             </el-col>
           </el-col>
           <el-col :span="24" class="content" v-html="contentList.content">
@@ -41,6 +41,16 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.mainRight {
+  min-height: 500px;
+  background-color: rgba(255, 255, 255, 0.8);
+}
+.top {
+  margin: 10px 15px;
+}
+/deep/.el-breadcrumb {
+  font-size: 17px;
+}
 .fenxiang {
   height: 18px;
   margin: 10px 0;
@@ -55,6 +65,7 @@ export default {
   text-align: center;
   color: #999;
   padding: 0 0 15px 0;
+  font-size: 20px;
 }
 .info .content {
   font-size: 21px;

src/layout/index/iconList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="icon-link">
     <el-row>
-      <el-col :span="24" class="news" style="background:#fff">
+      <el-col :span="24" class="news">
         <el-col :span="24" class="topTit" v-if="title">
           <el-col :span="18">
             <span :style="`border-color:${borderColor}`">{{title}}</span>
@@ -35,15 +35,15 @@ export default {
     Color: '#850000',
     dataList: [],
   }),
-  watch:{
-    list:{
-      handler(val){
-        if(val) this.$set(this, `dataList`, val);
+  watch: {
+    list: {
+      handler(val) {
+        if (val) this.$set(this, `dataList`, val);
       },
       immediate: true
     }
   },
-  created() {},
+  created() { },
   computed: {},
   methods: {},
 };
@@ -61,6 +61,8 @@ p {
 }
 .news {
   padding: 10px;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
 }
 .topTit {
   border-bottom: 1px solid #ccc;

src/layout/index/link.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="chengguo">
     <el-row>
-      <el-col :span="24" class="news" style="background:#fff">
+      <el-col :span="24" class="news">
         <el-col :span="24" class="topTit">
           <el-col :span="18">
             <span :style="`border-color:${borderColor}`">{{title}}</span>
@@ -32,10 +32,10 @@ export default {
     Color: '#850000',
     dataList: [],
   }),
-  watch:{
-    list:{
-      handler(val){
-        if(val) this.$set(this, `dataList`, val);
+  watch: {
+    list: {
+      handler(val) {
+        if (val) this.$set(this, `dataList`, val);
       },
       immediate: true
     }
@@ -59,6 +59,8 @@ p {
 }
 .news {
   padding: 10px;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
 }
 .topTit {
   border-bottom: 1px solid #ccc;

src/layout/index/native.vue

@@ -7,8 +7,10 @@
           <template slot="title">新闻资讯</template>
           <el-menu-item index="1-1" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">新闻资讯
           </el-menu-item>
-          <el-menu-item index="1-2" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">新闻资讯</el-menu-item>
-          <el-menu-item index="1-3" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">新闻资讯</el-menu-item>
+          <el-menu-item index="1-2" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">新闻资讯
+          </el-menu-item>
+          <el-menu-item index="1-3" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">新闻资讯
+          </el-menu-item>
         </el-submenu>
         <el-submenu index="2">
           <template slot="title">计算服务</template>
@@ -79,4 +81,7 @@ export default {
 /deep/.el-submenu__title:hover {
   background-color: #215299 !important;
 }
+/deep/.el-menu--horizontal > .el-submenu .el-submenu__icon-arrow {
+  display: none;
+}
 </style>

src/views/detail/detail.vue

@@ -61,11 +61,10 @@ export default {
   height: 40px;
 }
 .content{
-  margin-bottom:20px;
+  margin: 20px 0;
   min-height:500px;
 }
 .down {
    min-height: 100px;
-  border: 1px solid #ccc;
 }
 </style>

src/views/list/list.vue

@@ -22,7 +22,7 @@
         </div>
       </el-col>
       <el-col :span="24" class="down">
-          <footinfo :topInfo="topInfo"></footinfo>
+        <footinfo :topInfo="topInfo"></footinfo>
       </el-col>
     </el-row>
   </div>
@@ -37,9 +37,9 @@ import footinfo from '../../layout/index/foot.vue';
 export default {
   name: 'list',
   props: {
-    topInfos:null,
-    topInfo:null,
-    mainRightList:null,
+    topInfos: null,
+    topInfo: null,
+    mainRightList: null,
     total: null,
   },
   components: {
@@ -65,27 +65,29 @@ export default {
   height: 150px;
 }
 .menu {
-  margin-bottom: 20px;
-  height: 40px;
+  height: 60px;
 }
 .main {
   min-height: 500px;
-  margin-bottom: 20px;
+  margin: 20px 0;
 }
 .main .mainLeft {
   min-height: 500px;
-  border: 1px solid #ccc;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 5px #ccc;
+  border-radius: 5px;
 }
 .main .mainRight {
   padding: 20px;
   float: right;
   width: 880px;
   min-height: 500px;
-  border: 1px solid #ccc;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 5px #ccc;
+  border-radius: 5px;
 }
 .down {
   min-height: 100px;
-  border: 1px solid #ccc;
 }
 </style>
 

src/views/list/thirdlist.vue

@@ -84,7 +84,6 @@ export default {
 }
 .down {
   min-height: 100px;
-  border: 1px solid #ccc;
 }
 </style>