Merge branch 'master' of dd.tall.wiki:binbin0314/green.v0.3

src/components/PlatformList/PlatformList.vue

@@ -5,7 +5,7 @@
         <img :src="item.picUrl" class="con-img" v-if="item.picUrl" :title="item.name" />
         <img :src="item.visitLocation" class="con-img" :title="item.name" v-else />
         <p class="font-24 my-4 title">{{ item.name }}</p>
-        <p @click="jump(item.id)" class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
+        <p @click="jump(item)" class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
       </div>
     </div>
     <div class="inner">
@@ -182,24 +182,27 @@ export default {
       }
     },
     // 查看 研究院/仪器 详情
-    jump(id) {
+    jump(item) {
       if (this.listState === 0) {
         this.$router.push({
           path: '/NewPlatform/Share/Institute',
           name: 'Institute',
-          params: { id },
+          params: {
+            id: item.id,
+            direction: item.direction,
+          },
         });
       } else if (this.listState === 1) {
         this.$router.push({
           path: '/NewPlatform/Share/InsDet',
           name: 'InsDet',
-          params: { id },
+          params: { id: item.id },
         });
       } else if (this.listState === 3) {
         this.$router.push({
           path: '/NewPlatform/Share/InsDet',
           name: 'InsDet',
-          params: { id },
+          params: { id: item.id },
         });
       }
     },

src/views/NewPlatform/Children/ShareChild/Institute.vue

@@ -7,15 +7,10 @@
     <banner :show-page="showPage" />
     <div class="inner ins-box">
       <p class="font-bold-24 item-title">研究院介绍</p>
-      <div>研究院介绍</div>
+      <div>{{ direction }}</div>
       <p class="font-bold-24 item-title" v-if="list[0]">设备列表</p>
       <div class="d-flex flex-wrap" v-if="list[0]">
-        <div
+        <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
-          :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
-          :key="index"
-          class="item-box mb-8"
-          v-for="(item, index) in list"
-        >
           <img :src="item.visitLocation" style="height: 220px; width: 100%" />
           <p class="font-24 my-4">{{ item.name }}</p>
           <p @click="jump(item.id)" class="font-16 baseColor item-more">了解更多→</p>
@@ -63,7 +58,7 @@
           <div class="h-box" style="flex: 1">职称职务</div>
           <div class="h-box" style="flex: 1">研究方向</div>
         </div>
-        <div v-if="obj.teamMemberList && obj.teamMemberList.length>0">
+        <div v-if="obj.teamMemberList && obj.teamMemberList.length > 0">
           <div :key="index" class="d-flex" v-for="(item, index) in obj.teamMemberList">
             <div class="con-box" style="flex: 1">{{ item.name }}</div>
             <div class="con-box" style="flex: 1">
@@ -104,6 +99,7 @@ export default {
       ],
       obj: null,
       list: [],
+      direction: '',
     };
   },
   computed: mapState('home', ['LabId']),
@@ -114,6 +110,9 @@ export default {
     } else {
       this.id = this.LabId;
     }
+    if (this.$route.params.direction) {
+      this.direction = this.$route.params.direction;
+    }
     this.getData();
     this.getTeam();
   },