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

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('/platlive/direct?'+query)
+  }
+</script>
 </html>

src/layout/live/head.vue

@@ -9,19 +9,16 @@
           <p>
             欢迎来到吉林省计算中心科技平台
           </p>
-          <p v-if="user && user.uid">
-            {{ user.name }}
-          </p>
           <p>
             <span v-if="user && user.name">{{ user.name }}</span>
-            <button type="button" class="logininfo">登录</button>
-            <button type="button" class="logininfo">注册</button>
+            <button type="button" class="logininfo" @click="btnLogin">登录</button>
+            <button type="button" class="logininfo" @click="btnLogin">注册</button>
           </p>
         </div>
       </div>
       <div class="superlogo">
         <div class="w_1200">
-          <a href="home">
+          <a href="/platlive">
             <img :src="logo" />
             <span>
               吉林省计算中心科技平台
@@ -33,9 +30,6 @@
         <div class="w_1200">
           <div class="info">
             <ul>
-              <!-- <li :class="isTab('index') ? 'active' : ''">
-                <a @click="turnTo('home')" target="">首页</a>
-              </li> -->
               <li :class="isTab('hallList') ? 'active' : ''">
                 <a @click="turnTo('hallList')" target="">直播大厅</a>
                 <span></span>
@@ -80,12 +74,8 @@ export default {
     fuwu() {
       this.$router.push({ path: '/live/service' });
     },
-    zhibo() {
-      this.$router.push({ path: '/technical/zhibolist' });
-    },
     turnTo(type) {
       if (type == 'index') {
-        console.log('首页未出');
       } else if (type == 'hall_index') this.$router.push({ path: '/live/hall/index' });
       else this.$router.push({ path: `/${type}/index` });
     },
@@ -93,6 +83,9 @@ export default {
       if (type == 'index') return this.$route.path.includes('/live/index');
       else return this.$route.path.includes(`/${type}`);
     },
+    btnLogin() {
+      window.open('http://free.liaoningdoupo.com/platlogin/');
+    },
   },
   computed: {
     ...mapState(['user']),

src/style/style.css

@@ -91,7 +91,6 @@ body {
 	position: relative;
 	float: left;
 	width: 100%;
-	overflow: hidden;
 }
 
 select {

src/views/direct.vue

@@ -45,7 +45,7 @@
         <el-col :span="24" class="livemain">
           <el-col :span="24" class="livevideo">
             <el-col :span="24" class="left">
-              <el-col :span="24" class="title">
+              <el-col :span="24" class="title" @click.native="btnDirectDetail">
                 <span style="color: rgb(255, 132, 0);">现场</span>
                 <span>直播</span>
               </el-col>
@@ -71,7 +71,9 @@
           </el-col>
           <el-col :span="24" class="newimage">
             <el-image :src="superOne" style="width:100%;height:100px;position:relative;"> </el-image>
-            <span>使用手册</span>
+            <el-link :underline="false" href="user.docx">
+              使用手册
+            </el-link>
           </el-col>
           <el-col :span="24" class="context">
             <el-tabs type="border-card">
@@ -496,7 +498,6 @@ export default {
       console.log(res);
       if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
     },
-
     onclickjs(item) {
       console.log(item);
       this.$set(this, `policyInfo`, item);
@@ -536,6 +537,11 @@ export default {
         })
         .catch(_ => {});
     },
+    // 直播详情
+    btnDirectDetail() {
+      console.log('你好');
+      this.$router.push({ path: '/live/hallDetail', query: { id: this.$route.query.id } });
+    },
   },
   computed: {
     pageTitle() {
@@ -699,7 +705,7 @@ p {
   margin-bottom: 5px;
   position: relative;
 }
-.newimage span {
+.newimage .el-link {
   position: absolute;
   top: 30px;
   left: 46%;

src/views/dynamic/list.vue

@@ -61,7 +61,7 @@
             :current-page.sync="currentPage"
             :page-size="10"
             layout="total,prev, pager, next, jumper"
-            :total="1000"
+            :total="total"
           >
           </el-pagination>
         </el-col>
@@ -97,15 +97,40 @@ export default {
     willTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
     cooperationTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
     demandTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
+    total: 10,
   }),
   created() {
     this.searchList();

src/views/hall/dock/dockDetail.vue

@@ -14,10 +14,10 @@
                 <el-col :span="24">
                   <el-button type="primary" icon="el-icon-tickets" @click="btnInfo">项目信息</el-button>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="this.user.uid != productInfo.userid">
                   <el-button type="danger" icon="el-icon-phone-outline" @click="btnPhone">对接</el-button>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="this.user.uid != productInfo.userid">
                   <el-button type="success" icon="el-icon-check" @click="btnTrade">申请交易</el-button>
                 </el-col>
               </el-col>
@@ -81,6 +81,7 @@ export default {
     if (this.$route.query.id) {
       this.searchInfo();
     }
+    this.test();
   },
   methods: {
     ...mapProduct(['fetch']),
@@ -89,6 +90,7 @@ export default {
     async searchInfo() {
       let res = await this.fetch(this.$route.query.id);
       if (res.errcode === 0) {
+        console.log(res.data.userid);
         this.$set(this, `productInfo`, res.data);
       }
     },
@@ -135,6 +137,9 @@ export default {
       let res = await this.buyProduct(form);
       this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
     },
+    test() {
+      console.log(this.user.uid);
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/hallList/index.vue

@@ -10,8 +10,10 @@
             <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" @click="apply(item.id)" class="duijie"> 申请对接会 </el-link></span
+                <el-link :underline="false" :href="`/platlive/static/liveIndex.html?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
               >
             </p>
           </el-col>
@@ -67,12 +69,9 @@ export default {
   methods: {
     ...dock({ dockQuery: 'query' }),
     async searchList({ skip = 0, limit = 10, ...info } = {}) {
-      console.log('ccc');
-
-      let res = await this.dockQuery({});
+      let res = await this.dockQuery({ is_allowed: 1 });
       this.$set(this, `pageTotal`, res.total);
       console.log(res.data);
-
       if (res.errcode === 0) {
         this.$set(this, `hangyeList`, res.data);
       }
@@ -86,16 +85,23 @@ export default {
     },
 
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
       this.limit = 5;
       this.initList({ skip: (val - 1) * this.limit, limit: this.limit });
     },
 
     turnTo(item) {
-      console.log('a');
-
       this.$router.push({ path: '/live/hallDetail', query: { id: item.id } });
     },
+    canIn(data) {
+      let nowTime = new Date().getTime();
+      let start_time = new Date(data.start_time).getTime();
+      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;
+    },
   },
 };
 </script>

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;