github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-28 00:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-06-14 18:44:08 +08:00
parent b1700ca4e6
commit 26de1b1745
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Api/UsersController.php
View File

@ -256,17 +256,15 @@ class UsersController extends AbstractController
$user = User::auth(); $user = User::auth();
$data = Request::all(); $data = Request::all();
$user->checkSystem(1); $user->checkSystem(1);
//头像 // 头像
if (Arr::exists($data, 'userimg')) { if (Arr::exists($data, 'userimg')) {
$userimg = Request::input('userimg'); $userimg = Request::input('userimg');
if ($userimg) { $user->userimg = $userimg ? Base::unFillUrl(is_array($userimg) ? $userimg[0]['path'] : $userimg) : '';
$userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg; if (str_contains($user->userimg, 'avatar/')) {
$user->userimg = Base::unFillUrl($userimg); $user->userimg = '';
} else {
$user->userimg = Base::unFillUrl($user->getUserimgAttribute(null));
} }
} }
//昵称 // 昵称
if (Arr::exists($data, 'nickname')) { if (Arr::exists($data, 'nickname')) {
$nickname = trim(Request::input('nickname')); $nickname = trim(Request::input('nickname'));
if ($nickname && mb_strlen($nickname) < 2) { if ($nickname && mb_strlen($nickname) < 2) {
@ -277,7 +275,7 @@ class UsersController extends AbstractController
$user->nickname = $nickname; $user->nickname = $nickname;
} }
} }
//职位/职称 // 职位/职称
if (Arr::exists($data, 'profession')) { if (Arr::exists($data, 'profession')) {
$profession = trim(Request::input('profession')); $profession = trim(Request::input('profession'));
if ($profession && mb_strlen($profession) < 2) { if ($profession && mb_strlen($profession) < 2) {
@ -292,6 +290,10 @@ class UsersController extends AbstractController
$user->save(); $user->save();
User::token($user); User::token($user);
User::AZUpdate($user->userid); User::AZUpdate($user->userid);
//
if (empty($user->userimg)) {
$user->userimg = $user->getUserimgAttribute(null);
}
return Base::retSuccess('修改成功', $user); return Base::retSuccess('修改成功', $user);
} }

2
app/Models/User.php
View File

@ -99,7 +99,7 @@ class User extends AbstractModel
*/ */
public function getUserimgAttribute($value) public function getUserimgAttribute($value)
{ {
if ($value && !str_starts_with($value, 'images/avatar/default')) { if ($value && !str_contains($value, 'avatar/')) {
return Base::fillUrl($value); return Base::fillUrl($value);
} }
if ($this->defaultAvatarMode === 'auto') { if ($this->defaultAvatarMode === 'auto') {

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/hash
View File

@ -1 +1 @@
ca497db4b3656d5b df6057ccd5d6b00e

3
resources/assets/js/store/actions.js vendored
View File

@ -315,6 +315,9 @@ export default {
state.userIsAdmin = $A.inArray('admin', userInfo.identity); state.userIsAdmin = $A.inArray('admin', userInfo.identity);
$A.setStorage("userInfo", state.userInfo); $A.setStorage("userInfo", state.userInfo);
dispatch("getBasicData", null); dispatch("getBasicData", null);
if (state.userId > 0) {
dispatch("saveUserBasic", state.userInfo);
}
resolve() resolve()
}); });
}, },