mirror of
https://github.com/kuaifan/dootask.git
synced 2026-03-10 01:48:11 +00:00
no message
This commit is contained in:
parent
b1700ca4e6
commit
26de1b1745
@ -256,17 +256,15 @@ class UsersController extends AbstractController
|
||||
$user = User::auth();
|
||||
$data = Request::all();
|
||||
$user->checkSystem(1);
|
||||
//头像
|
||||
// 头像
|
||||
if (Arr::exists($data, 'userimg')) {
|
||||
$userimg = Request::input('userimg');
|
||||
if ($userimg) {
|
||||
$userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg;
|
||||
$user->userimg = Base::unFillUrl($userimg);
|
||||
} else {
|
||||
$user->userimg = Base::unFillUrl($user->getUserimgAttribute(null));
|
||||
$user->userimg = $userimg ? Base::unFillUrl(is_array($userimg) ? $userimg[0]['path'] : $userimg) : '';
|
||||
if (str_contains($user->userimg, 'avatar/')) {
|
||||
$user->userimg = '';
|
||||
}
|
||||
}
|
||||
//昵称
|
||||
// 昵称
|
||||
if (Arr::exists($data, 'nickname')) {
|
||||
$nickname = trim(Request::input('nickname'));
|
||||
if ($nickname && mb_strlen($nickname) < 2) {
|
||||
@ -277,7 +275,7 @@ class UsersController extends AbstractController
|
||||
$user->nickname = $nickname;
|
||||
}
|
||||
}
|
||||
//职位/职称
|
||||
// 职位/职称
|
||||
if (Arr::exists($data, 'profession')) {
|
||||
$profession = trim(Request::input('profession'));
|
||||
if ($profession && mb_strlen($profession) < 2) {
|
||||
@ -292,6 +290,10 @@ class UsersController extends AbstractController
|
||||
$user->save();
|
||||
User::token($user);
|
||||
User::AZUpdate($user->userid);
|
||||
//
|
||||
if (empty($user->userimg)) {
|
||||
$user->userimg = $user->getUserimgAttribute(null);
|
||||
}
|
||||
return Base::retSuccess('修改成功', $user);
|
||||
}
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@ class User extends AbstractModel
|
||||
*/
|
||||
public function getUserimgAttribute($value)
|
||||
{
|
||||
if ($value && !str_starts_with($value, 'images/avatar/default')) {
|
||||
if ($value && !str_contains($value, 'avatar/')) {
|
||||
return Base::fillUrl($value);
|
||||
}
|
||||
if ($this->defaultAvatarMode === 'auto') {
|
||||
|
||||
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
ca497db4b3656d5b
|
||||
df6057ccd5d6b00e
|
||||
|
||||
3
resources/assets/js/store/actions.js
vendored
3
resources/assets/js/store/actions.js
vendored
@ -315,6 +315,9 @@ export default {
|
||||
state.userIsAdmin = $A.inArray('admin', userInfo.identity);
|
||||
$A.setStorage("userInfo", state.userInfo);
|
||||
dispatch("getBasicData", null);
|
||||
if (state.userId > 0) {
|
||||
dispatch("saveUserBasic", state.userInfo);
|
||||
}
|
||||
resolve()
|
||||
});
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user