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

src/views/dynamic/parts/down-pie.vue

@@ -7,14 +7,14 @@
         </el-col>
         <el-col :span="13" class="rightData">
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
+            <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
             <el-table-column label="产品类型" align="center">
               <template slot-scope="scoped">
                 {{ scoped.row.type === '0' ? '技术' : scoped.row.type === '1' ? '产品' : scoped.row.type === '2' ? '服务' : '暂无' }}
               </template>
             </el-table-column>
-            <el-table-column prop="field" label="所属领域" align="center"> </el-table-column>
-            <el-table-column prop="cooperation" label="合作方式" align="center"> </el-table-column>
+            <el-table-column prop="field" label="所属领域" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="cooperation" label="合作方式" align="center" show-overflow-tooltip> </el-table-column>
             <el-table-column label="操作" width="100" align="center" fixed="right">
               <template slot-scope="scoped">
                 <el-tooltip class="item" effect="dark" content="交易情况" placement="bottom">

src/views/dynamic/parts/userTwo.vue

@@ -148,7 +148,8 @@ export default {
 .one {
   background: url('~@/assets/dynamic1.png') no-repeat;
   background-size: 100% 100%;
-  height: 150px;
+  // height: 150px;
+  height: 110px;
 }
 .one p {
   font-size: 22px;
@@ -157,7 +158,8 @@ export default {
   text-align: center;
 }
 .one p:first-child {
-  padding: 60px 0 0 0;
+  // padding: 60px 0 0 0;
+  padding: 40px 0 0 0;
   font-size: 12px;
 }
 .two {