Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/moonclub/controllers/ReserveController.php

@@ -90,7 +90,7 @@ class ReserveController extends MoonClubBaseController
             }
 			$reserve = new Reserve();
             $reserve->user = new MongoId($user_id);
-            $reserve->tech_content = '巾帼园';
+            $reserve->tech_content = '徐汇区天平路245号5楼';
 			$reserve->user_name = $name;//名字
 			$reserve->homeType = $homeType;//套餐类型
 			$reserve->mobile = $mobile;//手机号
@@ -125,7 +125,12 @@ class ReserveController extends MoonClubBaseController
                 $data[$key]['status'] = Reserve::$status_option[1];//待处理
             }
             $data[$key]['num'] = $reserve->num;
-            $data[$key]['homeType'] = $reserve->homeType;
+
+            if(emtpy($reserve->homeType)){
+                $data[$key]['homeType'] = '未选择套餐';
+            } else {
+                $data[$key]['homeType'] = $reserve->homeType;
+            }
         }
 
         $data = array_values($data);