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

src/components/pagination.vue

@@ -27,12 +27,12 @@ export default {
   props: {
     position: { type: String, default: 'right' },
     total: { type: Number, default: 0 },
+    limit: { type: Number, default: 10 },
   },
   components: {},
   data: () => {
     return {
       currentPage: 1,
-      limit: 10,
     };
   },
   created() {},

src/views/halltwo/expertxmcg.vue

@@ -46,12 +46,9 @@
             <el-col :span="24" class="threeinfo">
               <el-col :span="24" class="topInfo">
                 <el-col :span="12" class="topName">技术专家</el-col>
-                <el-col :span="12" class="topSite">
-                  <span>您当前的位置：</span><el-link href="/halltwo/directTwo" :underline="false" class="link">首页</el-link><span> > 技术专家</span>
-                </el-col>
               </el-col>
               <el-col :span="24" class="list">
-                <el-col :span="6" class="card" v-for="(item, index) in expertList2" :key="index">
+                <el-col :span="6" class="card" v-for="(item, index) in expertList" :key="index">
                   <el-link href="" :underline="false" class="linkCon">
                     <el-image :src="item.expertimage" style="width: 100%; height: 100%" v-if="item.expertimage"></el-image>
                     <el-image v-else>
@@ -61,20 +58,17 @@
                     </el-image>
                   </el-link>
                   <div class="text">
-                    <p>{{ item.name }}</p>
-                    <p>对接</p>
+                    <el-col :span="24" class="name">
+                      {{ item.name }}
+                    </el-col>
+                    <el-col :span="24" class="btn">
+                      <el-button type="primary" size="mini" @click="expertxmdjBtn(item)">对接</el-button>
+                    </el-col>
                   </div>
                 </el-col>
               </el-col>
               <el-col class="page1" :span="24">
-                <el-pagination
-                  @current-change="handleCurrentChange"
-                  :current-page="currentPage"
-                  layout="total, prev, pager, next, jumper"
-                  :total="total"
-                  :page-size="pageSize"
-                >
-                </el-pagination>
+                <page v-bind="$attrs" position="center" :limit="limit" :total="total" @query="searchInfo"></page>
               </el-col>
             </el-col>
           </div>
@@ -111,11 +105,11 @@
 </template>
 
 <script>
+import page from '@/components/pagination.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
@@ -124,6 +118,7 @@ export default {
   props: {},
   components: {
     liveFoot,
+    page,
   },
   data: function() {
     return {
@@ -137,10 +132,7 @@ export default {
       //专家列表
       expertList: [],
       total: 0,
-      pageSize: 20,
-      currentPage: 1,
-      origin: [],
-      expertList2: [],
+      limit: 20,
     };
   },
   async created() {
@@ -149,7 +141,7 @@ export default {
   methods: {
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
     ...expertsuser({ expertQuery: 'query', expertquery: 'expertquery' }),
-    async searchInfo() {
+    async searchInfo({ skip = 0, limit = 20, ...info } = {}) {
       // 查询展会详情
       if (this.dock_id) {
         let res = await this.dockFetch(this.dock_id);
@@ -157,18 +149,15 @@ export default {
           this.$set(this, `dockInfo`, res.data);
         }
       }
-      //查询专家列表{ skip, limit: 20 }
-      const res = await this.expertQuery();
+      //查询专家列表
+      const res = await this.expertQuery({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `expertList`, res.data);
         this.$set(this, `total`, res.total);
       }
     },
-    searchPage(page = 1) {
-      this.$set(this, `expertList2`, this.origin[page - 1]);
-    },
-    handleCurrentChange(currentPage) {
-      this.searchPage(currentPage);
+    expertxmdjBtn(data) {
+      this.$router.push({ path: '/halltwo/xmdj', query: { dock_id: this.dock_id, id: data._id, type: '3' } });
     },
   },
   computed: {
@@ -177,16 +166,7 @@ export default {
       return this.$route.query.dock_id;
     },
   },
-  watch: {
-    expertList: {
-      immediate: true,
-      deep: true,
-      handler(val) {
-        if (val && val.length > 0) this.$set(this, `origin`, _.chunk(val, this.pageSize));
-        this.searchPage();
-      },
-    },
-  },
+  watch: {},
 };
 </script>
 
@@ -312,33 +292,22 @@ export default {
     }
   }
   .three {
-    // height: 1145px;
-    overflow: hidden;
     position: relative;
     top: -50px;
     z-index: 999;
     .threeinfo {
-      // height: 1145px;
-      overflow: hidden;
       background-color: #fff;
       border: 1px solid red;
       padding: 30px;
       .topInfo {
+        margin: 0 0 40px 0;
         .topName {
           font-family: '微软雅黑';
           font-weight: 400;
           font-size: 26px;
         }
-        .topSite {
-          text-align: right;
-          font-size: 14px;
-          line-height: 35px;
-        }
       }
       .list {
-        margin-top: 40px;
-        height: 1035px;
-        overflow: hidden;
         .card {
           width: 23.5%;
           margin: 0 2% 30px 0;
@@ -350,27 +319,18 @@ export default {
             border-radius: 5px;
             display: inline-block;
             width: 130px;
-            // width: 140px;
           }
           .text {
             width: 100px;
             float: right;
             height: 100px;
-            p:nth-child(1) {
+            .name {
               font-size: 16px;
-              margin-top: 20px;
-            }
-            p:nth-child(2) {
-              margin: 20px 0 15px 0;
-              width: 60px;
-              line-height: 24px;
-              border: 1px solid #dddd;
-              text-align: center;
-              font-size: 14px;
+              font-weight: bold;
+              margin: 10px 0 10px 0;
             }
-            p:nth-child(2):hover {
-              color: #777;
-              cursor: pointer;
+            .btn {
+              margin: 0 0 10px 0;
             }
           }
         }
@@ -383,7 +343,6 @@ export default {
       }
       .page1 {
         text-align: center;
-        margin: 20px 0px 40px 0px;
       }
     }
   }