公海，转让，名片

app/controller/UserController.php

@@ -197,7 +197,7 @@ class UserController
         $user['avatar_url'] = $user['avatar'];
         $ossservice = new \app\service\OssService();
         $user['avatar'] = $user['avatar'] ? $ossservice->generatePrivateUrl($user['avatar']) : '';
-        return Util::success($user, trans('save_success'));
+        return Util::success($user, trans('success'));
     }
 
     /**
@@ -208,27 +208,18 @@ class UserController
      */
     public function save(Request $request)
     {
-        $name = Util::getParam($request, 'name');
-        $sex = Util::getParam($request, 'sex');
-        $position = Util::getParam($request, 'position');
-        $country_id = Util::getParam($request, 'country_id');
-        $sign = Util::getParam($request, 'sign');
         $id = $request->user['id'];
         $avatar = Util::getParam($request, 'avatar_url');
-        $mobile = Util::getParam($request, 'mobile');
 
-        $data = [
-            'name' => $name,
-            'sex' => $sex,
-            'position' => $position,
-            'country_id' => $country_id,
-            'sign' => $sign,
-            'avatar' => $avatar,
-            'mobile' => $mobile
-        ];
+        $user = User::where('id', $id)->first();
+        // 只填充前端传递的字段
+        $user->fill($request->only(['name', 'sex', 'position', 'country_id', 'sign', 'mobile', 'address']));
 
-        $res = User::where('id', $id)
-            ->update($data);
+        if(!Util::isEmpty($avatar)){
+            $user->avatar = $avatar;
+        }
+
+        $res = $user->save();
 
         if ($res) {
             return Util::success($res, trans('save_success'));