'feat：搜索、订单页面分页调整'

src/db.json

@@ -45,7 +45,7 @@
     },
     "redis": {
     	"main":{
-			"address": "other=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.206:1712,recovery=192.168.3.206:1712,merge=192.168.3.206:1712,newother=192.168.3.206:1712"
+			"address": "other=192.168.3.11:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.11:1713,recovery=192.168.3.206:1712,merge=192.168.3.206:1712,newother=192.168.3.206:1712"
 		},
 		"login": {
 			"address": "login=192.168.3.206:1712"

src/web/staticres/css/ele-reset.css

@@ -102,6 +102,8 @@
   display: none;
 }
 .pagination-custom-select .el-select-dropdown__item{
+  width: 100%;
+  text-align: center;
   color: #1d1d1d;
   border-bottom: 1px solid #ECECEC;
 }

src/web/staticres/frontRouter/pc/collection/css/index-pc.css

@@ -192,9 +192,13 @@
 }
 
 /* table */
+.collect-table-list{
+  position: relative;
+}
 .collect-table-list table {
     width: 1199px;
     border-collapse:collapse;
+    margin-bottom: 70px;
 }
 .collect-table-list .thead tr {
     font-size: 14px;
@@ -326,3 +330,26 @@
     font-weight: 700;
     color: #996118;
 }
+.shade-table{
+  position: absolute;
+  width: 100%;
+  height: 120px;
+  left: 0;
+  bottom: -40px;
+  padding-top: 80px;
+  background: linear-gradient(to bottom, rgba(255,255,255,0),rgba(255,255,255,0.8),rgba(255,255,255,1));
+  text-align: center;
+  
+}
+.shade-table > .look-more-btn{
+  display: inline-block;
+  width: 120px;
+  height: 35px;
+  color: #2CB7CA;
+  border-radius: 5px;
+  text-align: center;
+  line-height: 35px;
+  border: 1px solid #2cb7ca;
+  background: #fff;
+  cursor: pointer;
+}

src/web/staticres/frontRouter/pc/collection/js/index-pc.js

