guhongwei 5 jaren geleden
bovenliggende
commit
7bddf648bc
4 gewijzigde bestanden met toevoegingen van 22 en 28 verwijderingen
  1. 1 1
      public/static/css/style.css
  2. 1 1
      src/style/style.css
  3. 17 23
      src/views/live/hall/hall.vue
  4. 3 3
      src/views/live/hall/liveList.vue

+ 1 - 1
public/static/css/style.css

@@ -342,7 +342,7 @@ p {
 
 
 .livemain .gongqiu {
 .livemain .gongqiu {
 	width: 100%;
 	width: 100%;
-	height: 625px;
+	min-height: 100px;
 	overflow: hidden;
 	overflow: hidden;
 	margin: 0 0 10px 0;
 	margin: 0 0 10px 0;
 }
 }

+ 1 - 1
src/style/style.css

@@ -342,7 +342,7 @@ p {
 
 
 .livemain .gongqiu {
 .livemain .gongqiu {
 	width: 100%;
 	width: 100%;
-	min-height: 690px;
+	min-height: 100px;
   margin: 0 0 10px 0;
   margin: 0 0 10px 0;
 }
 }
 
 

+ 17 - 23
src/views/live/hall/hall.vue

@@ -80,7 +80,7 @@
               </el-carousel>
               </el-carousel>
             </div>
             </div>
             <div class="gongqiu">
             <div class="gongqiu">
-              <div class="gongqiuTop">
+              <div class="gongqiuTop" style="display:none">
                 <img :src="img.main2" />
                 <img :src="img.main2" />
               </div>
               </div>
               <div class="gongqiuInfo">
               <div class="gongqiuInfo">
@@ -148,14 +148,14 @@
                     <el-col :span="24">
                     <el-col :span="24">
                       <ul class="expert">
                       <ul class="expert">
                         <li class="expertList" v-for="(item, index) in expertList" :key="index">
                         <li class="expertList" v-for="(item, index) in expertList" :key="index">
-                          <el-image :src="item.logo"></el-image>
+                          <el-image :src="item.imgpath"></el-image>
                           <div>
                           <div>
                             <p>
                             <p>
                               <span>{{ item.name }}</span>
                               <span>{{ item.name }}</span>
-                              <span>{{ item.address }}</span>
+                              <span>{{ item.nation }}</span>
                             </p>
                             </p>
-                            <p>从事领域:{{ item.csly }}</p>
-                            <p>擅长能力:{{ item.scnl }}</p>
+                            <p>职务:{{ item.position }}</p>
+                            <p>从事领域:{{ item.field }}</p>
                           </div>
                           </div>
                         </li>
                         </li>
                       </ul>
                       </ul>
@@ -224,9 +224,10 @@
 import chat from './parts/chat.vue';
 import chat from './parts/chat.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapProduct } = createNamespacedHelpers('enterpriseproject');
+const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: dock } = createNamespacedHelpers('dock');
+const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
 
 
 import _ from 'loadsh';
 import _ from 'loadsh';
 export default {
 export default {
@@ -380,23 +381,16 @@ export default {
     ...mapProduct({ mapProductQuery: 'query' }),
     ...mapProduct({ mapProductQuery: 'query' }),
     ...market({ marketFetch: 'fetch' }),
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
     ...dock({ dockQuery: 'query' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      let res = await this.mapProductQuery({ skip, limit, totaltype: 0, ...info });
-      if (res.errcode === 0) {
-        this.$set(this, `technologyList`, res.data);
-      }
-      res = await this.mapProductQuery({ skip, limit, totaltype: 1, ...info });
-      if (res.errcode === 0) {
-        this.$set(this, `demandList`, res.data);
-      }
-      res = await this.mapProductQuery({ skip, limit, totaltype: 2, ...info });
-      if (res.errcode === 0) {
-        for (const val of res.data) {
-          const userInfo = await this.marketFetch(val.userid);
-          val.companyName = userInfo.data.institution_name;
-        }
-        this.$set(this, `serviceList`, res.data);
-      }
+    ...talentExperts({ expertQuery: 'query' }),
+    async searchInfo() {
+      let res = await this.mapProductQuery({ skip: 0, limit: 4, totaltype: '0' });
+      if (this.$checkRes(res)) this.$set(this, `technologyList`, res.data);
+      res = await this.mapProductQuery({ skip: 0, limit: 4, totaltype: '1' });
+      if (this.$checkRes(res)) this.$set(this, `demandList`, res.data);
+      res = await this.mapProductQuery({ 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, `expertList`, res.data);
     },
     },
     async searchDock() {
     async searchDock() {
       let res = await this.dockQuery({});
       let res = await this.dockQuery({});

+ 3 - 3
src/views/live/hall/liveList.vue

@@ -47,7 +47,7 @@
           <el-row class="liveList">
           <el-row class="liveList">
             <el-col class="liveListInfo">
             <el-col class="liveListInfo">
               <el-col :span="24" class="liveLisTop">
               <el-col :span="24" class="liveLisTop">
-                <span>吉林省计算中心对接直播中心</span>
+                <span>吉林省计算中心对接直播中心</span>
                 <span>实况直播</span>
                 <span>实况直播</span>
               </el-col>
               </el-col>
               <el-col :span="24" class="liveLisMain">
               <el-col :span="24" class="liveLisMain">
@@ -61,8 +61,8 @@
                 </ul>
                 </ul>
               </el-col>
               </el-col>
               <el-col :span="24" class="liveLisDown">
               <el-col :span="24" class="liveLisDown">
-                <p><span>主办单位:</span><span>吉林省计算中心对接直播中心</span></p>
-                <p><span>指导单位:</span><span>吉林省计算中心对接直播中心</span></p>
+                <p><span>主办单位:</span><span>吉林省计算中心对接直播中心</span></p>
+                <p><span>指导单位:</span><span>吉林省计算中心对接直播中心</span></p>
                 <p><span>技术支持:</span><span>长春福瑞科技有限公司</span></p>
                 <p><span>技术支持:</span><span>长春福瑞科技有限公司</span></p>
               </el-col>
               </el-col>
               <el-col :span="24">
               <el-col :span="24">