合并分支 'heshupeng' 到 'master'

默认头像



查看合并请求 !387

@@ -577,7 +577,7 @@ class User extends Api
                         $user = $object_model->field($object_field)->where(['house_id'=>$v[$object_id],'user_id'=>$v[$object_user_id]])->find();
                         $user = $object_model->field($object_field)->where(['house_id'=>$v[$object_id],'user_id'=>$v[$object_user_id]])->find();
                     }
                     }
                 }
                 }
-                $user['avatar'] = cdnurl($user['avatar']);
+                $user['avatar'] = !empty($user['avatar']) ? cdnurl($user['avatar']) : request()->domain().'/assets/img/avatar.png';
                 $v['user'] = $user;
                 $v['user'] = $user;
             }
             }
             $return = [
             $return = [