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

public/static/css/style.css

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

src/style/style.css

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

src/views/live/hall/hall.vue

@@ -80,7 +80,7 @@
               </el-carousel>
             </div>
             <div class="gongqiu">
-              <div class="gongqiuTop">
+              <div class="gongqiuTop" style="display:none">
                 <img :src="img.main2" />
               </div>
               <div class="gongqiuInfo">
@@ -148,14 +148,14 @@
                     <el-col :span="24">
                       <ul class="expert">
                         <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>
                             <p>
                               <span>{{ item.name }}</span>
-                              <span>{{ item.address }}</span>
+                              <span>{{ item.nation }}</span>
                             </p>
-                            <p>从事领域：{{ item.csly }}</p>
-                            <p>擅长能力：{{ item.scnl }}</p>
+                            <p>职务：{{ item.position }}</p>
+                            <p>从事领域：{{ item.field }}</p>
                           </div>
                         </li>
                       </ul>
@@ -224,9 +224,10 @@
 import chat from './parts/chat.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapProduct } = createNamespacedHelpers('enterpriseproject');
+const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: dock } = createNamespacedHelpers('dock');
+const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
 
 import _ from 'loadsh';
 export default {
@@ -380,23 +381,16 @@ export default {
     ...mapProduct({ mapProductQuery: 'query' }),
     ...market({ marketFetch: 'fetch' }),
     ...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() {
       let res = await this.dockQuery({});

src/views/live/hall/liveList.vue

@@ -47,7 +47,7 @@
           <el-row class="liveList">
             <el-col class="liveListInfo">
               <el-col :span="24" class="liveLisTop">
-                <span>吉林省计算机中心对接直播中心</span>
+                <span>吉林省计算中心对接直播中心</span>
                 <span>实况直播</span>
               </el-col>
               <el-col :span="24" class="liveLisMain">
@@ -61,8 +61,8 @@
                 </ul>
               </el-col>
               <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>
               </el-col>
               <el-col :span="24">

src/views/live/market/index.vue

@@ -3,112 +3,6 @@
     <div class="w_0100">
       <div class="supermain">
         <div class="w_1200">
-          <!-- <div class="superOne">
-            <div class="superOneTop">
-              <span style="margin: 10px;">技术</span>
-              <span class="more">MORE</span>
-            </div>
-            <div class="superoneInfo">
-              <ul>
-                <li v-for="(i, index) in tecList" :key="index">
-                  <p>
-                    <span class="textOver">{{ i.name }}</span>
-                    <span>{{ i | getDate }}</span>
-                  </p>
-                  <p>类型：{{ i.product_type_name }}</p>
-                  <p>
-                    价格：<span>{{ i.price }}</span> 元/{{ i.priceunit }}
-                  </p>
-                </li>
-              </ul>
-            </div>
-          </div>
-          <div class="superOne superTwo">
-            <div class="superOneTop">
-              <span style="margin: 10px;">专家</span>
-              <span class="more">MORE</span>
-            </div>
-            <div class="superTwoInfo">
-              <ul>
-                <li>
-                  <img :src="img" />
-                  <div>
-                    <p>
-                      <span>张三</span>
-                      <span><i class="iconfont icon-address" style="margin: 5px;"></i>吉林省长春市</span>
-                    </p>
-                    <p class="textOver">从事领域：化工生产，日用化学，合成化学，涂料、颜料、油墨化工生产，日用化学，合成化学，涂料、颜料、油墨</p>
-                    <p class="textOver">擅长能力：化工产品的研究、开发，企业管理化工产品的研究、开发，企业管理</p>
-                  </div>
-                </li>
-                <li>
-                  <img :src="img" />
-                  <div>
-                    <p>
-                      <span>四条数据</span>
-                      <span><i class="iconfont icon-address" style="margin: 5px;"></i>吉林省长春市</span>
-                    </p>
-                    <p class="textOver">从事领域：化工生产，日用化学，合成化学，涂料、颜料、油墨化工生产，日用化学，合成化学，涂料、颜料、油墨</p>
-                    <p class="textOver">擅长能力：化工产品的研究、开发，企业管理化工产品的研究、开发，企业管理</p>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div>
-          <div class="superOne superThree">
-            <div class="superOneTop">
-              <span style="margin: 10px;">服务</span>
-              <span class="more">MORE</span>
-            </div>
-            <div class="superThreeInfo">
-              <ul v-for="(i, index) in serviceList" :key="index">
-                <li>
-                  <img :src="img" />
-                  <div>
-                    <p>{{ i.name }}</p>
-                    <p>服务类型：{{ i.product_type_name }}</p>
-                    <p>
-                    </p>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div>
-          <div class="superOne superTwo superFour">
-            <div class="superOneTop">
-              <span style="margin: 10px;">专家</span>
-              <span class="more">MORE</span>
-            </div>
-            <div class="superFourInfo">
-              <ul>
-                <li>资金</li>
-              </ul>
-            </div>
-          </div>
-          <div class="superOne superFive">
-            <div class="superOneTop">
-              <span style="margin: 10px;">产品</span>
-              <span class="more">MORE</span>
-            </div>
-            <div class="superFiveInfo">
-              <ul v-for="(i, index) in productList" :key="index">
-                <li>
-                  <img :src="img" />
-                  <div>
-                    <p>{{ i.name }}</p>
-                    <p>
-                      <span class="textOver">所属企业：{{ i.contact_user }}</span>
-                      <span>认证状态：{{ i.state == '1' ? '已认证' : '未认证' }}</span>
-                    </p>
-                    <p>
-                      <span>产品类别：{{ i.product_type_name }}</span>
-                      <span>上架时间：{{ i | getDate }}</span>
-                    </p>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div> -->
           <el-col :span="24" class="superOne">
             <el-image :src="superOne" style="margin:0 0 30px 0;"></el-image>
             <el-col :span="12" class="left">
@@ -206,66 +100,12 @@ export default {
       zhuanjia: require('@/assets/live/main3.png'),
       tecList: [], // 技术,0
       productList: [], //产品,1
-      serviceList: [
-        {
-          name: 'niasofsald',
-          introduction: 'askdalsfd',
-          image: [
-            {
-              url: require('@/assets/live/测试图片.jpg'),
-            },
-          ],
-        },
-        {
-          name: 'niasofsald',
-          introduction: 'askdalsfd',
-          image: [
-            {
-              url: require('@/assets/live/测试图片.jpg'),
-            },
-          ],
-        },
-        {
-          name: 'niasofsald',
-          introduction: 'askdalsfd',
-          image: [
-            {
-              url: require('@/assets/live/测试图片.jpg'),
-            },
-          ],
-        },
-      ], //服务,2
-      expertsList: [
-        {
-          imgpath: require('@/assets/live/测试图片.jpg'),
-          name: '测试人',
-          field: '从事领域',
-          job_profile: '从事领域从事领域从事领域从事领域从事领域从事领域从事领域从事领域',
-        },
-        {
-          imgpath: require('@/assets/live/测试图片.jpg'),
-          name: '测试人',
-          field: '从事领域',
-          job_profile: '从事领域从事领域从事领域从事领域从事领域从事领域从事领域从事领域',
-        },
-        {
-          imgpath: require('@/assets/live/测试图片.jpg'),
-          name: '测试人',
-          field: '从事领域',
-          job_profile: '从事领域从事领域从事领域从事领域从事领域从事领域从事领域从事领域',
-        },
-        {
-          imgpath: require('@/assets/live/测试图片.jpg'),
-          name: '测试人',
-          field: '从事领域',
-          job_profile: '从事领域从事领域从事领域从事领域从事领域从事领域从事领域从事领域',
-        },
-      ],
+      serviceList: [], //服务,2
+      expertsList: [], //专家
     };
   },
   created() {
     this.search();
-    // this.searchExperts();
   },
   methods: {
     ...product(['query']),
@@ -278,7 +118,7 @@ export default {
       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 });
-      console.log(res);
+      if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
     },
   },
   filters: {

src/views/live/technical/index.vue

@@ -41,6 +41,38 @@
               </li>
             </ul>
           </div>
+          <div class="technical_right" style="float:left;">
+            <div class="technical_right_title">
+              <span style="margin: 10px;">技术指导</span>
+              <span class="more">MORE</span>
+            </div>
+            <ul class="guide" style="list-style-type:square">
+              <li>
+                <span>专家成功对企业进行技术指导</span>
+                <span>2020-05-02</span>
+              </li>
+              <li>
+                <span>十四条数据</span>
+                <span>2020-05-02</span>
+              </li>
+            </ul>
+          </div>
+          <div class="technical_right">
+            <div class="technical_right_title">
+              <span style="margin: 10px;">技术指导</span>
+              <span class="more">MORE</span>
+            </div>
+            <ul class="guide" style="list-style-type:square">
+              <li>
+                <span>专家成功对企业进行技术指导</span>
+                <span>2020-05-02</span>
+              </li>
+              <li>
+                <span>十四条数据</span>
+                <span>2020-05-02</span>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>