guhongwei 5 years ago
parent
commit
81909b7804

+ 7 - 2
public/static/liveIndex.html

@@ -32,7 +32,7 @@
             <p>指导单位:吉林省计算中心</p>
             <p>主办方:吉林省计算中心</p>
             <p>支持单位:长春市福瑞科技有限公司</p>
-            <a class="childpage" href="/direct" target="_blank">进入活动现场<i class="iconfont icon-bofang"></i></a>
+            <a class="childpage" onclick="btnDirect()" target="_blank">进入活动现场<i class="iconfont icon-bofang"></i></a>
             <br>
           </div>
         </div>
@@ -48,5 +48,10 @@
 
 
 </body>
-
+<script language="javascript">
+ function btnDirect() {
+     var query = window.location.search.substring(1);
+     window.open('/direct?'+query)
+  }
+</script>
 </html>

+ 1 - 1
src/views/dynamic/list.vue

@@ -130,7 +130,7 @@ export default {
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
-    total: 4,
+    total: 10,
   }),
   created() {
     this.searchList();

+ 1 - 1
src/views/hallList/index.vue

@@ -10,7 +10,7 @@
             <p>
               <span class="textOver" @click="turnTo(item)">{{ item.title }}</span
               ><span class="textOver">
-                <el-link :underline="false" href="/static/liveIndex.html" target="_blank" class="duijie">进入对接会</el-link>
+                <el-link :underline="false" :href="`/static/liveIndex.html?id=${item.id}`" target="_blank" class="duijie">进入对接会</el-link>
                 <el-link :underline="false" @click="apply(item.id)" class="duijie"> 申请对接会 </el-link></span
               >
             </p>

+ 3 - 8
src/views/technical/list.vue

@@ -25,7 +25,7 @@
           <el-col :span="24" class="leftTop">
             <span>|</span> <span>{{ menuName }}</span>
           </el-col>
-          <el-col class="infoRightList" :span="24" v-for="(item, index) in hangyeList" :key="index">
+          <el-col class="infoRightList" :span="24" v-for="(item, index) in jishuList" :key="index">
             <p>
               <span class="textOver" @click="clickjishu(item.id)">{{ item.title }}</span
               ><span class="textOver">{{ item.publish_time }}</span>
@@ -47,7 +47,7 @@
           <el-col :span="24" class="leftTop">
             <span>|</span> <span>{{ menuName }}</span>
           </el-col>
-          <el-col class="infoLeftList" :span="24" v-for="(item, index) in zhuantiList" :key="index">
+          <el-col class="infoLeftList" :span="24" v-for="(item, index) in jiaoyuList" :key="index">
             <p>{{ item.publish_time }}</p>
             <p>
               <span class="textOver" @click="clickjiaoyu(item.id)">{{ item.title }}</span>
@@ -123,18 +123,17 @@ export default {
       this.menuIndex = index;
       this.menuColor = 'rgb(254, 149, 14)';
       this.menuName = name;
-      console.log(name);
       this.initList({ name });
     },
     async initList({ name, skip = 0, limit = 10, ...info } = {}) {
       let res = [];
-      console.log(name);
       if (name == '专题研讨') {
         this.pageSize = 5;
         res = await this.query({ skip, limit, column_name: '专题研讨', ...info });
         this.$set(this, `zhuantiList`, res.data);
       } else if (name == '技术问答') {
         res = await this.query({ skip, limit, column_name: '技术问答', ...info });
+        console.log(res);
         this.$set(this, `jishuList`, res.data);
       } else if (name == '行业研究') {
         res = await this.query({ skip, limit, column_name: '行业研究', ...info });
@@ -144,13 +143,9 @@ export default {
         res = await this.query({ skip, limit, column_name: '教育培训', ...info });
         this.$set(this, `jiaoyuList`, res.data);
       }
-      console.log(res);
-
       this.$set(this, `pageTotal`, res.total);
     },
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      console.log(this.menuName);
       const name = this.menuName;
       if (name == '专题研讨' || name == '教育培训') {
         this.limit = 5;