Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -842,7 +842,7 @@ class UserRepository extends BaseRepository
         }
         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])
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
         ])->setTitle('修改用户推荐人');
     }
 
@@ -855,17 +855,23 @@ class UserRepository extends BaseRepository
      */
     public function 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')->findOrEmpty();
+        } else {
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+        }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")->props(['nickname' => null])
+            Elm::input('spread_account_old', '原推荐人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
         ])->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('修改用户身份');
+            Elm::input('group_id', '新的用户身份')->required()->placeholder("请填写新的用户身份")
+        ],[Elm::input('mark', '备注')->placeholder("请填写备注信息")])->setTitle('修改用户身份');
     }
 
     /**
@@ -3104,6 +3110,15 @@ class UserRepository extends BaseRepository
 
     }
 
+    public function update_user_group($id,$group_id)
+    {
+        try {
+            return Db::name("user")->where("uid", $id)->update(['user_group' => $group_id]);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
 
     /*获取协议列表*/
     public function getXieYi(){

app/controller/admin/user/User.php

@@ -832,17 +832,7 @@ class User extends BaseController
     {
         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')->findOrEmpty();
-        } else {
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
-        }
-        $formData['value'] = $level_message['account'];
-        $formData['rule'][0]['props']['nickname'] = $level_message['nickname'];
         return app('json')->success($formData);
     }
 
@@ -874,13 +864,21 @@ class User extends BaseController
     {
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-
         $formData = formToData($this->repository->changeProFormusergroup($id));
-
-        $userGroup = Db::name('user')->where('uid', $id)->value('user_group');
-
         return app('json')->success(array_merge($formData));
     }
+    public function changeProusergroup($id,UserRepository $repository)
+    {
+        $group_id = $this->request->param('group_id');
+        if (!$id) {
+            return app('json')->fail("参数丢失");
+        }
+        if ($repository->update_user_group($id, $group_id)) {
+            return app('json')->success("修改成功");
+        } else {
+            return app('json')->fail("失败");
+        }
+    }
 
     /**
      * 修改用户奖励表单