空单，idcard去掉

common/models/User.php

@@ -111,7 +111,7 @@ class User extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_NAME', 'PASSWORD_HASH', 'PAY_PASSWORD', 'REAL_NAME', 'ID_CARD', 'AVATAR'], 'required'],
+            [['USER_NAME', 'PASSWORD_HASH', 'PAY_PASSWORD', 'REAL_NAME',/* 'ID_CARD',*/ 'AVATAR'], 'required'],
             [['NATION', 'ID_TYPE', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY', 'CREATED_AT', 'UPDATED_AT', 'STATUS', 'DEC_CLOSED', 'DEC_CLOSED_AT', 'PROVINCE', 'CITY', 'COUNTY', 'DELETED', 'DELETED_AT', 'IS_DEC', 'IS_ATLAS', 'IS_RECHARGE','IS_STUDIO',  'PERIOD_AT', 'DEC_PROVINCE', 'DEC_CITY', 'DEC_COUNTY', 'IS_UNION', 'STATUS_AT', 'VERIFIED', 'VERIFIED_AT', 'ALLOW_LOGIN', 'NOT_OPERATING', 'REG_FROM', 'BANK_UPDATED_AT', 'IS_DIRECT_SELLER', 'DEC_LV_UPDATED_AT', 'DEC_LV_UPDATED_PERIOD', 'PART_FUNC_CLOSED', 'LAST_DEC_LV_UPDATED_PERIOD', 'LAST_DEC_LV_UPDATED_AT', 'DEC_CREATED_AT', 'DEC_CREATED_PERIOD', 'PASSWORD_CHANGED', 'SUB_COM_LEADER', 'READ_AGREEMENT', 'IS_FIRST_OPEN', 'IS_MODIFY_PASSWORD'], 'integer'],
             [['ZG_UPGRADE_PV'], 'number'],
             [['ID', 'OPEN_BANK', 'BANK_NO', 'DEC_LV', 'EMP_LV', 'CROWN_LV', 'SUB_COM_ID', 'DEC_ID', 'DEC_ROLE_ID', 'ID_CARD_PREFIX', 'SEX', 'DEC_PHONE', 'GUARANTOR', 'USER_CREATOR', 'USER_UPDATER', 'LAST_DEC_LV', 'EMAIL'], 'string', 'max' => 32],

common/models/forms/AdminAddUserForm.php

@@ -68,7 +68,7 @@ class AdminAddUserForm extends Model {
      */
     public function rules() {
         return [
-            [['userName', 'nation', 'realName', 'idCard', 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankAreaSelected', 'decLv', 'areaSelected', 'tel', 'isDec', 'decUserName', 'birthday', 'decRoleId', 'conUserName', 'recUserName', 'location', 'delUserName'], 'trim'],
+            [['userName', 'nation', 'realName', /*'idCard',*/ 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankAreaSelected', 'decLv', 'areaSelected', 'tel', 'isDec', 'decUserName', 'birthday', 'decRoleId', 'conUserName', 'recUserName', 'location', 'delUserName'], 'trim'],
             [['userName', 'realName', /*'idCard',*/ 'decLv', 'decUserName', 'conUserName', 'recUserName', 'location'], 'required'],
             [['userName'], 'unique', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME'],
             [['conUserName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME'],
@@ -93,7 +93,7 @@ class AdminAddUserForm extends Model {
     public function scenarios() {
         $parentScenarios = parent::scenarios();
         $customScenarios = [
-            'add' => ['userName', 'nation', 'realName', 'idCard', 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankAreaSelected', 'decLv', 'areaSelected', 'tel', 'isDec', 'decUserName', 'birthday', 'decRoleId', 'conUserName', 'recUserName', 'location'],
+            'add' => ['userName', 'nation', 'realName', /*'idCard',*/ 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankAreaSelected', 'decLv', 'areaSelected', 'tel', 'isDec', 'decUserName', 'birthday', 'decRoleId', 'conUserName', 'recUserName', 'location'],
             'userDel' => ['delUserName'],
         ];
         return array_merge($parentScenarios, $customScenarios);
@@ -104,7 +104,7 @@ class AdminAddUserForm extends Model {
             'userName' => 'Member Code',//会员编号
             'nation' => 'Nation',//民族
             'realName' => 'Member Name',//会员姓名
-            'idCard' => 'ID',//身份证号
+//            'idCard' => 'ID',//身份证号
             'mobile' => 'Phone Number',//手机号
             'address' => 'Address',//地址
             'openBank' => 'Bank Name',//开户行
@@ -222,7 +222,7 @@ class AdminAddUserForm extends Model {
             $user->PAY_PASSWORD = \Yii::$app->security->generatePasswordHash($pwd);
             $user->NATION = 0;
             $user->REAL_NAME = $this->realName;
-            $user->ID_CARD = $this->idCard;
+//            $user->ID_CARD = $this->idCard;
             $user->MOBILE = $this->mobile;
             $user->ADDRESS = 'nothing';//无
             $user->ADDRESS = $this->address ? $this->address : 'nothing';//无

common/models/forms/UserBasicForm.php

@@ -41,8 +41,8 @@ class UserBasicForm extends Model {
         return [
             [['userId', 'password', 'passwordType','realName', 'mobile','openBank','bankAddress','bankNo','status'], 'trim'],
             [['userId'], 'required'],
-            [['idCard', 'allData'], 'required', 'on'=>['addWithUserName']],
-            [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
+            [[/*'idCard', */'allData'], 'required', 'on'=>['addWithUserName']],
+            [['nation','realName', 'mobile', /*'idCard', */'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
             [['mobile'], 'mobile'],
         ];
     }
@@ -55,7 +55,7 @@ class UserBasicForm extends Model {
         $parentScenarios = parent::scenarios();
         $customScenarios = [
             'modifyPassword' => ['userId', 'password', 'passwordType'],
-            'modifyProfile' => ['userId','realName','idCard','mobile','openBank','bankAddress','bankNo'],
+            'modifyProfile' => ['userId','realName',/*'idCard',*/'mobile','openBank','bankAddress','bankNo'],
             'modifyStatus' => ['userId','status'],
             'isModifyPasswordStatus' => ['userId','status'],
         ];
@@ -69,7 +69,7 @@ class UserBasicForm extends Model {
             'passwordType' => '密码类型',
 //            'nation' => '民族',
             'realName' => '真实姓名',
-            'idCard' => '身份证号',
+//            'idCard' => '身份证号',
             'mobile' => '手机号',
             'openBank' => '银行名称',
             'bankAddress' => '开户支行',
@@ -132,7 +132,7 @@ class UserBasicForm extends Model {
 //            $userModel->NATION = $this->nation;
             $userModel->REAL_NAME = $this->realName;
             $userModel->MOBILE = $this->mobile;
-            $userModel->ID_CARD = $this->idCard;
+//            $userModel->ID_CARD = $this->idCard;
             $userModel->OPEN_BANK = $this->openBank;
             $userModel->BANK_NO = $this->bankNo;
             $userModel->BANK_ADDRESS = $this->bankAddress;
@@ -147,7 +147,7 @@ class UserBasicForm extends Model {
 //                'nation' => $this->nation,
                 'realName' => $this->realName,
                 'mobile' => $this->mobile,
-                'idCard' => $this->idCard,
+//                'idCard' => $this->idCard,
                 'openBank' => $this->openBank,
                 'bankNo' => $this->bankNo,
                 'bankAddress' => $this->bankAddress,