edit

app/shop/database/sell_order.php

@@ -1040,6 +1040,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'all',
+            'page' => array(20, 'list'),
             'col' => '*',
         ),
     ),

service/agent/database/member_goods.php

@@ -627,6 +627,7 @@ return array
                 
             ),
             'type' => 'all',
+            'page' => array(20,'list'),
             // 'order' => array('cdate'=>'desc'),
             'col' => '*',
         ),

tool/stats/assets/pc/html/out.html

@@ -236,7 +236,8 @@ function search()
   order_num = $('#order_num').val();
   goods_name = $('#goods_name').val();
   shop_name = $('#shop_name').val();
-  location.href = config.host + 'lib/manage.list&start=' + s[0] + '&end=' + s[1] + '&fastart=' + a[0] + '&faend=' + a[1] + '&fstart=' + f[0] + '&fend=' + f[1] + '&cate=' + cate + '&order_num=' + order_num + '&shop_name=' + shop_name + '&goods_name=' + goods_name ;
+  var link = config.host + 'lib/manage.list&start=' + s[0] + '&end=' + s[1] + '&fastart=' + a[0] + '&faend=' + a[1] + '&fstart=' + f[0] + '&fend=' + f[1] + '&cate=' + cate + '&order_num=' + order_num + '&shop_name=' + shop_name + '&goods_name=' + goods_name + '&list_excel=1';
+  jump(link);
 }
 $('#search').click(function() {
   search();
@@ -271,7 +272,8 @@ function out()
   member_name = $("#member_name").val();
   card_num = $('#card_num').val();
   mobile = $('#mobile').val();
-  location.href = config.host + 'lib/manage.memberGoods&start=' + g[0] + '&end=' + g[1] + '&rstart=' + r[0] + '&rend=' + r[1] + '&cstart=' + c[0] + '&cend=' + c[1] + '&name=' + dh_name + '&card_num=' + card_num + '&mobile=' + mobile + '&member_name=' + member_name;
+  var link = config.host + 'lib/manage.memberGoods&start=' + g[0] + '&end=' + g[1] + '&rstart=' + r[0] + '&rend=' + r[1] + '&cstart=' + c[0] + '&cend=' + c[1] + '&name=' + dh_name + '&card_num=' + card_num + '&mobile=' + mobile + '&member_name=' + member_name+'&list_excel=1';
+  jump(link);
 }
 $('#out').click(function() {
   out();
@@ -293,7 +295,8 @@ function out_mingxi()
 	order_num = $('#order_nums').val();
 	mobile = $('#mobiles').val();
 	type = $('.type').val();
-	location.href = config.host + 'lib/manage.mingxi&start=' + d[0] + '&end=' + d[1] + '&name=' + dh_name + '&card_num=' + card_num + '&mobile=' + mobile + '&shop_name=' + shop_name + '&shop_num=' + shop_num + '&order_num=' + order_num + '&type=' + type;
+	var link = config.host + 'lib/manage.mingxi&start=' + d[0] + '&end=' + d[1] + '&name=' + dh_name + '&card_num=' + card_num + '&mobile=' + mobile + '&shop_name=' + shop_name + '&shop_num=' + shop_num + '&order_num=' + order_num + '&type=' + type + '&list_excel=1';
+  jump(link);
 }
 $('#out_mingxi').click(function() {
   out_mingxi();

tool/stats/lib/Manage.php

@@ -362,13 +362,14 @@ Class Manage
 			$where['rend'] = 't_2.cdate<='.strtotime($rend);
 		} 
 		$where['t_1.state'] = 't_1.state=1';
+		$where['t_1.type'] = "t_1.type in (1,2)";
 		$header = array('权益名称','会员等级','姓名','手机号','卡号','类型','数量','单件价值','总价值','已兑换价值','已使用价值','未兑换价值','未使用价值','备注','获取方式','获取时间','代理商注册时间','礼品卡有效期');
 		$body = array();
 		if ($where) {
 			$where = implode(' and ', $where);
-			$data = Dever::db('agent/member_goods')->fetchAll("select t_1.*,t_2.id as aid from churen_agent_member_goods as t_1 left join churen_agent_member as t_2 on t_1.mid = t_2.id where " . $where);
+			$data = Dever::db('agent/member_goods')->fetchAll("select t_1.*,t_2.id as aid from churen_agent_member_goods as t_1 left join churen_agent_member as t_2 on t_1.mid = t_2.id where " . $where,array(),array(20, 'list'));
 			// $data = Dever::db('agent/member_goods')->getJoinAll($where);
-			// echo Dever::sql();die;
+			// echo Dever::sql();
 			// print_R($data);die;
 			if ($data) {
 				foreach ($data as $k => $v) {