|
|
@@ -588,11 +588,9 @@ class Whlabelfz1 extends Start_Controller
|
|
|
$r3 = $this->_getData('fullordersmt', $where_arr, $order_str, 'id,shop,type,orderinfo,number,waybill,express,librarytime', ($page-1)*$perpage, $perpage,$warehouse_arr,$express_arr,$shop_arr,$shop_select_list);
|
|
|
$r4 = $this->_getData('fullorderamz', $where_arr, $order_str, 'id,shop,type,orderinfo,number,waybill,express,librarytime', ($page-1)*$perpage, $perpage,$warehouse_arr,$express_arr,$shop_arr,$shop_select_list);
|
|
|
|
|
|
- $info_list = $r1['info_list'] + $r2['info_list'] + $r3['info_list'] + $r4['info_list'];
|
|
|
+ $info_list = array_merge($r1['info_list'] , $r2['info_list'] , $r3['info_list'] , $r4['info_list']) ;
|
|
|
$total += $r1['total'] + $r2['total'] + $r3['total'] + $r4['total'];
|
|
|
- $pagenum = ceil($total / $perpage);
|
|
|
- $over = $total - ($start + $perpage);
|
|
|
- $pagenum = ceil($total / $perpage);
|
|
|
+ $pagenum = ceil($total / $perpage*4);
|
|
|
$over = $total - ($start + $perpage);
|
|
|
$rows = array('total' => $total, 'over' => $over, 'pagenum' => $pagenum, 'rows' => ($info_list));
|
|
|
echo json_encode($rows);
|
