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

src/views/halltwo/detail.vue

@@ -37,21 +37,35 @@
         <el-col :span="24" class="three">
           <div class="w_1200">
             <el-col :span="16" class="left">
-              <el-col :span="24" class="summary">
-                <p class="title">展会总结</p>
-                <el-col :span="24">
-                  <el-col :span="4" class="card1">到会人数</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.tszx || 0 }}<span class="specail">人</span></el-col>
-                  <el-col :span="4" class="card1">项目数</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.czxm || 0 }}<span class="specail">项</span></el-col>
-                  <el-col :span="4" class="card1">需求数</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.czxq || 0 }}<span class="specail">项</span></el-col>
-                  <el-col :span="4" class="card1">对接数</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.jywc || 0 }}<span class="specail">次</span></el-col>
-                  <el-col :span="4" class="card1">生产意向</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.qthz || 0 }}<span class="specail">次</span></el-col>
-                  <el-col :span="4" class="card1">达成意向</el-col>
-                  <el-col :span="4" class="card1">{{ statNum.dcyx || 0 }}<span class="specail">次</span></el-col>
+              <el-col :span="24" class="leftInfo">
+                <el-col :span="24" class="leftInfoone">
+                  <p class="title">展会总结</p>
+                  <el-col :span="24">
+                    <p>
+                      <span>到会人数</span>
+                      <span>{{ statNum.tszx || 0 }}人</span>
+                    </p>
+                    <p>
+                      <span>项目数</span>
+                      <span>{{ statNum.czxm || 0 }}项</span>
+                    </p>
+                    <p>
+                      <span>需求数</span>
+                      <span>{{ statNum.czxq || 0 }}项</span>
+                    </p>
+                    <p>
+                      <span>对接数</span>
+                      <span>{{ statNum.jywc || 0 }}次</span>
+                    </p>
+                    <p>
+                      <span>生产意向</span>
+                      <span>{{ statNum.qthz || 0 }}次</span>
+                    </p>
+                    <p>
+                      <span>达成意向</span>
+                      <span>{{ statNum.dcyx || 0 }}次</span>
+                    </p>
+                  </el-col>
                 </el-col>
                 <el-col :span="24" class="artical">
                   <el-image :src="url1" style="width:784px;height:438px"></el-image>
@@ -80,14 +94,18 @@
                     <el-tab-pane name="first">
                       <span slot="label">参展项目({{ total1 }})</span>
                       <el-table :data="list1" stripe style="width: 100%">
