Merge branch 'develop' into test

@@ -51,7 +51,19 @@ class UserModel
      */
      */
     public static function getInfoNumData($uid, $udid)
     public static function getInfoNumData($uid, $udid)
     {
     {
-        $result = array();
+        $result = array(
+	        'wait_pay_num' => 0,
+	        'wait_cargo_num' => 0,
+	        'send_cargo_num' => 0,
+	        'brand_favorite_total' => 0,
+	        'product_favorite_total' => 0,
+	        'inbox_total' => 0,
+	        'comment_total' => 0,
+	        'refund_exchange_num' => 0,
+	        'yoho_coin_num' => 0,
+	        'coupon_num' => 0,
+	        'product_browse' => 0
+        );
 
 
         // 调用接口获取个人中心页面优惠券，收藏的商品等的数目数据
         // 调用接口获取个人中心页面优惠券，收藏的商品等的数目数据
         $infoNumData = UserData::infoNum($uid, $udid);
         $infoNumData = UserData::infoNum($uid, $udid);