Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/admin/controller/user/Agent.php

@@ -105,16 +105,19 @@ class Agent extends Backend
                             if(empty($params['province_id'])){
                                 $this->error("请选择省级");
                             }
+                            $data['group']=5;
                             unset($params['city_id']);unset($params['area_id']);
                         }else if($params["type"] == 4){
                             if(empty($params['city_id'])){
                                 $this->error("请选择市级");
                             }
+                            $data['group']=6;
                             unset($params['area_id']);
                         }else if($params["type"] == 5){
                             if(empty($params['area_id'])){
                                 $this->error("请选择区县级");
                             }
+                            $data['group']=7;
                         }
                         unset($params['family_id']);
                     }
@@ -122,7 +125,7 @@ class Agent extends Backend
                     if(in_array($params['type'],[3,4,5])){
                         $data['username']=$params['mobile'];
                         $data['nickname']=$params['realname'];
-                        $data['agent_user_id']=$params['agent_user_id'];
+                        $data['agent_user_id']=$params['user_id'];
                         $data['action']="add";
                         $admininfo = $this->Adminmodel->where(['username' =>$data['username']])->find();
                         if(!$admininfo){
@@ -196,23 +199,26 @@ class Agent extends Backend
                             if(empty($params['province_id'])){
                                 $this->error("请选择省级");
                             }
+                            $data['group']=5;
                             unset($params['city_id']);unset($params['area_id']);
                         }else if($params["type"] == 4){
                             if(empty($params['city_id'])){
                                 $this->error("请选择市级");
                             }
+                            $data['group']=6;
                             unset($params['area_id']);
                         }else if($params["type"] == 5){
                             if(empty($params['area_id'])){
                                 $this->error("请选择区县级");
                             }
+                            $data['group']=7;
                         }
                         unset($params['family_id']);
                     }
 
                     if(in_array($params['type'],[3,4,5])){
-                        $data['agent_user_id']=$params['agent_user_id'];
-                        $admin=Db::name("admin")->where(['agent_user_id'=>$params['agent_user_id']])->find();
+                        $data['agent_user_id']=$params['user_id'];
+                        $admin=Db::name("admin")->where(['agent_user_id'=>$params['user_id']])->find();
                         if($admin){
                             $data['action']="edit";
                             $admin =new Admin();

application/admin/validate/Admin.php

@@ -14,7 +14,7 @@ class Admin extends Validate
         'username' => 'require|regex:\w{3,30}|unique:admin',
         'nickname' => 'require',
         'password' => 'require|regex:\S{32}',
-        'email'    => 'require|email|unique:admin,email',
+        //'email'    => 'require|email|unique:admin,email',
         'mobile'   => 'regex:1[3-9]\d{9}|unique:admin,mobile',
     ];