edit

lib/Base.php

@@ -70,16 +70,6 @@ class Base
             $user['mobile'] = '';
         }
 
-        # 获取默认头像
-        $where = array();
-        if (isset($user['sex']) && $user['sex']) {
-            $where['sex'] = $user['sex'] . ',4';
-        }
-        $avatar = Dever::db('passport/avatar')->rand($where);
-        if ($avatar) {
-            $user['avatar_id'] = $avatar['id'];
-        }
-
         $uid = Dever::db('passport/user')->insert($user);
 
         $this->invite($uid);
@@ -107,9 +97,19 @@ class Base
         if (isset($data['sex'])) {
             $user['sex'] = $data['sex'];
         }
-        if (isset($data['avatar'])) {
+        if (isset($data['avatar']) && $data['avatar']) {
             //$update['avatar'] = $this->saveAvatar($pic);
             $user['avatar'] = $data['avatar'];
+        } else {
+            # 获取默认头像
+            $where = array();
+            if (isset($user['sex']) && $user['sex']) {
+                $where['sex'] = $user['sex'] . ',4';
+            }
+            $avatar = Dever::db('passport/avatar')->rand($where);
+            if ($avatar) {
+                $user['avatar_id'] = $avatar['id'];
+            }
         }
         if (isset($data['city'])) {
             $user['city'] = $data['city'];
@@ -124,6 +124,8 @@ class Base
             $user['set_area'] = $user['country'] .','. $user['province'] .','. $user['city'];
         }
 
+        
+
         return $user;
     }