@@ -69,7 +69,9 @@ var vm = new Vue({
                 content: ''
             },
             powerDialogShow: false,
-            urlFilterTagId: []
+            urlFilterTagId: [],
+            tableShowData: [],
+            tableFirst20: []
         }
     },
     computed: {
@@ -174,7 +176,7 @@ var vm = new Vue({
                     if (res.error_code === 0 && res.data) {
                         var list = res.data.res
                         if (res.data.count) {
-                            this.listState.total = res.data.count
+                            _this.listState.total = res.data.count
                         }
                         // 给list添加额外属性
                         if (list) {
@@ -202,6 +204,10 @@ var vm = new Vue({
                                 } catch (error) {}
                             })
                             this.listState.list = list || []
+                            if (_this.listState.pageNum === 1 && _this.listState.pageSize >= 50) {
+                              _this.tableShowData = list || []
+                              _this.tableFirst20 = list.slice(0, 20)
+                            }
                         }
                     } else {
                         this.listState.total = 0
@@ -273,6 +279,7 @@ var vm = new Vue({
                 loaded: false,
                 loading: false,
                 pageNum: 1, // 当前页
+                pageSize: 50,
                 total: 0, // 一共多少条数据
                 list: []
             }
@@ -621,7 +628,9 @@ var vm = new Vue({
                 listState: this.listState,
                 currentSelectItems: this.currentSelectItems,
                 currentPageAllChecked: this.currentPageAllChecked,
-                selectDataIds: selectDataIds
+                selectDataIds: selectDataIds,
+                tableShowData: this.tableShowData,
+                tableFirst20: this.tableFirst20
             }
             this.listState.loaded = true
             sessionStorage.setItem(this.sessKey, JSON.stringify(data))
@@ -637,6 +646,8 @@ var vm = new Vue({
                 Object.assign(this.filterState, $data.filterState || {})
                 Object.assign(this.listState, $data.listState || {})
                 Object.assign(this.currentSelectItems, $data.currentSelectItems || {})
+                Object.assign(this.tableShowData, $data.tableShowData || [])
+                Object.assign(this.tableFirst20, $data.tableFirst20 || [])
                 selectDataIds = $data.selectDataIds
                 this.listState.loading = false
                 // 恢复页面状态

src/web/staticres/frontRouter/pc/my_data_packet/js/index-pc.js

@@ -153,6 +153,16 @@ var vm = new Vue({
         this.exportList.list = []
         this.exported()
       },
+      onSizeChange1: function (val) {
+        this.chargeList.pageSize = val
+        this.chargeList.pageNum = 0
+        this.chargeDetail()
+      },
+      onSizeChange2: function (val) {
+        this.exportList.pageSize = val
+        this.exportList.pageNum = 0
+        this.exported()
+      },
       changeNum(data) {// 数字处理
         if (data) {
           return data.toLocaleString()

src/web/staticres/js/ent-search-index-pc.js

@@ -183,7 +183,8 @@ var vm = new Vue({
                 pageNum: 1, // 当前页, 从0开始
                 pageSize: 10, // 每页多少条数据
                 total: 0, // 一共多少条数据
-                list: [] // 查询请求返回的数据
+                list: [], // 查询请求返回的数据
+                pageTotal: 1 // 一共多少页（计算出来）
             },
             preSearch: {
                 hover: false,
@@ -728,8 +729,10 @@ var vm = new Vue({
                 if (res.data.total) {
                     if (this.power) {
                         this.listState.total = res.data.total
+                        this.listState.pageTotal = Math.ceil(res.data.total / this.listState.pageSize)
                     } else {
                         this.listState.total = 4
+                        this.listState.pageTotal = 1
                     }
                 }
 
@@ -770,6 +773,10 @@ var vm = new Vue({
             }
         },
         onPageChange: function (p) {
+          console.log(p, this.listState.total, this.listState.pageTotal);
+            if (p > this.listState.pageTotal) {
+              return this.toastFn('超出页码', 3000)
+            }
             this.listState.pageNum = p
             this.getList()
         },
@@ -900,6 +907,18 @@ var vm = new Vue({
           this.listState.pageSize = val
           this.listState.pageNum = 1
           this.onPageChange(this.listState.pageNum)
+        },
+        toastFn: function (text, duration) {
+          if (!duration) {
+            duration = 2000
+          }
+          var _html = ""
+          _html+='<div class="custom-toast"><div class="mask" style="background-color: transparent;"></div><div class="toast-container">'
+          _html+='<span>' + text + '</span></div></div>'
+          $('body').append(_html)
+          setTimeout(function(){
+            $(".custom-toast").fadeOut().remove();
+          },duration)
         }
     }
 })

src/web/staticres/js/pur-search-index-pc.js

@@ -451,7 +451,7 @@ var vm = new Vue({
             }
             this.listState.loading = true
             this.listState.loaded = false
-            const _this = this
+            var _this = this
             let arrs = [], arr1 = []
             $.ajax({
                 url: '/entnicheNew/customer/corList',
@@ -476,6 +476,7 @@ var vm = new Vue({
                         }
                         this.listState.total = res.data.list.length
                         this.listState.loading = false
+                        console.log(this.listState.total, '111');
                     } else {
                         if (res.error_msg) {
                             toastFn(res.error_msg, 2000)

src/web/staticres/js/superSearch.js

@@ -222,7 +222,7 @@ function prev(){
 
 //取redis里的数据
 function getNewBids(pnum){
-	$.post("/jylab/supsearch/getNewBids",{pageNumber:pnum,pageType:"", fileExists: $("#zbSeatchT [name='fileExists']").val(),bid_field: $("#zbSeatchT [name='bid_field']").val()},function(r){
+	$.post("/jylab/supsearch/getNewBids",{pageNumber:pnum,pageSize: pageSize, pageType:"", fileExists: $("#zbSeatchT [name='fileExists']").val(),bid_field: $("#zbSeatchT [name='bid_field']").val()},function(r){
 		if(r&&r.list!=null&&r.list.length>0){
 			$(".tabContainer").show();
 			//$(".pagination").show();
@@ -233,7 +233,7 @@ function getNewBids(pnum){
 			}else{
 				$(".nbnext").removeClass("disabled");
       }
-      searchInnerVue.listState.total = Math.ceil(r.count/50)
+      searchInnerVue.listState.total = Math.ceil(r.count/pageSize)
       searchInnerVue.checkPageNumAdd1()
 			appendDatas(r.list,false,true);
 		}else{
@@ -258,6 +258,7 @@ function getNewBiddings(){
 	}
 	var param = {
     pageNumber: currentPage,
+    pageSize: pageSize,
     reqType: "lastNews",
     searchvalue: $("#zbSeatchT [name='keywords']").val(),
     area: $("#zbSeatchT [name='area']").val(),
@@ -279,7 +280,7 @@ function getNewBiddings(){
 		if(r&&r.list!=null&&r.list.length>0){
       // 计算总页码
       if (currentPage == 1) {
-        searchInnerVue.listState.total = Math.ceil(r.count/50)
+        searchInnerVue.listState.total = Math.ceil(r.count/pageSize)
         searchInnerVue.checkPageNumAdd1()
       }
 			$(".tabContainer").show();
@@ -763,6 +764,7 @@ function getVIPData(clickpaging){
 	}
 	var param = {
 				pageNumber: 1,
+        pageSize: pageSize,
 				reqType: reqType,
 				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
@@ -1035,6 +1037,7 @@ function searchOnsubmit(clickpaging){
 	}
 	var param = {
     pageNumber: currentPage,
+    pageSize: pageSize,
     reqType: "bidSearch",
     searchvalue: $("#zbSeatchT [name='keywords']").val(),
     area: $("#zbSeatchT [name='area']").val(),

src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -210,7 +210,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for="(item, index) in listState.list" :class="{ visited: item.visited }" :key="item._id" @click="toListDetail(item)">
+                                <tr v-for="(item, index) in tableFirst20" :class="{ visited: item.visited }" :key="item._id" @click="toListDetail(item)">
                                     <td width="48">${ item.index }</td>
                                     <td width="315" class="tt-l" v-html="item.title"></td>
                                     <td width="84">${ calcArticleType(item.type) }</td>
@@ -224,15 +224,17 @@
                             </tbody>
                         </table>
                         <no-data style="display: none;" v-show="listState.list.length === 0 && listState.loaded" tip-text="暂未收藏标讯"></no-data>
+                        <div class="shade-table" v-show="tableShowData && tableShowData.length > 20">
+                          <span class="look-more-btn"  @click="dataExport">查看更多</span>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="el-pagination-container">
+            <div class="el-pagination-container" v-if="listState.listType === 'line' && listState.total > 0">
                 <el-pagination
                     background
                     layout="prev, pager, next, sizes, jumper"
                     popper-class="pagination-custom-select"
-                    :hide-on-single-page="true"
                     :current-page="listState.pageNum"
                     :page-size="listState.pageSize"
                     :total="listState.total"

src/web/templates/pc/dataPack/index.html

@@ -15,7 +15,7 @@
         <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 
-        <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
+        <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.12-rc/lib/theme-chalk/index.css" rel="stylesheet" />
         <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
         <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/css/j-icons.css?v={{Msg "seo" "version"}}' />
         <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/my_data_packet/css/index-pc.css?v={{Msg "seo" "version"}}'>
@@ -117,12 +117,17 @@
                                     </el-table-column>
                                 </el-table>
                                 <el-pagination
+                                    popper-class="pagination-custom-select"
                                     background
-                                    layout="prev, pager, next"
+                                    layout="prev, pager, next, sizes, jumper"
                                     :hide-on-single-page="true"
                                     @current-change="getPageData1"
                                     :page-size="chargeList.pageSize"
-                                    :total="chargeList.total">
+                                    :total="chargeList.total"
+                                    :page-sizes="[5, 10, 50, 100]"
+                                    :show-confirm-btn="true"
+                                    @size-change="onSizeChange1"
+                                  >
                                 </el-pagination>
                             </div>
                             <div class="no-data" v-else><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无充值记录</p></div></div>
@@ -184,12 +189,17 @@
                                     </el-table-column>
                                 </el-table>
                                 <el-pagination
+                                    popper-class="pagination-custom-select"
                                     background
-                                    layout="prev, pager, next"
+                                    layout="prev, pager, next, sizes, jumper"
                                     :hide-on-single-page="true"
                                     @current-change="getPageData2"
                                     :page-size="exportList.pageSize"
-                                    :total="exportList.total">
+                                    :total="exportList.total"
+                                    :page-sizes="[5, 10, 50, 100]"
+                                    :show-confirm-btn="true"
+                                    @size-change="onSizeChange2"
+                                  >
                                 </el-pagination>
                             </div>
                         </div>
@@ -214,7 +224,7 @@
         }
     </script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
-    <script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js></script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.12-rc/lib/index.js></script>
     <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/my_data_packet/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 

src/web/templates/pc/entsearchindex.html

@@ -409,12 +409,11 @@
                         <div data-list-ad class="_u4m8od8j3s"></div>
                         <no-data style="display: none;" v-show="listState.list.length === 0 && listState.loaded" tip-text="没有找到符合条件的企业"></no-data>
                     </div>
-                    <div class="el-pagination-container">
+                    <div class="el-pagination-container" v-if="listState.total > 0">
                     <el-pagination
                       popper-class="pagination-custom-select"
                       background
                       layout="prev, pager, next, sizes, jumper"
-                      :hide-on-single-page="true"
                       :current-page="listState.pageNum"
                       :page-size="listState.pageSize"
                       :total="listState.total"

src/web/templates/pc/myOrder.html

@@ -20,6 +20,8 @@
           rel="stylesheet">
     <script src="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.js?v={{Msg "seo" "version"}}"></script>
     <!--2.8.8-->
+    <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.12-rc/lib/theme-chalk/index.css" rel="stylesheet" />
+    <link href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}' rel="stylesheet">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/course/css/order_list.css?v={{Msg "seo" "version"}}">
     <title>我的订单</title>
     <meta content="增值服务" theme="light" name="enable-header"/>
@@ -241,7 +243,7 @@
 <body  data-page-name="toMyOrder" style="background-color: #fff !important;">
 {{include "/common/pchead.html"}}
 <div class="sub-page-title-container" style="display: none">我的订单</div>
-<section id="drder" class="w">
+<section id="drder" class="w" v-cloak>
     <!-- main  START -->
     <div class="order" id="order">
         <div class="w order_tab">
@@ -257,7 +259,7 @@
                 <span class="th_status">订单状态</span>
                 <span class="th_handle">订单操作</span>
             </div>
-            <div class="c_tbody_vue" id="page_tbody" v-cloak>
+            <div class="c_tbody_vue" id="page_tbody">
                 <div v-show="getList.length" v-for="item in getList">
 <!--                    <span style="margin-left: 118px;" v-if="!item.publishTime">@#item.publishTime#@</span>-->
 <!--                    <span v-else>@#item.publishTime#@</span>-->
@@ -499,17 +501,32 @@
         </div>
     </div>
     <!-- main END -->
-    <div class="pagination clearfix w">
+    <div class="pagination clearfix w" style="display: none;">
         <div class="pagination-box"  style="display: none">
             <button name="back" id="prev"><i><</i>上一页</button><button name="min">1</button><button name="prev">...</button><button name="next">...</button><button name="max">100</button><button name="cont" id="next">下一页<i>></i></button>
         </div>
     </div>
+    <div class="el-pagination-container" v-if="pageTotal > 0">
+      <el-pagination
+        background
+        layout="prev, pager, next, sizes, jumper"
+        popper-class="pagination-custom-select"
+        :page-size="pageSize"
+        :current-page.sync="pageNum"
+        :total="pageTotal"
+        :page-sizes="[5, 10, 50, 100]"
+        :show-confirm-btn="true"
+        @current-change="onPageChange"
+        @size-change="onSizeChange"
+      >
+      </el-pagination>
+    </div>
 </section>
-<script type="text/javascript"
-        src="{{Msg "seo" "cdn"}}/dataExport/js/pageination.ie.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/dataExport/js/pageination.ie.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.12-rc/lib/index.js"></script>
 <script>
   var myPageNavIsNormal = true
 
@@ -628,7 +645,7 @@
   }
 
   var orderListForVue = new Vue({
-      el: '#page_tbody',
+      el: '#drder',
       delimiters: ['@#', '#@'],
       data: function () {
         return {
@@ -740,7 +757,9 @@
           ind: 0,
           pageNum: 1,
           serverInitTime: null,
-          timerId: null
+          timerId: null,
+          pageSize: 10,
+          pageTotal: 0
         }
       },
       filters: {
@@ -1339,16 +1358,18 @@
               "type": _this.ind,
               "pageNum": _this.pageNum,
               "fromPage": "pc",
+              "page_size": _this.pageSize
             },
             dataType: 'json',
             success: function (data) {
               _this.setIntervalFn()
+              _this.pageTotal = data.count
               if (data.res && data.res.length > 0) {
                 data.res.forEach(function(order) {
                   _this.formatExpirationTime(order)
                 })
                 _this.$set(_this.$data, 'list', data.res)
-                $(".pagination-box").show()
+                // $(".pagination-box").show()
                 showPageCount(data, _this.pageNum)
                 if (data.count <= data.pageSize) {
                   $(".pagination-box").hide()
@@ -1456,7 +1477,25 @@
               clearInterval(this.timerId)
             }
           }
-        }
+        },
+        onPageChange: function(p) {
+          this.pageNum = p
+          var $Index = $(".order_tab span.tab_item.active").index();
+          this.changeAjaxParams({
+            tabIndex: $Index,
+            pageNum: this.pageNum,
+          })
+        },
+        onSizeChange: function(size) {
+          this.pageNum = 1
+          this.pageSize = size
+          var $Index = $(".order_tab span.tab_item.active").index();
+          this.changeAjaxParams({
+            tabIndex: $Index,
+            pageNum: this.pageNum,
+          })
+        },
+        onNoAuthChange: function () {}
       }
     })
 </script>

src/web/templates/pc/pursearchindex.html

@@ -272,12 +272,11 @@
                     </div>
                 </div>
                 <no-data style="display: none;" v-show="listState.list.length === 0 && listState.loaded" tip-text="没有找到符合条件的企业"></no-data>
-                <div class="el-pagination-container">
+                <div class="el-pagination-container" v-if="listState.total > 0">
                     <el-pagination
                         popper-class="pagination-custom-select"
                         background
                         layout="prev, pager, next, sizes, jumper"
-                        :hide-on-single-page="true"
                         :current-page="listState.pageNum"
                         :page-size="listState.pageSize"
                         :total="listState.total"
@@ -285,7 +284,6 @@
                         @size-change="onSizeChange"
                         :page-sizes="[5, 10, 50, 100]"
                         :show-confirm-btn="true"
-                        v-if="listState.list.length !==0"
                     ></el-pagination>
                 </div>
             </div>

src/web/templates/pc/supsearch.html

@@ -1190,22 +1190,19 @@ var IframeOnClick = {
         </div>
       </div>
       <!--分页-->
-      <div class="el-pagination-container" ref="pagination" v-show="showPage" style="width: 1200px;margin: 0 auto;">
+      <div class="el-pagination-container" ref="pagination" v-show="showPage && listState.total > 0" style="width: 1200px;margin: 0 auto;">
         <el-pagination
           background
-          layout="prev, pager, next, sizes, jumper, slot"
+          layout="prev, pager, next, sizes, jumper"
           popper-class="pagination-custom-select"
           :page-size="listState.size"
           :current-page.sync="listState.num"
           :page-count="listState.total"
-          :hide-on-single-page="true"
           :page-sizes="[5, 10, 50, 100]"
-          :no-auth="noAuth"
+          :show-confirm-btn="true"
           @current-change="onPageChange"
           @size-change="onSizeChange"
-          @no-auth-change="onNoAuthChange"
         >
-          <slot><span class="pagination-jump-btn">确定</span></slot>
         </el-pagination>
       </div>
 		</div>
@@ -2324,13 +2321,33 @@ if(sessionselect){
       },
       checkPageNumAdd1: function () {
         if (this.vipState) return
-        if (this.listState.total === 10) {
+        var limt5 = this.listState.total === 5 && pageSize === 100
+        var limt10 = this.listState.total === 10 && pageSize === 50
+        var limt50 = this.listState.total === 50 && pageSize === 10
+        var limt100 = this.listState.total === 100 && pageSize === 5
+        if (limt5  || limt10 || limt50 || limt100) {
           this.listState.total++
         }
       },
       onPageChange: function (p) {
+        console.log(totalPage, p, pageSize);
+        var pageLimit = 10
+        if (pageSize == 100) {
+          pageLimit = 5
+        } else if (pageSize == 50) {
+          pageLimit = 10
+        } else if (pageSize == 10) {
+          pageLimit = 50
+        } else if (pageSize == 5) {
+          pageLimit = 100
+        }
+        // if (p > 1) {
+        //   console.log(currentPage, this.listState.num);
+        //   this.listState.num = currentPage
+        //   return toastFn('超出页码', 3000)
+        // }
         // TODO 免费用户搜索结果查看大于11页时弹窗提示
-        if (!vipState && p > 10) {
+        if (!vipState && p > pageLimit) {
           openBigMemberDialog('招标搜索500条限制')
           this.listState.num = this.listState.prevPageNum
           return
@@ -2368,6 +2385,7 @@ if(sessionselect){
         this.changeIds()
       },
       onSizeChange: function(size) {
+        console.log(totalPage, size);
         this.listState.size = size
         pageSize = size
         this.listState.num = 1