Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/service/index.vue

@@ -6,21 +6,23 @@
           <div class="serviceOne">
             <el-col :span="24">
               <el-col :span="12" class="infoleft">
-                <el-col class="lefttop" :span="24"><span class="title"> |</span> 政务公开</el-col>
+                <el-col class="lefttop" :span="24"><span class="title"> |</span> 本地服务</el-col>
                 <ul>
-                  <li v-for="(item, index) in zhengwuList" :key="index">
+                  <li class="zhengwuList" v-for="(item, index) in zhengwuList" :key="index">
                     <a href="">
                       <el-image :src="item.pic"></el-image>
+                      <p>{{ item.title }}</p>
                     </a>
                   </li>
                 </ul>
               </el-col>
               <el-col :span="12" class="inforight">
-                <div class="lefttop"><span class="title"> |</span> 常用服务</div>
+                <div class="lefttop"><span class="title"> |</span> 合作服务</div>
                 <ul>
-                  <li v-for="(item, index) in serviceList" :key="index">
+                  <li class="serviceList" v-for="(item, index) in serviceList" :key="index">
                     <a href="">
                       <el-image :src="item.pic"></el-image>
+                      <p>{{ item.title }}</p>
                     </a>
                   </li>
                 </ul>
@@ -51,52 +53,66 @@ export default {
   components: {},
   data: () => {
     return {
-      // 政务公开
+      // 本地服务
       zhengwuList: [
         {
-          pic: require('@/assets/live/zhengwu1.jpg'),
+          pic: require('@/assets/live/bendi1.png'),
+          title: '智慧推荐',
         },
         {
-          pic: require('@/assets/live/zhengwu2.jpg'),
+          pic: require('@/assets/live/bendi2.png'),
+          title: '展会预约',
         },
         {
-          pic: require('@/assets/live/zhengwu3.jpg'),
+          pic: require('@/assets/live/bendi3.png'),
+          title: '科技评估',
         },
         {
-          pic: require('@/assets/live/zhengwu4.jpg'),
+          pic: require('@/assets/live/bendi4.png'),
+          title: '合同在线',
         },
         {
-          pic: require('@/assets/live/zhengwu5.jpg'),
+          pic: require('@/assets/live/bendi5.png'),
+          title: '信誉认证',
         },
         {
-          pic: require('@/assets/live/zhengwu6.jpg'),
+          pic: require('@/assets/live/bendi6.png'),
+          title: '绩效评价',
         },
+      ],
+      // 合作服务
+      serviceList: [
         {
-          pic: require('@/assets/live/zhengwu7.jpg'),
+          pic: require('@/assets/live/hezuo1.png'),
+          title: '知识产权',
         },
         {
-          pic: require('@/assets/live/zhengwu8.jpg'),
+          pic: require('@/assets/live/hezuo2.png'),
+          title: '科技文献',
         },
-      ],
-      // 常用服务
-      serviceList: [
         {
-          pic: require('@/assets/live/changyong1.jpg'),
+          pic: require('@/assets/live/hezuo3.png'),
+          title: '项目申报',
         },
         {
-          pic: require('@/assets/live/changyong2.jpg'),
+          pic: require('@/assets/live/hezuo4.png'),
+          title: '科技金融',
         },
         {
-          pic: require('@/assets/live/changyong3.jpg'),
+          pic: require('@/assets/live/hezuo5.png'),
+          title: '科技孵化',
         },
         {
-          pic: require('@/assets/live/changyong4.jpg'),
+          pic: require('@/assets/live/hezuo6.png'),
+          title: '成果登记',
         },
         {
-          pic: require('@/assets/live/changyong5.jpg'),
+          pic: require('@/assets/live/hezuo7.png'),
+          title: '技术合同',
         },
         {
-          pic: require('@/assets/live/changyong6.jpg'),
+          pic: require('@/assets/live/hezuo8.png'),
+          title: '高企认定',
         },
       ],
       // 公众参与
@@ -148,14 +164,45 @@ export default {
 .infoleft {
   height: 320px;
   box-shadow: 0 0 10px #2d64b3;
-  width: 49.5%;
+  width: 49%;
+}
+.infoleft ul .zhengwuList {
+  float: left;
+  width: 25%;
+  height: 115px;
+  margin: 0 5% 15px 3%;
+  text-align: center;
+}
+.infoleft ul .zhengwuList p {
+  font-size: 20px;
+  color: #215199;
+  float: left;
+  width: 100%;
 }
 .inforight {
   height: 320px;
   box-shadow: 0 0 10px #2d64b3;
-  width: 49%;
+  width: 49.5%;
   margin: 0 0 0 15px;
 }
+.inforight ul .serviceList {
+  float: left;
+  width: 17%;
+  height: 105px;
+  margin: 0 5% 20px 3%;
+  text-align: center;
+  background: #f8f8f8;
+}
+.inforight ul .serviceList .el-image {
+  padding: 5px 0 0 0;
+}
+.inforight ul .serviceList p {
+  font-size: 20px;
+  color: #215199;
+  float: left;
+  width: 100%;
+}
+
 .lefttop {
   width: 96%;
   height: 41px;
@@ -176,13 +223,6 @@ export default {
   height: 115px;
   margin: 0 2% 10px 3%;
 }
-
-.inforight ul li {
-  float: left;
-  width: 25%;
-  height: 115px;
-  margin: 0 5% 15px 3%;
-}
 .infocontext {
   height: 237px;
   box-shadow: 0 0 10px #2d64b3;

src/views/technical/index.vue

@@ -166,7 +166,7 @@ export default {
   components: {},
   data: () => ({
     downLeftTopImage: require('@/assets/live/square_big.png'),
-    jishuImage: require('@/assets/live/main2.png'),
+    jishuImage: require('@/assets/live/main3.png'),
     zhuantiList: [],
     jishuList: [],
     hangyeList: [],