order page

mobile/control/member_cart.php

@@ -31,14 +31,14 @@ class member_cartControl extends mbMemberControl
 
         $page = trim($_GET['page']);
         $curpage = trim($_GET['curpage']);
-        initpage($page,$curpage);
+        initpage($page, $curpage);
 
         $model_cart = Model('cart');
         $model_goods = Model('goods');
 
 //        $condition = array('buyer_id' => trim($_GET['buyer_id']));
         $condition = array('buyer_id' => $this->member_info['member_id']);
-        $cart_list = $model_cart->getCartList($condition,$this->page);
+        $cart_list = $model_cart->getCartList($condition, $this->page);
         $page_count = $model_cart->gettotalpage();
         $model_cart->cls();
 //        $cart_list = $model_cart->listCart('db', $condition);
@@ -71,7 +71,7 @@ class member_cartControl extends mbMemberControl
             $cart_list[$key]['goods_sum'] = ncPriceFormat($value['goods_price'] * $value['goods_num']);
         }
 
-        joutput_data(array('cart_list' => $cart_list,'mobile_page' => mobile_page($page_count)));
+        joutput_data(array('cart_list' => $cart_list, 'mobile_page' => mobile_page($page_count)));
     }
 
     /**

mobile/control/member_order.php

@@ -36,6 +36,11 @@ class member_orderControl extends mbMemberControl
         $model_order = Model('order');
         $condition = array();
         $condition['buyer_id'] = $this->member_info['member_id'];
+        $order_state = intval(trim($_GET['state']));
+        if ($order_state >= 10) {
+            $condition['order_state'] = $order_state;
+        }
+
         $order_list_array = $model_order->getNormalOrderList($condition, $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
         $order_group_list = array();
         $order_pay_sn_array = array();