From 8859c847f6142585157e22af6b6d30b53a3d8f40 Mon Sep 17 00:00:00 2001
From: jbrazz <2436953959@qq.com>
Date: Tue, 29 Oct 2019 18:36:34 +0800
Subject: [PATCH] upt

---
 Application/Admin/Model/PromoteModel.class.php | 9 ++++++---
 Application/Admin/View/Member/user_info.html   | 1 +
 Application/Admin/View/Spend/lists.html        | 1 +
 Application/Admin/View/User/rolelist.html      | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index a12fecfa6..099349449 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -377,15 +377,18 @@ class PromoteModel extends Model{
         $result = [];
         switch ($level) {
             case 1: // 会长
-                $result = $this->field("id, nickname")->where("grand_id = 0 and parent_id = 0")->select();
+                $result = $this->field("id, nickname, account, real_name")->where("grand_id = 0 and parent_id = 0")->select();
                 break;
             case 2: // 组长
-                $result = $this->field("id, nickname")->where("grand_id = 0 and parent_id > 0")->select();
+                $result = $this->field("id, nickname, account, real_name")->where("grand_id = 0 and parent_id > 0")->select();
                 break;
             case 3: //组员
-                $result = $this->field("id, nickname")->where("parent_id > 0 and grand_id > 0")->select();
+                $result = $this->field("id, nickname, account, real_name")->where("parent_id > 0 and grand_id > 0")->select();
                 break;
         }
+        foreach ($result as &$item) {
+            $item['nickname'] = "{$item['account']}({$item['real_name']})";
+        }
         return $result;
     }
 }
\ No newline at end of file
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index a44d286fe..6142d4ff6 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -125,6 +125,7 @@
                     <option value="">请选择推广员等级</option>
                     <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
                     <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>组长</option>
+                    <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组员</option>
                 </select>
                 -
             </div>
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 5de823dd5..ca26ce7cb 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -102,6 +102,7 @@
                     <option value="">请选择推广员等级</option>
                     <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
                     <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>组长</option>
+                    <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组员</option>
                 </select>
                 -
             </div>
diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html
index 896e1ff41..41b135618 100644
--- a/Application/Admin/View/User/rolelist.html
+++ b/Application/Admin/View/User/rolelist.html
@@ -74,6 +74,7 @@
                     <option value="">请选择推广员等级</option>
                     <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
                     <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>组长</option>
+                    <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组员</option>
                 </select>
                 -
             </div>