Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/ExportController.class.php

@@ -1699,7 +1699,7 @@ class ExportController extends Controller
         $size=$row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
         //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
-        $data = array_slice($data, ($arraypage-1)*$size, $size);
+//        $data = array_slice($data, ($arraypage-1)*$size, $size);
         $length = count($data);
         $data[$length] = array(
             'fgame_name'=>'汇总',
@@ -1778,7 +1778,7 @@ class ExportController extends Controller
         $size=$row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
         //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
-        $data = array_slice($data, ($arraypage-1)*$size, $size);
+//        $data = array_slice($data, ($arraypage-1)*$size, $size);
         $length = count($data);
         $data[$length] = array(
             'game_name'=>'汇总',

Application/Home/View/default/Promote/children.html

@@ -125,7 +125,7 @@
         </div>
         <div class="pagenation clearfix">
 <?php if ($loginer['level'] !== 4) :?>
-           <a id="sch-btn" href="{:U('download/children_data_export',array_merge(['promote_type'=>I('promote_type')],I('post.')))}" class="ajax-get" >导出</a>
+           <a id="sch-btn" href="{:U('download/children_data_export',array_merge(['promote_type'=>I('promote_type')],I('get.')))}" class="ajax-get" >导出</a>
            <?php endif ;?>
           {$pagination}
         </div>