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

src/layout/direct/exportDetail.vue

@@ -36,8 +36,7 @@
             <span>当前住址:{{ exportInfo.addr }}</span>
           </div>
           <div>
-            <p>可供咨询领域:</p>
-            <p>{{ exportInfo.field }}</p>
+            <span>可供咨询领域:{{ exportInfo.field }}</span>
           </div>
           <div>
             <p>工作简介:</p>

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

@@ -2,15 +2,14 @@
   <div id="down-pie">
     <el-row>
       <el-col :span="24">
-        <el-col :span="12">
+        <el-col :span="8">
           <div id="chartPie" class="" style="height:450px;"></div>
         </el-col>
-        <el-col :span="12" class="rightData">
+        <el-col :span="16" class="rightData">
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column prop="product_name" label="产品名称" align="center"> </el-table-column>
-            <el-table-column prop="market_username" label="营销单位" align="center"> </el-table-column>
-            <el-table-column prop="username" label="采购单位" align="center"> </el-table-column>
-            <el-table-column prop="status" label="交易状态" align="center">
+            <el-table-column prop="product_name" label="产品名称" align="center" width="400"> </el-table-column>
+            <el-table-column prop="market_username" label="营销单位" align="center" width="303"> </el-table-column>
+            <el-table-column prop="status" label="交易状态" align="center" width="100">
               <template v-slot="scoped">
                 {{
                   `${scoped.row.status}` === `0` ? '正在洽谈' : `${scoped.row.status}` === `1` ? '达成意向' : `${scoped.row.status}` === `2` ? '交易完成' : ''

src/views/dynamic/parts/userTwo.vue

@@ -2,6 +2,9 @@
   <div id="userTwo">
     <el-row>
       <el-col :span="24" class="userTwo">
+        <el-col :psan="24" class="userTwoTop">
+          统计数据
+        </el-col>
         <el-col :span="12" class="left">
           <el-col class="box" :span="20">
             <el-col :span="24" class="one">
@@ -17,7 +20,7 @@
           </el-col>
         </el-col>
         <el-col :span="12" class="right">
-          <el-col class="box" :span="20" style="margin:70px 10px 10px 15px;">
+          <el-col class="box" :span="20" style="margin:50px 10px 10px 15px;">
             <el-col :span="24" class="three one">
               <p>在线人数</p>
               <p>{{ detail.num3 }}</p>
@@ -63,6 +66,13 @@ export default {
   float: left;
   width: 100%;
 }
+.userTwo .userTwoTop {
+  padding: 40px 0 0 0;
+  font-size: 17px;
+  font-weight: bold;
+  text-align: center;
+  color: #333;
+}
 .left {
   float: left;
 }

src/views/hall/dock/dockDetail.vue

@@ -266,7 +266,7 @@ p {
   width: 100%;
   text-align: center;
   z-index: 999;
-  height: 230px;
+  height: 200px;
   margin: 0 0 20px 0;
 }
 .style .top p:first-child {
@@ -278,7 +278,7 @@ p {
   color: #fff;
   position: absolute;
   width: 100%;
-  top: 170px;
+  top: 150px;
 }
 .style .main {
   min-height: 600px;
@@ -352,7 +352,7 @@ p {
         div:last-child .introduction {
           overflow: hidden;
           text-overflow: ellipsis;
-          -webkit-line-clamp: 6;
+          -webkit-line-clamp: 4;
           word-break: break-all;
           display: -webkit-box;
           -webkit-box-orient: vertical;

src/views/technical/index.vue

@@ -157,7 +157,7 @@ export default {
 <style lang="less" scoped>
 .jishuImage {
   width: 100%;
-  height: 100%;
+  height: 160px;
 }
 .main {
   width: 80%;