wuhongyu 4 jaren geleden
bovenliggende
commit
8bcb95bafe
3 gewijzigde bestanden met toevoegingen van 17 en 15 verwijderingen
  1. 3 3
      src/views/dynamic/parts/userTwo.vue
  2. 12 10
      src/views/hall/direct.vue
  3. 2 2
      src/views/market/index.vue

+ 3 - 3
src/views/dynamic/parts/userTwo.vue

@@ -18,7 +18,7 @@
               <p>{{ detail.num2 }}</p>
             </el-col>
           </el-col>
-          <el-col class="box" :span="10" style="margin:50px 10px 10px 15px;">
+          <el-col class="box" :span="10">
             <el-col :span="24" class="three one">
               <p>专家注册数量</p>
               <p>{{ detail.num3 }}</p>
@@ -33,13 +33,13 @@
           </el-col>
         </el-col>
         <el-col :span="12" class="right">
-          <el-col class="box" :span="10" style="margin:30px 10px 10px 15px;">
+          <el-col class="box" :span="10">
             <el-col :span="24" class="three one">
               <p>正在洽谈</p>
               <p>{{ transaction1 }}</p>
             </el-col>
           </el-col>
-          <el-col class="box" :span="10" style="margin:50px 10px 10px 15px;">
+          <el-col class="box" :span="10">
             <el-col :span="24" class="four one">
               <p>达成意向</p>
               <p>{{ transaction2 }}</p>

+ 12 - 10
src/views/hall/direct.vue

@@ -116,10 +116,15 @@
                     <el-row class="jishulist">
                       <el-col :span="24" class="topList">
                         <el-col :span="24" class="list" v-for="(item, index) in jishulist" :key="index">
-                          <el-col :span="20" class="name">
+                          <el-col :span="16" class="name">
                             <p>
                               <span class="inname"> {{ item.name }}</span>
+                            </p>
+                          </el-col>
+                          <el-col :span="4" class="name">
+                            <p>
                               <span>
+                                合作方式:
                                 {{
                                   item.coopermode == '0'
                                     ? '技术转让'
@@ -1306,16 +1311,13 @@ export default {
       .name {
         height: 30px;
         line-height: 30px;
-        p {
+        p:first-child {
           font-size: 16px;
-          .inname {
-            display: inline-block;
-            width: 700px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            -o-text-overflow: ellipsis;
-            white-space: nowrap;
-          }
+          display: inline-block;
+          width: 700px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          -o-text-overflow: ellipsis;
         }
       }
       .click {

+ 2 - 2
src/views/market/index.vue

@@ -426,7 +426,7 @@ export default {
   display: inline-block;
   width: 65%;
   font-size: 18px;
-  height: 20px;
+  // height: 20px;
   padding: 0 15px;
   cursor: pointer;
   overflow: hidden;
@@ -439,7 +439,7 @@ export default {
   width: 27%;
   text-align: center;
   overflow: hidden;
-  height: 20px;
+  // height: 20px;
   // background-color: #044b79;
   font-size: 16px;
   padding: 3px 0px;