礼物墙

application/api/controller/Usercenter.php

@@ -285,11 +285,17 @@ class Usercenter extends Api
         }
 
         if(empty($gift_user_typing) && !empty($gift_user_dongtai)){
-            return $gift_user_dongtai;
+            foreach($gift_user_dongtai as $key => $val){
+                $result[] = $val;
+            }
+            return $result;
         }
 
         if(!empty($gift_user_typing) && empty($gift_user_dongtai)){
-            return $gift_user_typing;
+            foreach($gift_user_typing as $key => $val){
+                $result[] = $val;
+            }
+            return $result;
         }
 
         //合并

application/common/library/Auth.php

@@ -864,11 +864,17 @@ class Auth
         }
 
         if(empty($gift_user_typing) && !empty($gift_user_dongtai)){
-            return $gift_user_dongtai;
+            foreach($gift_user_dongtai as $key => $val){
+                $result[] = $val;
+            }
+            return $result;
         }
 
         if(!empty($gift_user_typing) && empty($gift_user_dongtai)){
-            return $gift_user_typing;
+            foreach($gift_user_typing as $key => $val){
+                $result[] = $val;
+            }
+            return $result;
         }
 
         //合并