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

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="`/platlive/static/liveIndex.html?id=${item.id}`" target="_blank" class="duijie" v-if="canIn(item)">
+                <el-link :underline="false" :href="`${liveIndex}?id=${item.id}`" target="_blank" class="duijie" v-if="canIn(item)">
                   进入对接会
                 </el-link>
                 <el-link :underline="false" @click="apply(item.id)" class="duijie" v-if="canJoin(item)"> 申请对接会 </el-link></span
@@ -53,9 +53,11 @@ export default {
     pageSize: 10,
     limit: 10,
     hangyeList: [],
+    liveIndex: '',
   }),
   created() {
     this.searchList();
+    this.setIndex();
   },
   computed: {
     pageTitle() {
@@ -95,13 +97,17 @@ export default {
     canIn(data) {
       let nowTime = new Date().getTime();
       let start_time = new Date(data.start_time).getTime();
-      return start_time >= nowTime && data.status != 2;
+      return !(start_time >= nowTime && data.status != 2);
     },
     canJoin(data) {
       let nowTime = new Date().getTime();
       let join_end = new Date(data.join_end).getTime();
       return join_end < nowTime && data.status != 2;
     },
+    setIndex() {
+      let index = (process.env.NODE_ENV === 'development' ? '' : process.env.VUE_APP_ROUTER) + '/static/liveIndex.html';
+      this.$set(this, `liveIndex`, index);
+    },
   },
 };
 </script>