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

public/static/liveIndex.html

@@ -32,13 +32,8 @@
             <p>指导单位：吉林省计算中心</p>
             <p>主办方：吉林省计算中心</p>
             <p>支持单位：长春市福瑞科技有限公司</p>
-            <a class="childpage" href="http://localhost:8001/direct" target="_blink">进入活动现场<i class="iconfont icon-bofang"></i></a>
+            <a class="childpage" href="/direct" target="_blank">进入活动现场<i class="iconfont icon-bofang"></i></a>
             <br>
-            
-            <div data-v-de97bcec="" class="btn el-col el-col-24">
-          <a href="http://localhost:8001/live/liveApply">申请测试对接会</a>
-            </div>
-            <!-- ../live/hall -->
           </div>
         </div>
       </div>

src/layout/live/head.vue

@@ -36,8 +36,8 @@
               <!-- <li :class="isTab('index') ? 'active' : ''">
                 <a @click="turnTo('home')" target="">首页</a>
               </li> -->
-              <li class="">
-                <a @click="zhibo()" target="_blank">直播大厅</a>
+              <li :class="isTab('hallList') ? 'active' : ''">
+                <a @click="turnTo('hallList')" target="">直播大厅</a>
               </li>
               <li :class="isTab('market') ? 'active' : ''">
                 <a @click="turnTo('market')" target="">科技超市</a>

