Merge branch 'master' of http://132.232.91.252:9999/ice/eduline

apps/home/Lib/Action/HomeAction.class.php

@@ -199,16 +199,17 @@ class HomeAction extends UserAction
             $ordertype  = 'exams';
             $table      = 'exams_paper_order';
             $check_type = 'exams';
+        } else if ($_GET['ordertype'] == 'goods') {
+            $ordertype  = 'goods';
+            $table      = 'el_goods_order';
+            $check_type = 'goods_order';
         }
 
-//        else if ($_GET['ordertype'] == 'goods') {
-//            $ordertype  = 'goods';
-//            $table      = 'el_goods_order';
-//            $check_type = 'goods_order';
-//        }
-
         $data = M($table)->where($map)->order($order)->findPage($limit);
 
+        var_dump($data);
+        die;
+
         if ($data['data']) {
             $data['data'] = $this->haddleData($data['data'], $table);
             foreach ($data['data'] as $k => $v) {