Merge branch 'dev' into dev-sxb

app/controller/admin/user/User.php

@@ -813,8 +813,15 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        if (!$spread_account || !$id){
-            return app('json')->fail('参数丢失');
+        $spread_uid = Db::name("user")->where('uid', $id)->value("spread_uid");
+        if ($spread_uid) {
+            $spread_message = Db::name("user")->where('uid', $spread_uid)->field("uid,account,nickname")->find();
+        } else {
+            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
+        }
+
+        if (!$spread_account || !$id) {
+            return app('json')->success("获取成功", ['spread' => $spread_message]);
         }
         if($repository->update_spread($id,$spread_account)){
             return app('json')->success("修改成功");
@@ -832,11 +839,28 @@ class User extends BaseController
      */
     public function changeProLevelForm($id)
     {
-        if (!$this->repository->exists($id))
+        if (!$this->repository->exists($id)) {
             return app('json')->fail('数据不存在');
-        return app('json')->success(formToData($this->repository->changeProFormLevel($id)));
+        }
+
+        $groupId = Db::name('user')->where('uid', $id)->value('group_id');
+        if ($groupId) {
+            $level_message = Db::name('user')->where('uid', $groupId)->field('uid,account,nickname')->find();
+        } else {
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+        }
+
+        $formData = formToData($this->repository->changeProFormLevel($id));
+
+        return app('json')->success([
+            'formData' => $formData,
+            'level'    => $level_message
+        ]);
     }
 
+
+
+
     /*
      * 更改用户节点人信息
      * cabbage
@@ -845,8 +869,8 @@ class User extends BaseController
     public function changeProLevel($id,UserRepository $repository)
     {
         $level_account = $this->request->param('level_account');
-        if (!$level_account || !$id){
-            return app('json')->fail('参数丢失');
+        if (!$id) {
+            return app('json')->fail("参数丢失");
         }
         if($repository->update_level_uid($id,$level_account)){
             return app('json')->success("修改成功");