Merge branch 'develop' of gitlab.icaremgt.com:tanxinyu/h5_activity into develop

showPhotos/js/page/index.js

@@ -152,6 +152,7 @@ function getAjaxListSearch(type,page,callback) {
         gb_player_loaded = true
         var descs = 'createTime'
         var searchVal = ''
+        var pageSize = $('#act41530417882468').text()
     }else if(type == 'rank') {
         if(gb_rank_loaded) {
             return
@@ -159,6 +160,7 @@ function getAjaxListSearch(type,page,callback) {
         gb_rank_loaded = true
         var descs = 'voteNum'
         var searchVal = ''
+        var pageSize = $('#act4153123735791').text()
     }else if(type == 'search') {
         if(gb_player_loaded) {
             return
@@ -179,7 +181,7 @@ function getAjaxListSearch(type,page,callback) {
         reviewStatus:1,  // 审核状态
         descs:descs,  // 降序排列
         curPage:page?page:1,
-        pageSize:10,
+        pageSize:pageSize,
         activityCode:activityCode,  // 活动id
         name: searchVal   // 搜索字段
     }