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

src/views/halltwo/directTwo.vue

@@ -187,7 +187,11 @@
                     <el-col :span="12" class="txt1">
                       <el-button type="primary" size="mini">对接</el-button>
                     </el-col>
-                    <el-col :span="12" class="txt2" @click.native="$router.push({ path: '/halltwo/shoolDetail', query: { name: item.name } })">
+                    <el-col
+                      :span="12"
+                      class="txt2"
+                      @click.native="$router.push({ path: '/halltwo/shoolDetail', query: { name: item.name, dock_id: dockInfo.id } })"
+                    >
                       查看院校项目
                     </el-col>
                   </el-col>

src/views/halltwo/shoolDetail.vue

@@ -288,13 +288,13 @@ export default {
     }
   }
   .three {
-    height: 860px;
+    min-height: 500px;
     overflow: hidden;
     position: relative;
     top: -50px;
     z-index: 999;
     .threeinfo {
-      height: 860px;
+      min-height: 500px;
       overflow: hidden;
       background-color: #fff;
       box-shadow: 0 5px 15px rgba(33, 82, 203, 0.35);