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

src/layout/index/chengguo.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>

src/layout/index/foot.vue

@@ -38,7 +38,7 @@ p {
   padding: 10px 0;
   text-align: center;
   color: #fff;
-  background-color: #336699;
+  background-color: rgba(0, 0, 0, 0.5);
 }
 .text {
   padding: 5px 0;

src/layout/index/infoList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="infoList" style="background:#fff">
+  <div id="infoList">
    <el-row>
     <el-col :span="24" class="news">
       <el-col :span="24" class="topTit">

src/layout/index/native.vue

@@ -1,26 +1,23 @@
 <template>
   <div id="native">
     <el-row>
-      <el-col :span="24">
-          <el-menu :default-active="activeIndex2" class="el-menu-demo" mode="horizontal" background-color="#336699"
-                   text-color="#fff" active-text-color="#fff" style="height:40px;" :router="true">
-            <template v-for="(item, index) in menu">
-              <el-submenu :index="`${index}`" :key="index" v-if="item.type !== 'url' && item.type !== 'content'">
-                <template slot="title">
-                  {{ item.title }}
-                </template>
-                <template v-for="(sub, subIndex) in item.children">
-                  <el-menu-item :index="`${index}-${subIndex}`" :key="subIndex+'sub'" v-if="sub.children"
-                                style="float:left">
-                    <template slot="title">
-                      {{ sub.title }}
-                    </template>
-                  </el-menu-item>
-                </template>
-              </el-submenu>
-            </template>
-          </el-menu>
-      </el-col>
+      <el-menu :default-active="activeIndex2" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+               background-color="rgba(0,0,0,0.4)" text-color="#fff" active-text-color="#fff">
+        <el-submenu index="1">
+          <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-submenu>
+        <el-submenu index="2">
+          <template slot="title">计算服务</template>
+          <el-menu-item index="2-1" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">计算服务
+          </el-menu-item>
+          <el-menu-item index="2-2" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">计算服务</el-menu-item>
+          <el-menu-item index="2-3" style="float: left;height:60px;line-height:60px;font-size:20px;" class="hover">计算服务</el-menu-item>
+        </el-submenu>
+      </el-menu>
     </el-row>
   </div>
 </template>
@@ -33,7 +30,7 @@ export default {
   components: {},
   data: () => ({
 
-    activeIndex2: '',
+    activeIndex2: '1'
   }),
   created() { },
   computed: {
@@ -43,13 +40,21 @@ export default {
     turnTo(url) {
       window.open(url);
     },
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    }
   },
 };
 </script>
 
 <style lang="less" scoped>
-/deep/.el-menu--horizontal > .el-submenu .el-submenu__title {
-  height: 40px;
-  line-height: 40px;
+.hover:hover {
+  background-color: #215299 !important;
+}
+/deep/.el-submenu__title {
+  font-size: 20px;
+}
+/deep/.el-submenu__title:hover {
+  background-color: #215299 !important;
 }
 </style>

src/layout/index/tabsList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="tabsList" style="background:#fff">
+  <div id="tabsList">
     <el-row>
       <el-col :span="24" class="news">
         <el-tabs v-model="activeName">

src/layout/index/top.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="image">
         <!-- <el-image :src="topInfo.logo" v-if="topInfo && topInfo.logo"></el-image> -->
          <!-- <el-image :src="topInfo.logo"></el-image> -->
-         <el-image :src="topInfos.logo" @click="$router.push({ path: '/' })"></el-image>
+         <el-image :src="logo" @click="$router.push({ path: '/' })"></el-image>
       </el-col>
     </el-row>
   </div>
@@ -18,7 +18,9 @@ export default {
     topInfos:null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    logo: require('../../assets/logo.png'),
+  }),
   created() {},
   computed: {},
   methods: {},

src/views/index/index.vue

@@ -120,7 +120,7 @@ export default {
 }
 .menu {
   margin-bottom: 20px;
-  height: 40px;
+  height: 70px;
 }
 .main {
   margin-bottom: 20px;
@@ -128,17 +128,17 @@ export default {
 }
 .main .notice {
   height: 400px;
-  border: 1px solid #ccc;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
   overflow: hidden;
-  background: #fff;
 }
 .main .news {
   float: right;
   width: 880px;
   height: 400px;
-  border: 1px solid #ccc;
   overflow: hidden;
-  background: #fff;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
 }
 .mains {
   margin-bottom: 20px;
@@ -147,25 +147,25 @@ export default {
 .mains .mingshi {
   height: 400px;
   overflow: hidden;
-  border: 1px solid #ccc;
-  background: #fff;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
 }
 .mains .chengguo {
   float: right;
   width: 880px;
   height: 400px;
-  border: 1px solid #ccc;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
   overflow: hidden;
 }
 .down {
   min-height: 100px;
-  border: 1px solid #ccc;
 }
 .jishu {
   height: 400px;
-  border: 1px solid #ccc;
+  background-color: rgba(255, 255, 255, 0.8);
+  box-shadow: 0 0 2px #ccc;
   overflow: hidden;
-  background: #fff;
 }
 .link{
   width:100%;