Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

shuishen

2022-03-04 9421b2d90ddbf160b9098c3976d45d4b55705d5a

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 pages/registerUser/registerUser.vue

@@ -257,14 +257,14 @@
                        trigger: ['change', 'blur'],
                    }],
                    jobUnit: [{
                        required: true,
                        required: false,
                        message: '请输入单位名称',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }],
                    address: [{
                        required: false,
                        message: '请输入居住地',
                        required: true,
                        message: '请选择居住地',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }],
@@ -275,14 +275,14 @@
                        trigger: ['change', 'blur'],
                    }],
                    signals: [{
                        required: true,
                        required: false,
                        message: '请输入警号',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }],
                    xq: [{
                        required: true,
                        message: '请选择辖区',
                        required: false,
                        message: '请选择工作地点',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }],
@@ -384,6 +384,26 @@
                    return
                }
                var that = this;
                debugger
                //判断是否必填警号和工作地点
                if(that.form.role == "民警"){
                    that.rules.signals[0].required = true;
                }
				
                if(that.jobValue == "有"){
                    that.rules.jobUnit[0].required = true;
                    that.rules.xq[0].required = true;
                }
				
                that.$refs.uForm.validate(valid => {
                    if (valid) {
                        that.registerEvent()
                    }else{
                        return
                    }
                });
				
				
                uni.request({
                    url: that.$store.state.piAPI + '/zc/inspect',
                    method: 'GET',
@@ -403,8 +423,6 @@

                        }

                        that.registerEvent()

                        // that.$refs.uForm.validate(valid => {
                        //     if (valid) {
                        //         var d = that.form;
@@ -422,8 +440,9 @@
            },

            registerEvent() {
                var d = this.form;
                var url = this.$store.state.piAPI + '/zc/inster',
                var that = this;
                var d = that.form;
                var url = that.$store.state.piAPI + '/zc/inster',
                    data = {
                        // deptid: ,
                        password: d.pass,
@@ -464,6 +483,7 @@
                    }
                });


            },

            depl() {