修复注册审核部分代码

app/admin/validate/User.php

@@ -21,7 +21,7 @@ class User extends Validate {
         'account' => 'require|max:50|unique:sys_user',
         'name' => 'require|max:50|regex:/^[\x{4e00}-\x{9fa5}\(\)（）\da-zA-Z&]{2,50}$/u',
         'type' => 'require|checkInSelect:type,1,2,3,4',
-        'password' => 'require|min:6|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,}$/',
+        'password' => 'require|min:8|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,}$/',
         're_password' => 'require|confirm:password',
         'phone' => 'require|mobile',
         'companyId' => 'require',
@@ -39,7 +39,7 @@ class User extends Validate {
         'name.regex' => '姓名只能是中文',
         'type.require' => "请选择账号类型",
         'password.require' => '请填写密码!',
-        'password.min' => '密码最少长度6位',
+        'password.min' => '密码最少长度8位',
         'password.regex' => '密码应包含字母与数字两种字符',
         're_password.require' => '请输入重复密码',
         're_password.confirm' => '两次密码输入不一致',

app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -19,6 +19,12 @@
         width: 240px;
         text-align: left;
     }
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
 </style>
 <script type="text/javascript">
     $(function () {
@@ -73,7 +79,7 @@
                             <td class="value1" style="border-right: 1px solid #c0a16b">
                                 {$ep.idCard}
                             </td>
-                            <td rowspan="3" style="border: 1px solid #c0a16b">
+                            <td rowspan="3" style="border: 1px solid #c0a16b;width: 300px">
                                 <label>
                                     营业执照<br />
                                     (事业单位法人证或批文)
@@ -92,7 +98,7 @@
                             <td class="key">
                                 单位地址
                             </td>
-                            <td class="value1">
+                            <td class="value1 word-wrap">
                                 {$ep.address}
                             </td>
                         </tr>
@@ -230,7 +236,7 @@
                                 人才联络员信息备案表
                             </td>
                             <td style="text-align: left">
-                                <button type="button" onclick="Feng.showFile('{$ep.beian|getFileView}','beian')">点击查看</button>
+                                <button type="button" onclick="Feng.showFile('{$ep.beian|getStoragePath}','beian')">点击查看</button>
                             </td>
                         </tr>
                     </table>

app/common/controller/Auth.php

@@ -53,16 +53,42 @@ class Auth extends BaseController
                 if(stripos($data['name'],")")){
                     $data['name'] = str_replace(')','）',$data['name']);
                 }
+                $files = $this->request->file();
                 if($special == 'qiye'){
                     if($data['type'] == 1){
                         validate(Enterprise::class)->batch(true)->scene('add')->check($data);
+                        if(!array_key_exists('domainImg',$files) || $files['domainImg'] == ''){
+                            $response_object->code = 500;
+                            $response_object->msg = '行业领域佐证材料不能为空';
+                            return \StrUtil::back($response_object,"Register.epCallBack");
+                        }
                     }else{
-                        validate(Enterprise::class)->batch(true)->scene('jc_add')->check($data);
+                        validate(Enterprise::class)->batch(true)->scene('jc_add')->check($data);//集成电路
+                    }
+                    if(!array_key_exists('imgurl',$files) || $files['imgurl'] == ''){
+                        $response_object->code = 500;
+                        $response_object->msg = '营业执照不能为空';
+                        return \StrUtil::back($response_object,"Register.epCallBack");
+                    }
+                    if(!array_key_exists('bankImg',$files) || $files['bankImg'] == ''){
+                        $response_object->code = 500;
+                        $response_object->msg = '开户许可证不能为空';
+                        return \StrUtil::back($response_object,"Register.epCallBack");
+                    }
+                    if(!array_key_exists('beian',$files) || $files['beian'] == ''){
+                        $response_object->code = 500;
+                        $response_object->msg = '人才联络员备案表不能为空';
+                        return \StrUtil::back($response_object,"Register.epCallBack");
                     }
                     $data['special'] = 0;
                 }else{
                     $data['type'] = 1;
-                    validate(Enterprise::class)->batch(true)->scene('sy_add')->check($data);
+                    validate(Enterprise::class)->batch(true)->scene('sy_add')->check($data);//事业单位
+                    if(!array_key_exists('imgurl',$files) || $files['imgurl'] == ''){
+                        $response_object->code = 500;
+                        $response_object->msg = '法人代表证或批文不能为空';
+                        return \StrUtil::back($response_object,"Register.epCallBack");
+                    }
                     $data['special'] = 1;
                 }
                 //检验验证码
@@ -79,7 +105,6 @@ class Auth extends BaseController
                     return \StrUtil::back($response_object,"Register.epCallBack");
                 }
                 $uploadapi = new UploadApi();
-                $files = $this->request->file();
                 //检验附件 营业执照
                 if(array_key_exists('imgurl',$files)){
                     $upload_result = $uploadapi->uploadOne($this->request->file('imgurl'),'image');
@@ -94,7 +119,7 @@ class Auth extends BaseController
                 //检验附件 开户许可证
                 if(array_key_exists('bankImg',$files)){
                     $upload_result1 = $uploadapi->uploadOne($this->request->file('bankImg'),'image');
-                    if($upload_result->code == 500){
+                    if($upload_result1->code == 500){
                         return \StrUtil::back($upload_result1,"Register.epCallBack");
                     }
                     $bankImg = $upload_result1->filepath;
@@ -116,7 +141,7 @@ class Auth extends BaseController
                 //检验附件 人才联络员备案表
                 if(array_key_exists('beian',$files)){
                     $upload_result3 = $uploadapi->uploadOne($this->request->file('beian'),'system');
-                    if($upload_result->code == 500){
+                    if($upload_result3->code == 500){
                         return \StrUtil::back($upload_result3,"Register.epCallBack");
                     }
                     $beian = $upload_result3->filepath;

app/common/view/auth/register.html

@@ -138,7 +138,7 @@
                                                                 <td>
                                                                     <div class="rowGroup">
                                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行网点</label>
-                                                                        <input autocomplete="off" type="text" class="form-control" id="bankNetwork" name="bankNetwork" />
+                                                                        <input autocomplete="off" type="text" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX支行/分行/分理处" />
                                                                     </div>
                                                                 </td>
                                                                 <td>

public/static/js/register.js

@@ -2,7 +2,7 @@ var Register = {
     registData: {},
     validateFields: {
         username: {validators: {notEmpty: {message: '登录账号不能为空'}}},
-        name: {validators: {notEmpty: {message: '单位/企业名称不能为空'},regexp:{regexp:/^[\u4e00-\u9fa5]{1,100}$/,message:"单位/企业名称只允许中文"}}},
+        name: {validators: {notEmpty: {message: '单位/企业名称不能为空'},regexp:{regexp:/^([\u4E00-\u9FA5]|\(|\)|\（|\）){1,100}$/,message:"单位/企业名称只允许中文"}}},
         //idCard: {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}},
         agentName: {validators: {notEmpty: {message: '人才联络员不能为空'}}},
         agentPhone: {
@@ -135,7 +135,11 @@ Register.enterpriseUserRegister = function() {
         $('#ep_form').bootstrapValidator("addField","idCard",{validators: {notEmpty: {message: '统一社会信用代码不能为空'}}});
         $('#ep_form').bootstrapValidator("addField","legal",{validators: {notEmpty: {message: '法人代表不能为空'},regexp:{regexp:/^[\u4e00-\u9fa5]{1,50}$/,message:"法人代表只允许中文"}}});
         $('#ep_form').bootstrapValidator("addField","bankCard",{validators: {notEmpty: {message: '开户银行账号不能为空'}}});
-        $('#ep_form').bootstrapValidator("addField","bankNetwork",{validators: {notEmpty: {message: '开户银行网点不能为空'}}});
+        $('#ep_form').bootstrapValidator("addField","bankNetwork",{validators: {notEmpty: {message: '开户银行网点不能为空'},
+                regexp: {
+                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*$/,
+                    message: "开户银行网点格式不正确"
+                }}});
         $('#ep_form').bootstrapValidator("addField","bank",{validators: {notEmpty: {message: '开户银行不能为空'}}});
         var prefix = '企业';
     }else{
@@ -207,7 +211,7 @@ Register.enterpriseUserRegister = function() {
             return;
         }
         if (!/^(?=.*\d)(?=.*[a-zA-Z]).{8,20}$/.test(password)){
-            Feng.info("密码格式错误，密码由字母、数字及特殊字符且8-20个字符组成!");
+            Feng.info("密码格式错误，密码由字母与数字组成，且长度必须大于8个字符!");
             return;
         }
         if (rePassword==null || rePassword=='') {
@@ -223,7 +227,7 @@ Register.enterpriseUserRegister = function() {
         Feng.info("请填写"+prefix+"名称!");
         return;
     }
-    if(!/^[\u4e00-\u9fa5]{1,100}$/.test(name)){
+    if(!/^([\u4E00-\u9FA5]|\(|\)|\（|\）){1,100}$/.test(name)){
         Feng.info(prefix+"名称只能输入中文 !");
         return;
     }

public/static/modular/gate/register.js

@@ -108,7 +108,7 @@ Register.enterpriseUserRegister = function() {
 			return;
 		}
 		if (!/^(?=.*\d)(?=.*[a-zA-Z]).{8,20}$/.test(password)){
-			Feng.info("密码格式错误，密码由字母、数字及特殊字符且8-20个字符组成!");
+			Feng.info("密码格式错误，密码由字母与数字组成，且长度必须大于8个字符");
 			return;
 		}
 		if (rePassword==null || rePassword=='') {