更新

src/views/direct.vue

@@ -98,7 +98,7 @@
                                 <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
                                 <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                                <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                                <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                                 <el-col :span="24" class="info">
                                   <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -144,15 +144,15 @@
                               <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
-                                <el-col :span="6" class="infos" v-for="(acm, index) in policyInfo.image" :key="index">
+                                <el-col :span="6" class="info" v-for="(acm, index) in policyInfo.image" :key="index">
                                   <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
                                 </el-col>
                               </el-col>
                               <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
+                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description }} </el-col>
                               <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                              <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -162,7 +162,7 @@
 
                           <span class="title" slot="reference" @mouseover="hover(item)"> {{ item.name }}</span>
                         </el-popover>
-                        <el-button type="primary" size="mini" @click="technologyBtn(item.id)" style="position: relative;top: -5px;">对接</el-button>
+                        <el-button type="primary" size="mini" @click="technologyBtn(item.id)" class="duijie">对接</el-button>
                       </p>
                       <p>
                         <span>研发阶段：{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span>
@@ -198,7 +198,7 @@
                               <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
                               <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                              <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -210,13 +210,13 @@
                       </p>
                       <div class="serviceDown">
                         <el-image :src="item.image[0].url"></el-image>
+                        <p>{{ item.contact_user }}</p>
                         <p>
-                          <button @click="technologyBtn(item.id)">立即咨询</button>
-                          <span class="type1">服务类型：</span>
+                          <span>服务类型：</span>
                           <span class="type2">{{ item.product_type_name }}</span>
                         </p>
+                        <p>{{ item.contact_tel }}</p>
                       </div>
-                      <button class="btn">进入主页</button>
                     </li>
                   </ul>
                 </el-col>
@@ -242,8 +242,7 @@
                               <el-col :span="24" class="info"> 职务:{{ policyInfo.position }} </el-col>
                               <el-col :span="24" class="info"> 从事专业:{{ policyInfo.professional }} </el-col>
                               <el-col :span="24" class="info"> 手机号:{{ policyInfo.phone }} </el-col>
-                              <el-col :span="24" class="info"> 业务工作简介:{{ policyInfo.job_profile }} </el-col>
-                              <el-col :span="24" class="info"> 备注:{{ policyInfo.remark }} </el-col>
+                              <el-col :span="24" class="infos"> 业务工作简介:{{ policyInfo.job_profile }} </el-col>
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="duizhuanjia(policyInfo.id)">对接</el-button>
                               </el-col>
@@ -1188,12 +1187,7 @@ p {
   padding: 15px 0 3px 20px;
 }
 .service .serviceList .serviceDown p .type2 {
-  padding: 0 0 0 20px;
   color: darkorange;
-  font-weight: bold;
-  font-size: 16px;
-  float: left;
-  width: 100%;
 }
 .service .serviceList .btn {
   font-size: 16px;
@@ -1327,4 +1321,11 @@ p {
 .tupian {
   float: left;
 }
+.infos {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
 </style>

src/views/hall/dock/zhuanjiaDetail.vue

@@ -31,7 +31,15 @@
                       <span>学术成就:{{ productInfo.achievement }}</span>
                       <span>毕业院校:{{ productInfo.school }}</span>
                     </p>
+                    <p>
+                      <span> 民族:{{ productInfo.nation }}</span
+                      ><span> 学术成就:{{ productInfo.achievement }}</span>
+                    </p>
+                    <p>
+                      <span> 身份证号:{{ productInfo.cardnumber }} </span><span>学位:{{ productInfo.degree }}</span> 职务:{{ productInfo.position }}
+                    </p>
                   </div>
+
                   <p class="intro">
                     <span><i class="el-icon-date"></i>业务工作简介</span>
                     <span>{{ productInfo.job_profile }} </span>

src/views/hall/liveApply.vue

@@ -115,15 +115,20 @@ export default {
       let duplicate = JSON.parse(JSON.stringify(this.form));
       let data = { ...duplicate };
       data.user_id = this.user.uid;
-      data.user_name = this.user.name;
-      let dock_id = this.$route.query.id;
-      data.goodsList = [this.productInfo(this.form.goodsList)];
-      const res = await this.applyCreate({ id: dock_id, ...data });
-      if (res.errcode === 0) {
-        this.$message({
-          message: '申请参加对接会成功',
-          type: 'success',
-        });
+      if (data.user_id) {
+        data.user_name = this.user.name;
+        let dock_id = this.$route.query.id;
+        data.goodsList = [this.productInfo(this.form.goodsList)];
+        const res = await this.applyCreate({ id: dock_id, ...data });
+        if (res.errcode === 0) {
+          this.$message({
+            message: '申请参加对接会成功',
+            type: 'success',
+          });
+        }
+      } else {
+        let res = 0;
+        this.$checkRes(res, '请登录', '请登录');
       }
     },
     productInfo(id) {

src/views/hallList/index.vue

@@ -10,8 +10,8 @@
             <p>
               <span class="textOver" @click="turnTo(item)">{{ item.title }}</span
               ><span class="textOver">
-                <el-button type="primary" class="duijie" @click="jinru()">进入对接会</el-button>
-                <el-button type="primary" class="duijie" @click="apply(item.id)">申请对接会</el-button></span
+                <el-link :underline="false" href="/static/liveIndex.html" target="_blank" class="duijie">进入对接会</el-link>
+                <el-link :underline="false" @click="apply(item.id)" class="duijie"> 申请对接会 </el-link></span
               >
             </p>
           </el-col>
@@ -77,9 +77,6 @@ export default {
       this.$router.push({ path: '/live/liveApply', query: { id: id } });
     },
 
-    jinru() {
-      window.location.href = '/static/liveIndex.html';
-    },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.limit = 5;
@@ -263,13 +260,7 @@ export default {
   font-size: 16px;
 }
 .duijie {
-  color: #fff;
-  background-color: #ff8500;
-  text-align: center;
   padding: 10px 15px 10px 15px;
   margin: 10px 0 0 10px;
 }
-.duijie:hover {
-  background-color: #0279d5;
-}
 </style>