Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -844,7 +844,14 @@ class UserRepository extends BaseRepository
      */
     public function changeProForm($id)
     {
+        $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
+        if ($spreadId) {
+            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->findOrEmpty();
+        } else {
+            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
+        }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
+            Elm::input('spread_account_old', '原推荐人')->value($spread_message['account'].'('.$spread_message['nickname'].')')->disabled(true),
             Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")->props(['nickname' => null])
         ])->setTitle('修改用户推荐人');
     }
@@ -858,6 +865,7 @@ class UserRepository extends BaseRepository
      */
     public function changeProFormLevel($id)
     {
+
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
             Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")->props(['nickname' => null])
         ])->setTitle('修改用户节点人（上级）');

app/controller/admin/user/User.php

@@ -801,16 +801,7 @@ class User extends BaseController
     {
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-        $formData = formToData($this->repository->changeProFormLevel($id));
-
-        $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
-        if ($spreadId) {
-            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->findOrEmpty();
-        } else {
-            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
-        }
-        $formData['value'] = $spread_message['account'];
-        $formData['rule'][0]['props']['nickname'] = $spread_message['nickname'];
+        $formData = formToData($this->repository->changeProForm($id));
         return app('json')->success($formData);
     }