From a2408407b7b45b82498c928fa5388286a793e7ba Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 24 Jun 2020 17:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B8=82=E5=9C=BA=E4=B8=93?=
 =?UTF-8?q?=E5=91=98=E7=BB=93=E7=AE=97=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/AuthManagerController.class.php | 12 ++++++++++++
 .../MarketPercentageController.class.php       | 18 ++++++++++++++++++
 .../Admin/Controller/UserController.class.php  | 11 +++++++++--
 Application/Admin/View/User/add.html           | 12 ++++++++++--
 Application/Admin/View/User/edit.html          |  8 ++++++++
 5 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 Application/Admin/Controller/MarketPercentageController.class.php

diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php
index f5552eed9..400804d5a 100644
--- a/Application/Admin/Controller/AuthManagerController.class.php
+++ b/Application/Admin/Controller/AuthManagerController.class.php
@@ -593,4 +593,16 @@ class AuthManagerController extends AdminController{
         $this->ajaxReturn(json_encode($returnData));
     }
 
+    function AuthMarketMember() {
+
+        $mid = I('id');
+        $gid = I('group_id');
+
+        $AuthGroup = D('AuthGroup');
+        if( !$AuthGroup->find($gid)){
+            $this->error('用户组不存在');
+        }
+
+    }
+
 }
diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
new file mode 100644
index 000000000..049e6e900
--- /dev/null
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Admin\Controller;
+
+use User\Api\UserApi as UserApi;
+
+/**
+ * 后台首页控制器
+ * @author 麦当苗儿 <zuojiazi@vip.qq.com>
+ */
+class MarketPercentageController extends ThinkController
+{
+
+    public function index(){
+
+    }
+
+}
diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php
index 64cc6a33e..c12f721ee 100644
--- a/Application/Admin/Controller/UserController.class.php
+++ b/Application/Admin/Controller/UserController.class.php
@@ -261,7 +261,7 @@ class UserController extends AdminController
         }
     }
 
-    public function add($username = '', $password = '', $repassword = '', $email = '', $second_pwd = '')
+    public function add($username = '', $real_name='', $password = '', $repassword = '', $email = '', $second_pwd = '')
     {
 
         if (IS_POST) {
@@ -269,6 +269,9 @@ class UserController extends AdminController
             if (empty($username)) {
                 $this->error('管理员账号不能为空！');
             }
+            if (empty($real_name)) {
+                $this->error('真实姓名不能为空！');
+            }
             /* 检测密码 */
             if ($password != $repassword) {
                 $this->error('管理员密码和确认密码不一致！');
@@ -285,7 +288,7 @@ class UserController extends AdminController
             $User = new UserApi;
             $uid = $User->register($username, $password, $email, $second_pwd);
             if (0 < $uid) { //注册成功
-                $user = array('uid' => $uid, 'nickname' => $username, 'status' => 1,"birthday"=>date('Y-m-d',time()));
+                $user = array('uid' => $uid,'realname'=>$real_name, 'nickname' => $username, 'status' => 1,"birthday"=>date('Y-m-d',time()));
                 $data['uid'] = $uid;
                 $data['group_id'] = I('auth');
                 M('auth_group_access')->data($data)->add();
@@ -343,6 +346,9 @@ class UserController extends AdminController
                     }
                 }
             }
+            if (empty($_POST['real_name'])) {
+                $this->error('真实姓名不能为空！');
+            }
             if ($_POST['auth'] == '' && $id != 1) {
                 $this->error('请选择用户权限！');
             }
@@ -389,6 +395,7 @@ class UserController extends AdminController
             $maps['uid'] = $id;
             $info['username'] = $_POST['username'];
             $in['nickname'] = $_POST['username'];
+            $in['real_name'] = $_POST['real_name'];
             $pwd = $this->think_ucenter_md5($_POST['password'], UC_AUTH_KEY);
             $spwd = $this->think_ucenter_md5($_POST['second_pwd'], UC_AUTH_KEY);
             $rpwd = $Member->where(array('id' => $id))->find();
diff --git a/Application/Admin/View/User/add.html b/Application/Admin/View/User/add.html
index 28b04cbee..c5b7a2671 100644
--- a/Application/Admin/View/User/add.html
+++ b/Application/Admin/View/User/add.html
@@ -12,7 +12,7 @@
         <table  border="0" cellspacing="0" cellpadding="0">
           <tbody>
             <tr>
-              <td class="l"><i class="mustmark">*</i>管理员账号</td>
+              <td class="l"><i class="mustmark">*</i>账号</td>
               <td class="r">
                 <input name="username" type="text" class="">
                <!--  <input type="hidden" class="" name="username" value="{$list.username}" > -->
@@ -20,7 +20,15 @@
               </td>
             </tr>
             <tr>
-              <td class="l"><i class="mustmark">*</i>管理员密码</td>
+              <td class="l"><i class="mustmark">*</i>真实姓名</td>
+              <td class="r">
+                <input name="real_name" type="text" class="">
+                <!--  <input type="hidden" class="" name="username" value="{$list.username}" > -->
+                <span class="notice-text">管理员账号用于管理后台登录</span>
+              </td>
+            </tr>
+            <tr>
+              <td class="l"><i class="mustmark">*</i>密码</td>
               <td class="r">
                 <input name="password" type="password" class="">
                 <span class="notice-text">管理员密码不能少于6位</span>
diff --git a/Application/Admin/View/User/edit.html b/Application/Admin/View/User/edit.html
index 3bff5e5b5..5305ac602 100644
--- a/Application/Admin/View/User/edit.html
+++ b/Application/Admin/View/User/edit.html
@@ -18,6 +18,14 @@
                 <span class="notice-text">管理员账号用于管理后台登录</span>
               </td>
             </tr>
+            <tr>
+              <td class="l">真实姓名</td>
+              <td class="r">
+                <input name="real_name" value="{$list.real_name}" type="text" class="">
+                <!--  <input type="hidden" class="" name="username" value="{$list.username}" > -->
+                <span class="notice-text">管理员账号用于管理后台登录</span>
+              </td>
+            </tr>
             <tr>
               <td class="l">管理员密码</td>
               <td class="r">