Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -859,10 +859,17 @@ class UserRepository extends BaseRepository
     public function changeProFormLevel($id)
     {
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")->props("原节点人信息")
         ])->setTitle('修改用户节点人（上级）');
     }
 
+    public function changeProFormusergroup($id)
+    {
+        return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
+            Elm::input('user_group', '用户身份')->required()->placeholder("请填写用户身份")
+        ],[Elm::textarea('remark', '备注')->placeholder("可填写备注信息")])->setTitle('修改用户身份');
+    }
+
     /**
      * @param $id
      * @return Form

app/controller/admin/user/User.php

@@ -807,9 +807,11 @@ class User extends BaseController
         if ($spreadId) {
             $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
         } else {
-            $spread_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
         }
-        return app('json')->success(array_merge($formData,['spread_message' => $spread_message]));
+        $formData['value'] = $spread_message['account'];
+        $formData['rule'][0]['props']['uid'] = $spread_message['nickname'];
+        return app('json')->success($formData);
     }
 
 
@@ -848,7 +850,8 @@ class User extends BaseController
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
-        return app('json')->success(array_merge($formData, ['level_message' => $level_message]));
+        $formData['value'] = $level_message['account'] . ' / ' . $level_message['nickname'] . ' / ' . $level_message['uid'];
+        return app('json')->success($formData);
     }
 
 
@@ -873,6 +876,25 @@ class User extends BaseController
     }
 
     /**
+     * 更改用户身份
+     */
+    public function changeProusergroupfrom($id)
+    {
+        if (!$this->repository->exists($id))
+            return app('json')->fail('数据不存在');
+
+        $formData = formToData($this->repository->changeProFormLevel($id));
+
+        $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();
+        } else {
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+        }
+        return app('json')->success(array_merge($formData, ['level_message' => $level_message]));
+    }
+
+    /**
      * 修改用户奖励表单
      * @param $id
      * @return mixed