Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -845,7 +845,7 @@ class UserRepository extends BaseRepository
     public function changeProForm($id)
     {
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
-            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")->props(['nickname' => null])
         ])->setTitle('修改用户推荐人');
     }
 
@@ -867,7 +867,7 @@ class UserRepository extends BaseRepository
     {
         return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
             Elm::input('user_group', '用户身份')->required()->placeholder("请填写用户身份")
-        ],[Elm::textarea('remark', '备注')->placeholder("可填写备注信息")])->setTitle('修改用户身份');
+        ],[Elm::textarea('remark', '备注')->placeholder("填写备注信息")])->setTitle('修改用户身份');
     }
 
     /**

app/controller/admin/user/User.php

@@ -805,7 +805,7 @@ class User extends BaseController
 
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
         if ($spreadId) {
-            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
+            $spread_message = (array) Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
         } else {
             $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
         }
@@ -846,11 +846,12 @@ class User extends BaseController
 
         $levelId = Db::name('user')->where('uid', $id)->value('level_id');
         if ($levelId) {
-            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->find();
+            $level_message = (array) Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->find();
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
-        $formData['value'] = $level_message['account'] . ' / ' . $level_message['nickname'] . ' / ' . $level_message['uid'];
+        $formData['value'] = $level_message['account'];
+        $formData['rule'][0]['props']['nickname'] = $level_message['nickname'];
         return app('json')->success($formData);
     }