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

src/views/hall/directBefore.vue

@@ -53,7 +53,7 @@ export default {
       if (data.room_id == '1005') {
         this.$router.push({ path: '/halltwo/directTwo', query: { id: data.id, title: data.title } });
       } else {
-        this.$router.push({ path: '/halltwo/directTwo', query: { id: data.id, title: data.title } });
+        this.$router.push({ path: '/hall/direct', query: { id: data.id, title: data.title } });
       }
     },
   },

src/views/halltwo/shoolDetail.vue

@@ -47,7 +47,12 @@
               <p class="title">高校院所</p>
               <el-col :span="24" class="detail">
                 <p>{{ schoolList.content }}</p>
-                <p v-if="schoolList.name == '吉林大学' || schoolList.name == '长春理工大学'">附件</p>
+                <el-link v-if="schoolList.name == '吉林大学'" href="">
+                  吉林大学
+                </el-link>
+                <el-link v-else-if="schoolList.name == '长春理工大学'">
+                  长春理工大学
+                </el-link>
               </el-col>
             </el-col>
           </div>