guhongwei 4 vuotta sitten
vanhempi
commit
57d64e4ea7

+ 13 - 0
src/router/index.js

@@ -147,6 +147,19 @@ const live = [
     meta: { title: '直播大厅', subSite: true },
     meta: { title: '直播大厅', subSite: true },
     component: () => import('../views/halltwo/directTwo.vue'),
     component: () => import('../views/halltwo/directTwo.vue'),
   },
   },
+  {
+    path: '/hall/zxzdxmly/zxzdDetail',
+    name: 'zxzdxmly_zxzdDetail',
+    meta: { title: '嘉宾访谈', subSite: true },
+    component: () => import('../views/hall/zxzdxmly/zxzdDetail.vue'),
+  },
+  // 项目路演
+  {
+    path: '/hall/zxzdxmly/xmlyDetail',
+    name: 'zxzdxmly_xmlyDetail',
+    meta: { title: '项目路演', subSite: true },
+    component: () => import('../views/hall/zxzdxmly/xmlyDetail.vue'),
+  },
   {
   {
     path: '/halltwo/schoolMore',
     path: '/halltwo/schoolMore',
     name: 'schoolMore',
     name: 'schoolMore',

+ 12 - 6
src/views/hall/direct.vue

@@ -246,14 +246,17 @@
               <el-col :span="7" class="jiabin">
               <el-col :span="7" class="jiabin">
                 <p class="jiabintop">
                 <p class="jiabintop">
                   <span>嘉宾访谈</span>
                   <span>嘉宾访谈</span>
-                  <!-- <el-link :underline="false">MORE</el-link> -->
                 </p>
                 </p>
                 <div class="jiabinlist">
                 <div class="jiabinlist">
                   <ul>
                   <ul>
-                    <li v-for="(ref, index) in zxzdlist" :key="index">
+                    <li
+                      v-for="(ref, index) in zxzdlist"
+                      :key="index"
+                      @click="$router.push({ path: '/hall/zxzdxmly/zxzdDetail', query: { id: ref.id, dock_id: dock_id } })"
+                    >
                       <img :src="ref.picture" />
                       <img :src="ref.picture" />
                       <p>
                       <p>
-                        <span class="textOver" @click="$router.push({ path: '/hall/zxzdxmly/zxzdDetail', query: { id: ref.id } })">{{ ref.title }}</span>
+                        <span class="textOver">{{ ref.title }}</span>
                         <span>{{ ref.publish_time }}</span>
                         <span>{{ ref.publish_time }}</span>
                         <span class="text">{{ ref.titlejj }} </span>
                         <span class="text">{{ ref.titlejj }} </span>
                       </p>
                       </p>
@@ -264,13 +267,16 @@
               <el-col :span="7" class="jiabin luyan">
               <el-col :span="7" class="jiabin luyan">
                 <p class="jiabintop luyanTop">
                 <p class="jiabintop luyanTop">
                   <span>项目路演</span>
                   <span>项目路演</span>
-                  <!-- <el-link :underline="false">MORE</el-link> -->
                 </p>
                 </p>
                 <div class="luyanList">
                 <div class="luyanList">
                   <ul>
                   <ul>
-                    <li v-for="(item, index) in xmlylist" :key="index">
+                    <li
+                      v-for="(item, index) in xmlylist"
+                      :key="index"
+                      @click="$router.push({ path: '/hall/zxzdxmly/xmlyDetail', query: { id: item.id, dock_id: dock_id } })"
+                    >
                       <p>
                       <p>
-                        <span class="textOver" @click="$router.push({ path: '/hall/zxzdxmly/xmlyDetail', query: { id: item.id } })">{{ item.title }}</span>
+                        <span class="textOver">{{ item.title }}</span>
                         <span>时间:{{ item.publish_time }}</span>
                         <span>时间:{{ item.publish_time }}</span>
                       </p>
                       </p>
                       <p>
                       <p>

+ 19 - 6
src/views/hall/zxzdxmly/xmlyDetail.vue

@@ -6,8 +6,8 @@
         <el-col :span="24" class="info">
         <el-col :span="24" class="info">
           <div class="w_1200">
           <div class="w_1200">
             <el-col :span="24" class="top">
             <el-col :span="24" class="top">
-              <p>吉林省计算中心对接直播大厅</p>
-              <p>主办方:吉林省计算中心</p>
+              <p>{{ dockInfo.title }}</p>
+              <p>主办方:{{ dockInfo.sponsor }}</p>
             </el-col>
             </el-col>
             <el-col :span="24" class="main">
             <el-col :span="24" class="main">
               <el-col :span="24" class="back">
               <el-col :span="24" class="back">
@@ -43,6 +43,7 @@
 <script>
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: newsroadshow } = createNamespacedHelpers('newsroadshow');
 const { mapActions: newsroadshow } = createNamespacedHelpers('newsroadshow');
+const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
 export default {
   name: 'zxzdDetail',
   name: 'zxzdDetail',
   props: {},
   props: {},
@@ -50,17 +51,23 @@ export default {
   data: () => ({
   data: () => ({
     beijingPic: require('@a/live/top_3.png'),
     beijingPic: require('@a/live/top_3.png'),
     detailinfo: {},
     detailinfo: {},
+    dockInfo: {},
   }),
   }),
-  created() {
-    this.search();
+  async created() {
+    await this.search();
   },
   },
   methods: {
   methods: {
     ...newsroadshow(['fetch']),
     ...newsroadshow(['fetch']),
+    ...dock({ dockFetch: 'fetch' }),
     async search() {
     async search() {
       let res = await this.fetch(this.id);
       let res = await this.fetch(this.id);
       if (this.$checkRes(res)) {
       if (this.$checkRes(res)) {
         this.$set(this, `detailinfo`, res.data);
         this.$set(this, `detailinfo`, res.data);
       }
       }
+      res = await this.dockFetch(this.dock_id);
+      if (this.$checkRes(res)) {
+        this.$set(this, `dockInfo`, res.data);
+      }
     },
     },
     // 返回
     // 返回
     back() {
     back() {
@@ -72,7 +79,9 @@ export default {
     id() {
     id() {
       return this.$route.query.id;
       return this.$route.query.id;
     },
     },
-
+    dock_id() {
+      return this.$route.query.dock_id;
+    },
     pageTitle() {
     pageTitle() {
       return `${this.$route.meta.title}`;
       return `${this.$route.meta.title}`;
     },
     },
@@ -122,8 +131,12 @@ p {
   margin: 0 0 20px 0;
   margin: 0 0 20px 0;
 }
 }
 .style .top p:first-child {
 .style .top p:first-child {
-  font-size: 50px;
+  text-align: center;
   color: #fff;
   color: #fff;
+  position: relative;
+  width: 100%;
+  font-size: 45px;
+  top: 5px;
 }
 }
 .style .top p:last-child {
 .style .top p:last-child {
   font-size: 30px;
   font-size: 30px;

+ 19 - 6
src/views/hall/zxzdxmly/zxzdDetail.vue

@@ -6,8 +6,8 @@
         <el-col :span="24" class="info">
         <el-col :span="24" class="info">
           <div class="w_1200">
           <div class="w_1200">
             <el-col :span="24" class="top">
             <el-col :span="24" class="top">
-              <p>吉林省计算中心对接直播大厅</p>
-              <p>主办方:吉林省计算中心</p>
+              <p>{{ dockInfo.title }}</p>
+              <p>主办方:{{ dockInfo.sponsor }}</p>
             </el-col>
             </el-col>
             <el-col :span="24" class="main">
             <el-col :span="24" class="main">
               <el-col :span="24" class="back">
               <el-col :span="24" class="back">
@@ -43,6 +43,7 @@
 <script>
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: newsguidance } = createNamespacedHelpers('newsguidance');
 const { mapActions: newsguidance } = createNamespacedHelpers('newsguidance');
+const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
 export default {
   name: 'zxzdDetail',
   name: 'zxzdDetail',
   props: {},
   props: {},
@@ -50,17 +51,23 @@ export default {
   data: () => ({
   data: () => ({
     beijingPic: require('@a/live/top_3.png'),
     beijingPic: require('@a/live/top_3.png'),
     detailinfo: {},
     detailinfo: {},
+    dockInfo: {},
   }),
   }),
-  created() {
-    this.search();
+  async created() {
+    await this.search();
   },
   },
   methods: {
   methods: {
     ...newsguidance(['fetch']),
     ...newsguidance(['fetch']),
+    ...dock({ dockFetch: 'fetch' }),
     async search() {
     async search() {
       let res = await this.fetch(this.id);
       let res = await this.fetch(this.id);
       if (this.$checkRes(res)) {
       if (this.$checkRes(res)) {
         this.$set(this, `detailinfo`, res.data);
         this.$set(this, `detailinfo`, res.data);
       }
       }
+      res = await this.dockFetch(this.dock_id);
+      if (this.$checkRes(res)) {
+        this.$set(this, `dockInfo`, res.data);
+      }
     },
     },
     // 返回
     // 返回
     back() {
     back() {
@@ -72,7 +79,9 @@ export default {
     id() {
     id() {
       return this.$route.query.id;
       return this.$route.query.id;
     },
     },
-
+    dock_id() {
+      return this.$route.query.dock_id;
+    },
     pageTitle() {
     pageTitle() {
       return `${this.$route.meta.title}`;
       return `${this.$route.meta.title}`;
     },
     },
@@ -122,8 +131,12 @@ p {
   margin: 0 0 20px 0;
   margin: 0 0 20px 0;
 }
 }
 .style .top p:first-child {
 .style .top p:first-child {
-  font-size: 50px;
+  text-align: center;
   color: #fff;
   color: #fff;
+  position: relative;
+  width: 100%;
+  font-size: 45px;
+  top: 5px;
 }
 }
 .style .top p:last-child {
 .style .top p:last-child {
   font-size: 30px;
   font-size: 30px;