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

src/views/halltwo/detail.vue

@@ -24,12 +24,6 @@
               <p>{{ dockInfo.title }}</p>
               <el-image :src="two1" style="width:100%"></el-image>
               <el-image :src="url6" class="img1"></el-image>
-              <!-- <el-col :span="6" class="right">
-                <el-image :src="two2"></el-image>
-                <p>{{ dockInfo.start_time }}</p>
-                <p>距离展会结束还有</p>
-                <p>倒计时</p>
-              </el-col> -->
             </el-col>
             <el-col :span="24" class="twocen">
               <el-col :span="15" class="left"> <span>主办单位：</span>{{ dockInfo.sponsor }} </el-col>
@@ -86,6 +80,16 @@
                         <el-table-column prop="type" label="技术类型"> </el-table-column>
                         <el-table-column prop="mode" label="交易方式"> </el-table-column>
                       </el-table>
+                      <el-col class="page1" :span="24">
+                        <el-pagination
+                          @current-change="handleCurrentChange2"
+                          :current-page="currentPage2"
+                          layout="total, prev, pager, next, jumper"
+                          :total="total2"
+                          :page-size="pageSize2"
+                        >
+                        </el-pagination>
+                      </el-col>
                     </el-tab-pane>
                     <el-tab-pane label="参展需求" name="second">
                       <el-table :data="tableData1" stripe style="width: 100%">
@@ -94,6 +98,16 @@
                         <el-table-column prop="money" label="投入预算"> </el-table-column>
                         <el-table-column prop="site" label="所在地"> </el-table-column>
                       </el-table>
+                      <el-col class="page1" :span="24">
+                        <el-pagination
+                          @current-change="handleCurrentChange1"
+                          :current-page="currentPage1"
+                          layout="total, prev, pager, next, jumper"
+                          :total="total1"
+                          :page-size="pageSize1"
+                        >
+                        </el-pagination>
+                      </el-col>
                     </el-tab-pane>
                     <el-tab-pane label="技术专家" name="third">
                       <el-col :span="24" class="zj">
@@ -108,18 +122,18 @@
                           </el-col>
                         </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>
+                      </el-col>
                     </el-tab-pane>
                   </el-tabs>
-                  <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>
-                  </el-col>
                 </el-col>
               </el-col>
             </el-col>
@@ -218,8 +232,11 @@ export default {
       activeName: 'first',
       //参展项目列表
       tableData: [
+        { classifi: '11111111111111111111111', name: '1111111111111111111111111111111', type: '11', mode: '11' },
+        { classifi: '11', name: '1', type: '11', mode: '11' },
         { classifi: '11111111111111111111111', name: '1', type: '11', mode: '11' },
         { classifi: '11', name: '1', type: '11', mode: '11' },
+        { classifi: '11111111111111111111111', name: '1', type: '11', mode: '11' },
       ],
       //参展需求
       tableData1: [
@@ -244,10 +261,15 @@ export default {
         { text: '长春博士联合会' },
       ],
       pageSize: 4,
-      origin: [],
       total: 0,
       currentPage: 1,
       input3: '',
+      pageSize1: 10,
+      total1: 0,
+      currentPage1: 1,
+      pageSize2: 10,
+      total2: 0,
+      currentPage2: 1,
     };
   },
   created() {
@@ -279,6 +301,13 @@ export default {
     handleCurrentChange(skip) {
       this.searchInfo({ skip });
     },
+    handleCurrentChange1(skip) {
+      // this.searchInfo({ skip });
+      console.log(skip);
+    },
+    handleCurrentChange2(skip) {
+      console.log(skip);
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -532,6 +561,8 @@ export default {
                   text-align: center;
                   line-height: 26px;
                   margin: 15px 0px 25px 0px;
+                  background: #409eff;
+                  border-radius: 5px;
                 }
                 p:nth-child(3) {
                   font-size: 14px;
@@ -642,4 +673,13 @@ export default {
 /deep/ .inpu1 {
   width: 234px;
 }
+/deep/.el-table .cell {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+}
+/deep/.el-table th.is-leaf {
+  background-color: #e6e6e6;
+}
 </style>