Просмотр исходного кода

后台-修改推荐人节点人-(beta)新增展示用户原推荐人和节点人

xupuyuan месяцев назад: 11
Родитель
Сommit
f169b1f455
2 измененных файлов с 6 добавлено и 5 удалено
  1. 2 2
      app/common/repositories/user/UserRepository.php
  2. 4 3
      app/controller/admin/user/User.php

+ 2 - 2
app/common/repositories/user/UserRepository.php

@@ -835,7 +835,7 @@ class UserRepository extends BaseRepository
835
     public function changeProForm($id)
835
     public function changeProForm($id)
836
     {
836
     {
837
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
837
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
838
-            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
838
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")->props(['nickname' => null])
839
         ])->setTitle('修改用户推荐人');
839
         ])->setTitle('修改用户推荐人');
840
     }
840
     }
841
 
841
 
@@ -857,7 +857,7 @@ class UserRepository extends BaseRepository
857
     {
857
     {
858
         return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
858
         return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
859
             Elm::input('user_group', '用户身份')->required()->placeholder("请填写用户身份")
859
             Elm::input('user_group', '用户身份')->required()->placeholder("请填写用户身份")
860
-        ],[Elm::textarea('remark', '备注')->placeholder("填写备注信息")])->setTitle('修改用户身份');
860
+        ],[Elm::textarea('remark', '备注')->placeholder("填写备注信息")])->setTitle('修改用户身份');
861
     }
861
     }
862
 
862
 
863
     /**
863
     /**

+ 4 - 3
app/controller/admin/user/User.php

@@ -805,7 +805,7 @@ class User extends BaseController
805
 
805
 
806
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
806
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
807
         if ($spreadId) {
807
         if ($spreadId) {
808
-            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
808
+            $spread_message = (array) Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
809
         } else {
809
         } else {
810
             $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
810
             $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
811
         }
811
         }
@@ -846,11 +846,12 @@ class User extends BaseController
846
 
846
 
847
         $levelId = Db::name('user')->where('uid', $id)->value('level_id');
847
         $levelId = Db::name('user')->where('uid', $id)->value('level_id');
848
         if ($levelId) {
848
         if ($levelId) {
849
-            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->find();
849
+            $level_message = (array) Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->find();
850
         } else {
850
         } else {
851
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
851
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
852
         }
852
         }
853
-        $formData['value'] = $level_message['account'] . ' / ' . $level_message['nickname'] . ' / ' . $level_message['uid'];
853
+        $formData['value'] = $level_message['account'];
854
+        $formData['rule'][0]['props']['nickname'] = $level_message['nickname'];
854
         return app('json')->success($formData);
855
         return app('json')->success($formData);
855
     }
856
     }
856
 
857