Merge branch 'master' of http://git.scdxtc.com/wangxinglong/caipan_shop_admin

app/controller/api/User.php

@@ -104,6 +104,10 @@ class User extends Base
 
             $now = date('Y-m-d H:i:s');
             if (!$account) {
+
+                if(empty($params['nickname'])||empty($params['headimgurl'] )){
+                    return $this->json(4002, '登录失败');
+                }
                 // 自动注册
                 $inviterAid       = 0;
                 $inviterParentAid = 0;