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

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>

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 {

src/views/market/index.vue

@@ -73,6 +73,7 @@
               <!-- <span @click="toChat(item)" style="display:none">对接</span> -->
               <el-col :span="24">
                 <el-col :span="18" class="coopermode">
+                  合作方式：
                   {{
                     item.coopermode == '0'
                       ? '技术转让'
@@ -87,8 +88,12 @@
                       : '暂无'
                   }}</el-col
                 >
-                <el-col :span="6" class="price" v-if="item.price">{{ item.price }}</el-col>
-                <el-col :span="6" class="price" v-else>{{ '面议' }}</el-col>
+                <el-col :span="6" class="price" v-if="item.price"
+                  >价格：{{ item.price }}/{{
+                    item.priceunit === '0' ? '公斤' : item.priceunit === '1' ? '套' : item.priceunit === '2' ? '件' : '' || '暂无'
+                  }}</el-col
+                >
+                <el-col :span="6" class="price" v-else>价格：{{ '面议' }}</el-col>
               </el-col>
             </p>
           </el-col>
@@ -402,7 +407,7 @@ export default {
   display: inline-block;
   width: 65%;
   font-size: 16px;
-  padding: 5px 27px;
+  padding: 5px 24px;
 
   cursor: pointer;
   overflow: hidden;
@@ -418,7 +423,7 @@ export default {
   // height: 20px;
   // background-color: #044b79;
   font-size: 16px;
-  padding: 5px 0 5px 33px;
+  padding: 5px 0 5px 83px;
   cursor: pointer;
 }
 
@@ -426,7 +431,7 @@ export default {
   display: inline-block;
   width: 65%;
   font-size: 18px;
-  height: 20px;
+  // height: 20px;
   padding: 0 15px;
   cursor: pointer;
   overflow: hidden;
@@ -439,7 +444,7 @@ export default {
   width: 27%;
   text-align: center;
   overflow: hidden;
-  height: 20px;
+  // height: 20px;
   // background-color: #044b79;
   font-size: 16px;
   padding: 3px 0px;