Merge branch 'dev' of licailing/zhirongip into master

src/main/zhi-rong-web/src/components/PageHeader.vue

@@ -378,6 +378,7 @@ export default {
     .flex();
     justify-content: flex-end;
     margin-top: 24px;
+    cursor: pointer;
     margin-right: -15px;
     .img {
         width: 34px;

src/main/zhi-rong-web/src/components/PersonalInfos.vue

@@ -88,7 +88,24 @@ export default {
             },
             typeFl: {},
             registerRule: {
-                documentNumber: { required: true, message: '请输入您的证件编号', trigger: 'blur' },
+                documentNumber: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (this.sizeForm.type === 'ID_CARD') {
+                                const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
+                                if (!reg.test(value) && value != '') {
+                                    callback(new Error('请输入正确的身份证号'));
+                                }
+                            } else {
+                                var reg = /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/;
+                                if (reg.test(value) === false) {
+                                    callback(new Error('军官证号不合规'));
+                                }
+                            }
+                        }
+                    }
+                ],
                 nickname: { required: true, message: '请输入您的真实姓名', trigger: 'blur' },
                 phone: { required: true, message: '请输入您的联系方式', trigger: 'blur' },
                 email: { type: 'email', required: true, message: '请输入您的邮箱', trigger: 'blur' },
@@ -146,6 +163,7 @@ export default {
         },
         change(e) {
             this.typeFl = e.type;
+            this.sizeForm.documentNumber = '';
             if (this.typeFl == 'ID_CARD') {
                 this.name = '身份证 (正面)';
                 this.label = '身份证 (反面)';

src/main/zhi-rong-web/src/components/popup/Message.vue

@@ -90,6 +90,24 @@ export default {
             showForm: false,
             formData: {},
             rules: {
+                documentNumber: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (this.formData.type === 'ID_CARD') {
+                                const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
+                                if (!reg.test(value) && value != '') {
+                                    callback(new Error('请输入正确的身份证号'));
+                                }
+                            } else {
+                                var reg = /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/;
+                                if (reg.test(value) === false) {
+                                    callback(new Error('军官证号不合规'));
+                                }
+                            }
+                        }
+                    }
+                ],
                 name: [{ required: true, message: '请输入商标名称' }],
                 type: [{ required: true, message: '请选择证件类型' }],
                 phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
@@ -108,7 +126,7 @@ export default {
     },
     mounted() {
         this.$EventBus.$on('postMessage', res => {
-            console.log(res);
+            // console.log(res);
             this.show = true;
             if (this.$refs.form) {
                 this.$refs.form.resetFields();
@@ -121,6 +139,9 @@ export default {
         });
     },
     methods: {
+        // change(e) {
+        //     this.formData.documentNumber = '';
+        // },
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
@@ -132,7 +153,6 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
-
             this.saving = true;
             this.$http
                 .post('/message/save', data, { body: 'json' })