-                        <el-table-column prop="field" label="所属领域" width="180"> </el-table-column>
-                        <el-table-column prop="name" label="项目名称" width="180"> </el-table-column>
-                        <el-table-column prop="type" label="技术类型">
+                        <el-table-column prop="field" label="所属领域" align="center"> </el-table-column>
+                        <el-table-column prop="name" label="项目名称" align="center">
+                          <template slot-scope="scope">
+                            <span @click="selectpro(scope.row)">{{ scope.row.name }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="type" label="技术类型" align="center">
                           <template slot-scope="scope">
                             <span class="bgColor">{{ scope.row.type == '0' ? '科技需求' : scope.row.type == '1' ? '技术成果' : '商务信息' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="cooperation" label="交易方式"> </el-table-column>
+                        <el-table-column prop="cooperation" label="交易方式" align="center"> </el-table-column>
                       </el-table>
                       <el-col class="page1" :span="24">
                         <el-pagination
@@ -102,13 +120,17 @@
                     </el-tab-pane>
                     <el-tab-pane name="second">
                       <span slot="label">参展需求({{ total2 }})</span>
-                      <el-table :data="list2" stripe style="width: 100%">
+                      <el-table :data="list2" style="width: 100%">
                         <el-table-column prop="type" label="需求类别">
                           <template slot-scope="scope">
                             <span>{{ scope.row.type == '0' ? '科技需求' : scope.row.type == '1' ? '技术成果' : '商务信息' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="name" label="需求名称" width="180"> </el-table-column>
+                        <el-table-column prop="name" label="需求名称" width="180">
+                          <template slot-scope="scope">
+                            <span @click="selectpro(scope.row)">{{ scope.row.name }}</span>
+                          </template>
+                        </el-table-column>
                         <el-table-column prop="budget" label="投入预算">
                           <template slot-scope="scope">
                             <span class="bgColor">{{ scope.row.budget || '暂无' }}</span>
@@ -140,9 +162,15 @@
                             </el-image>
                           </el-col>
                           <el-col :span="12" class="text">
-                            <p class="name">{{ item.name }}</p>
-                            <p>对接</p>
-                            <p>查看院校项目</p>
+                            <el-col :span="24" class="name">
+                              {{ item.name }}
+                            </el-col>
+                            <el-col :span="24" class="btn">
+                              <el-button type="primary" size="mini" @click.native="expertxmdjBtn(item)">对接</el-button>
+                            </el-col>
+                            <el-col :span="24" class="btn">
+                              <el-button type="primary" size="mini">查看院校项目</el-button>
+                            </el-col>
                           </el-col>
                         </el-col>
                       </el-col>
@@ -313,8 +341,8 @@ export default {
     ...market({ operaQuery: 'operaQuery' }),
     //查询信息
     async searchInfo({ skip = 0 } = {}) {
-      if (this.id) {
-        let res = await this.dockFetch(this.id);
+      if (this.dock_id) {
+        let res = await this.dockFetch(this.dock_id);
         if (this.$checkRes(res)) {
           this.$set(this, `dockInfo`, res.data);
           let czxm = res.data.apply.map(item => item.goodsList);
@@ -361,7 +389,7 @@ export default {
     },
     //返回直播大厅
     back() {
-      this.$router.push({ path: '/halltwo/directTwo', query: { id: this.id } });
+      this.$router.push({ path: '/halltwo/directTwo', query: { id: this.dock_id } });
     },
     handleCurrentChange(skip) {
       this.searchInfo({ skip });
@@ -378,11 +406,19 @@ export default {
     handleCurrentChange2(currentPage) {
       this.searchPage2(currentPage);
     },
+    // 专家对接
+    expertxmdjBtn(data) {
+      this.$router.push({ path: '/halltwo/xmdj', query: { dock_id: this.dock_id, id: data._id, type: '3' } });
+    },
+    // 項目對接
+    selectpro(data) {
+      this.$router.push({ path: '/halltwo/xmdj', query: { dock_id: this.dock_id, id: data._id, type: data.type } });
+    },
   },
   computed: {
     ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
+    dock_id() {
+      return this.$route.query.dock_id;
     },
   },
   watch: {
@@ -549,36 +585,43 @@ export default {
     .left {
       padding-right: 45px;
       border-right: 1px solid #ccc;
-      .summary {
-        .title {
-          width: 130px;
-          height: 40px;
-          background: #2152cb;
-          margin: 35px 0px;
-          font-size: 22px;
-          color: #fff;
-          text-align: center;
-          line-height: 40px;
-        }
-        .card1 {
-          width: 120px;
-          height: 70px;
-          background-color: #2152cb;
-          margin-right: 5px;
-          margin-bottom: 5px;
-          background: #fff4ba;
-          color: #060606;
-          font-size: 16px;
-          font-weight: bold;
-          text-align: center;
-          line-height: 70px;
-          .specail {
-            color: red;
+      .leftInfo {
+        .leftInfoone {
+          .title {
+            width: 130px;
+            height: 40px;
+            background: #2152cb;
+            margin: 35px 0px;
+            font-size: 22px;
+            color: #fff;
+            text-align: center;
+            line-height: 40px;
+          }
+          p {
+            float: left;
+            width: 245px;
+            height: 70px;
+            margin: 0 5px 5px 0;
+            span {
+              display: inline-block;
+              width: 120px;
+              background: red;
+              margin: 0 5px 0 0;
+              height: 70px;
+              text-align: center;
+              line-height: 70px;
+              font-size: 16px;
+              font-weight: bold;
+            }
+            span:nth-child(1) {
+              color: #2152cb;
+              background: #ffe26d;
+            }
+            span:nth-child(2) {
+              margin: 0 0 0 0;
+              background: #fff48a;
+            }
           }
-        }
-        .card1:nth-child(odd) {
-          background: #ffe26d;
-          color: #2152cb;
         }
         .artical {
           font-size: 15px;
@@ -589,6 +632,9 @@ export default {
             text-indent: 2em;
             margin-top: 25px;
           }
+          .text:hover {
+            cursor: pointer;
+          }
         }
         .shool {
           .tit {
@@ -640,24 +686,14 @@ export default {
               }
               .text {
                 height: 160px;
-                padding-left: 20px;
+                padding: 0 10px;
                 .name {
-                  font-size: 16px;
-                  margin-top: 20px;
-                }
-                p:nth-child(2) {
-                  width: 62px;
-                  height: 26px;
-                  border: 1px solid #ccc;
-                  text-align: center;
-                  line-height: 26px;
-                  margin: 15px 0px 25px 0px;
-                  background: #409eff;
-                  border-radius: 5px;
-                  color: #fff;
+                  font-weight: bold;
+                  font-size: 18px;
+                  margin: 10px 0 10px 0;
                 }
-                p:nth-child(3) {
-                  font-size: 14px;
+                .btn {
+                  margin: 0 0 10px 0;
                 }
               }
             }

src/views/halltwo/directTwo.vue

@@ -36,7 +36,7 @@
               <el-col :span="15" class="left"> <span>主办单位：</span>{{ dockInfo.sponsor }} </el-col>
               <el-col :span="8" class="right">
                 <el-button class="btn1">返回展会进行页</el-button>
-                <el-button class="btn2" @click="$router.push({ path: '/halltwo/detail', query: { id: dockInfo.id } })">进入展会总结页</el-button>
+                <el-button class="btn2" @click="$router.push({ path: '/halltwo/detail', query: { dock_id: dockInfo.id } })">进入展会总结页</el-button>
               </el-col>
             </el-col>
             <el-col :span="24" class="twodown">
@@ -136,10 +136,10 @@
                       <achieve :list="achievefourList" @xmdjBtn="xmdjBtn"></achieve>
                     </el-tab-pane>
                   </el-tabs>
-                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">更多></el-link>
+                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { dock_id: dockInfo.id } })">更多></el-link>
                 </el-col>
                 <el-col :span="24" class="leftbtn">
-                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">查看所有项目</el-button>
+                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { dock_id: dockInfo.id } })">查看所有项目</el-button>
                 </el-col>
               </el-col>
               <el-col :span="12" class="right">
@@ -158,10 +158,10 @@
                       <achieve :list="techolfourList" @xmdjBtn="xmdjBtn"></achieve>
                     </el-tab-pane>
                   </el-tabs>
-                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">更多></el-link>
+                  <el-link :underline="false" class="more" @click="$router.push({ path: '/halltwo/xmcg', query: { dock_id: dockInfo.id } })">更多></el-link>
                 </el-col>
                 <el-col :span="24" class="leftbtn">
-                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { id: dockInfo.id } })">查看所有需求</el-button>
+                  <el-button @click="$router.push({ path: '/halltwo/xmcg', query: { dock_id: dockInfo.id } })">查看所有需求</el-button>
                 </el-col>
               </el-col>
             </el-col>

src/views/halltwo/parts/expert.vue

@@ -77,6 +77,7 @@ export default {
   }
   .top:hover {
     cursor: pointer;
+    color: #409eff;
   }
   .down {
     padding: 0 10px;

src/views/halltwo/xmcg.vue

@@ -46,7 +46,6 @@
             <el-col :span="24" class="threeinfo">
               <p>项目成果</p>
               <el-col :span="24" class="all">
-                <!-- <el-col :span="3" class="textAll"><span>全部</span></el-col> -->
                 <span class="field" v-for="(item, index) in fieldList" :key="index" @click="change(item, index)" :class="{ active: num == index }">{{
                   item
                 }}</span>
@@ -156,8 +155,8 @@ export default {
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
     async searchInfo() {
       // 查询展会详情
-      if (this.id) {
-        let res = await this.dockFetch(this.id);
+      if (this.dock_id) {
+        let res = await this.dockFetch(this.dock_id);
         if (this.$checkRes(res)) {
           this.$set(this, `dockInfo`, res.data);
           let czxm = res.data.apply.map(item => item.goodsList);
@@ -188,7 +187,6 @@ export default {
     change(item, index) {
       let val = this.list;
       if (item == '全部') {
-        // this.$set(this, `list1`, this.list);
         this.searchInfo();
       } else {
         let techol = val.filter(i => i.field == item);
@@ -200,8 +198,8 @@ export default {
   },
   computed: {
     ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
+    dock_id() {
+      return this.$route.query.dock_id;
     },
   },
   watch: {
@@ -363,16 +361,13 @@ export default {
         line-height: 46px;
         background: #f8f8f8;
         margin: 20px 0 40px 0;
-        .field,
-        .textAll {
+        .field {
+          font-size: 18px;
+          display: inline-block;
+          height: 46px;
+          min-width: 106px;
           text-align: center;
-          font-size: 16px;
           padding: 0 15px;
-          cursor: pointer;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          display: inline-block;
         }
         .field:hover {
           color: #fff;