src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import checkLogin from "@common/router/before";
+import checkLogin from '@common/router/before';
 Vue.use(VueRouter);
 const live = [
   {
@@ -39,10 +39,10 @@ const live = [
         component: () => import('../views/technical/index.vue'),
       },
       {
-        path: '/technical/zhibolist',
-        name: 'technical_lzhibolist',
+        path: '/hallList/index',
+        name: 'hallList_lzhibolist',
         meta: { title: '直播大厅列表', subSite: true },
-        component: () => import('../views/technical/zhibolist.vue'),
+        component: () => import('../views/hallList/index.vue'),
       },
       {
         path: '/technical/list',
@@ -127,6 +127,12 @@ const live = [
     name: 'dock_Info',
     component: () => import('../views/hall/dock/dockInfo.vue'),
   },
+  {
+    path: '/',
+    meta: { title: '直播首页', subSite: true },
+    name: 'home_index',
+    component: () => import('../views/home.vue'),
+  },
 ];
 const routes = [...live];
 

src/style/style.css

@@ -265,12 +265,14 @@ p {
 	float: left;
 	height: 50px;
 	line-height: 50px;
-	/* padding: 0 82px; */
 	font-size: 20px;
   border-right: 1px solid #76bdfe;
-  width: 19.9%;
+  width: 20%;
   text-align: center;
 }
+.supermenu .info ul li:last-child{
+  width: 300px;
+}
 
 .supermenu .info ul .active {
 	background-color: #fe950e;

src/views/direct.vue

@@ -98,7 +98,7 @@
                                 <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
                                 <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                                <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                                <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                                 <el-col :span="24" class="info">
                                   <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -144,15 +144,15 @@
                               <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
-                                <el-col :span="6" class="infos" v-for="(acm, index) in policyInfo.image" :key="index">
+                                <el-col :span="6" class="info" v-for="(acm, index) in policyInfo.image" :key="index">
                                   <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
                                 </el-col>
                               </el-col>
                               <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
+                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description }} </el-col>
                               <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                              <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -162,7 +162,7 @@
 
                           <span class="title" slot="reference" @mouseover="hover(item)"> {{ item.name }}</span>
                         </el-popover>
-                        <el-button type="primary" size="mini" @click="technologyBtn(item.id)" style="position: relative;top: -5px;">对接</el-button>
+                        <el-button type="primary" size="mini" @click="technologyBtn(item.id)" class="duijie">对接</el-button>
                       </p>
                       <p>
                         <span>研发阶段：{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span>
@@ -198,7 +198,7 @@
                               <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
                               <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
 
-                              <el-col :span="24" class="info"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -210,13 +210,13 @@
                       </p>
                       <div class="serviceDown">
                         <el-image :src="item.image[0].url"></el-image>
+                        <p>{{ item.contact_user }}</p>
                         <p>
-                          <button @click="technologyBtn(item.id)">立即咨询</button>
-                          <span class="type1">服务类型：</span>
+                          <span>服务类型：</span>
                           <span class="type2">{{ item.product_type_name }}</span>
                         </p>
+                        <p>{{ item.contact_tel }}</p>
                       </div>
-                      <button class="btn">进入主页</button>
                     </li>
                   </ul>
                 </el-col>
@@ -242,8 +242,7 @@
                               <el-col :span="24" class="info"> 职务:{{ policyInfo.position }} </el-col>
                               <el-col :span="24" class="info"> 从事专业:{{ policyInfo.professional }} </el-col>
                               <el-col :span="24" class="info"> 手机号:{{ policyInfo.phone }} </el-col>
-                              <el-col :span="24" class="info"> 业务工作简介:{{ policyInfo.job_profile }} </el-col>
-                              <el-col :span="24" class="info"> 备注:{{ policyInfo.remark }} </el-col>
+                              <el-col :span="24" class="infos"> 业务工作简介:{{ policyInfo.job_profile }} </el-col>
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="duizhuanjia(policyInfo.id)">对接</el-button>
                               </el-col>
@@ -1188,12 +1187,7 @@ p {
   padding: 15px 0 3px 20px;
 }
 .service .serviceList .serviceDown p .type2 {
-  padding: 0 0 0 20px;
   color: darkorange;
-  font-weight: bold;
-  font-size: 16px;
-  float: left;
-  width: 100%;
 }
 .service .serviceList .btn {
   font-size: 16px;
@@ -1327,4 +1321,11 @@ p {
 .tupian {
   float: left;
 }
+.infos {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
 </style>

src/views/dynamic/list.vue

@@ -15,9 +15,9 @@
           </el-col>
           <el-table :data="resultTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '1'" class="leftInfo">
@@ -26,9 +26,9 @@
           </el-col>
           <el-table :data="willTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '2'" class="leftInfo">
@@ -37,9 +37,9 @@
           </el-col>
           <el-table :data="cooperationTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col v-if="menuIndex == '3'" class="leftInfo">
@@ -48,9 +48,9 @@
           </el-col>
           <el-table :data="demandTable" stripe style="width: 96%" border>
             <el-table-column prop="time" label="时间"> </el-table-column>
-            <el-table-column prop="name" label="项目名称" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="sell_unit" label="营销单位" show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="buy_unit" label="采购单位" show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="name" label="项目名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sell_unit" label="营销单位" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="buy_unit" label="采购单位" :show-overflow-tooltip="true"> </el-table-column>
           </el-table>
         </el-col>
         <el-col class="page">

src/views/hall/dock/zhuanjiaDetail.vue

@@ -31,7 +31,15 @@
                       <span>学术成就:{{ productInfo.achievement }}</span>
                       <span>毕业院校:{{ productInfo.school }}</span>
                     </p>
+                    <p>
+                      <span> 民族:{{ productInfo.nation }}</span
+                      ><span> 学术成就:{{ productInfo.achievement }}</span>
+                    </p>
+                    <p>
+                      <span> 身份证号:{{ productInfo.cardnumber }} </span><span>学位:{{ productInfo.degree }}</span> 职务:{{ productInfo.position }}
+                    </p>
                   </div>
+
                   <p class="intro">
                     <span><i class="el-icon-date"></i>业务工作简介</span>
                     <span>{{ productInfo.job_profile }} </span>

src/views/hall/liveApply.vue

@@ -115,15 +115,20 @@ export default {
       let duplicate = JSON.parse(JSON.stringify(this.form));
       let data = { ...duplicate };
       data.user_id = this.user.uid;
-      data.user_name = this.user.name;
-      let dock_id = this.$route.query.id;
-      data.goodsList = [this.productInfo(this.form.goodsList)];
-      const res = await this.applyCreate({ id: dock_id, ...data });
-      if (res.errcode === 0) {
-        this.$message({
-          message: '申请参加对接会成功',
-          type: 'success',
-        });
+      if (data.user_id) {
+        data.user_name = this.user.name;
+        let dock_id = this.$route.query.id;
+        data.goodsList = [this.productInfo(this.form.goodsList)];
+        const res = await this.applyCreate({ id: dock_id, ...data });
+        if (res.errcode === 0) {
+          this.$message({
+            message: '申请参加对接会成功',
+            type: 'success',
+          });
+        }
+      } else {
+        let res = 0;
+        this.$checkRes(res, '请登录', '请登录');
       }
     },
     productInfo(id) {

src/views/technical/zhibolist.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="list">
+  <div id="index">
     <el-col :span="24" class="main">
       <el-col :span="24" class="info">
         <el-col>
@@ -8,10 +8,10 @@
           </el-col>
           <el-col class="infoRightList" :span="24" v-for="(item, index) in hangyeList" :key="index">
             <p>
-              <span class="textOver" @click="clickhangye(item.id)">{{ item.title }}</span
+              <span class="textOver" @click="turnTo(item)">{{ item.title }}</span
               ><span class="textOver">
-                <el-button type="primary" class="duijie" @click="jinru()">进入对接会</el-button>
-                <el-button type="primary" class="duijie" @click="apply(item.id)">申请对接会</el-button></span
+                <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
               >
             </p>
           </el-col>
@@ -38,7 +38,7 @@ import _ from 'lodash';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
-  name: 'list',
+  name: 'index',
   props: {},
   components: {},
   data: () => ({
@@ -77,14 +77,17 @@ export default {
       this.$router.push({ path: '/live/liveApply', query: { id: id } });
     },
 
-    jinru() {
-      window.location.href = '/static/liveIndex.html';
-    },
     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 } });
+    },
   },
 };
 </script>
@@ -252,18 +255,12 @@ export default {
 }
 .infoRightList p span:last-child {
   display: inline-block;
-  width: 15%;
+  padding: 0 0 0 149px;
   text-align: center;
   font-size: 16px;
 }
 .duijie {
-  color: #fff;
-  background-color: #ff8500;
-  text-align: center;
   padding: 10px 15px 10px 15px;
   margin: 10px 0 0 10px;
 }
-.duijie:hover {
-  background-color: #0279d5;
-}
 </style>

src/views/home.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="home">
+    <p>home</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'home',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/market/index.vue

@@ -73,7 +73,7 @@
               </span>
             </el-col>
             <el-col :span="24" class="downRightImage">
-              <el-image src="http://img2.imgtn.bdimg.com/it/u=1300722955,3173826431&fm=26&gp=0.jpg"></el-image>
+              <el-image :src="serviceImage"></el-image>
             </el-col>
             <el-col :span="24">
               <el-col :span="24" class="downRightList" v-for="(item, index) in bankingList" :key="index">
@@ -82,28 +82,27 @@
               </el-col>
             </el-col>
           </el-col>
-
-          <el-col :span="24">
-            <el-col :span="24" class="downLeftTop">
-              <el-image :src="downLeftTopImage"></el-image>
-              <span class="topTexts">
-                <span>最新发布</span>
-                <span
-                  ><p>B</p>
-                  <p>anking</p></span
-                >
-                <span @click="fabu()">我要发布</span>
-              </span>
-              <el-col :span="24" class="downLeftInfos">
-                <el-col :span="12" class="bankingLists" v-for="(item, index) in serviceList" :key="index" @click.native="serviceDetail(item.id)">
-                  <el-col :span="10">
-                    <el-image :src="item.image[0].url"></el-image>
-                  </el-col>
-                  <el-col :span="12">
-                    <span class="textOvers">{{ item.name }}</span>
-                    <span>{{ item.introduction }}</span>
-                  </el-col>
-                </el-col>
+        </el-col>
+      </el-col>
+      <el-col :span="24" class="marketNew">
+        <el-col :span="24" class="downLeftTop">
+          <el-image :src="downLeftTopImage"></el-image>
+          <span class="topTexts">
+            <span>最新发布</span>
+            <span
+              ><p>N</p>
+              <p>ewing</p></span
+            >
+            <span @click="fabu()">我要发布</span>
+          </span>
+          <el-col :span="24" class="downLeftInfos">
+            <el-col :span="12" class="bankingLists" v-for="(item, index) in newList" :key="index" @click.native="productDetail(item.id)">
+              <el-col :span="10">
+                <el-image :src="item.image[0].url"></el-image>
+              </el-col>
+              <el-col :span="12">
+                <span class="textOvers">{{ item.name }}</span>
+                <span>{{ item.introduction }}</span>
               </el-col>
             </el-col>
           </el-col>
@@ -126,6 +125,7 @@ export default {
   data: () => ({
     gongqiuImage: require('@/assets/live/main2.png'),
     downLeftTopImage: require('@/assets/live/square_big.png'),
+    serviceImage: require('@/assets/live/service_picture_one.jpg'),
     productList: [],
     tecList: [],
     bankingList: [
@@ -159,6 +159,7 @@ export default {
       },
     ],
     serviceList: [],
+    newList: [],
   }),
   created() {
     this.search();
@@ -182,32 +183,40 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `tecList`, res.data);
       res = await this.query({ skip: 0, limit: 4, totaltype: '1' });
       if (this.$checkRes(res)) this.$set(this, `productList`, res.data);
+      if (this.$checkRes(res)) this.$set(this, `newList`, res.data);
       res = await this.query({ skip: 0, limit: 4, totaltype: '2' });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
       // res = await this.expertQuery({ skip: 0, limit: 4 });
       // if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
     },
     toProductList() {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=1';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=1';
+      window.open('http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=1');
     },
     productDetail(id) {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '';
+      window.open('http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '');
     },
     toTecList() {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=0';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=0';
+      window.open('http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=0');
     },
     tecDetail(id) {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=0&&?&id=' + id + '';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=0&&?&id=' + id + '';
+      window.open('//free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=0&&?&id=' + id + '');
     },
     toServiceList() {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=2';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=2';
+      window.open('http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=2');
     },
     serviceDetail(id) {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '';
+      window.open('http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '');
     },
 
     fabu() {
-      window.location.href = 'http://free.liaoningdoupo.com/platweb/enterprise/enterprisexuqiu';
+      // window.location.href = 'http://free.liaoningdoupo.com/platweb/enterprise/enterprisexuqiu';
+      window.open('http://free.liaoningdoupo.com/platweb/enterprise/enterprisexuqiu');
     },
   },
 };
@@ -384,7 +393,7 @@ export default {
   color: #044b79;
 }
 .marketDown {
-  height: 780px;
+  height: 550px;
   overflow: hidden;
   margin: 20px 0 20px 0;
   background: #e9edf6;
@@ -575,4 +584,13 @@ export default {
   text-overflow: ellipsis;
   display: inline-block;
 }
+.marketNew {
+  float: none;
+  width: 80%;
+  margin: 30px auto;
+  height: 400px;
+}
+.downLeftInfos {
+  height: 330px;
+}
 </style>