diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index f652eba..66fa9a9 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -45,16 +45,16 @@ - - - 验证码 - - - - + + + + + + + + + + 验证码 @@ -545,9 +545,8 @@ }, validateBtn: function() { let that = this, - value = that.merchantData; - if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && - value.yanzhengma && that.isAgree && value.classification) { + value = that.merchantData;//value.yanzhengma && + if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && value.classification) { if (!that.isShowCode) { that.validate = true; } else { @@ -570,10 +569,11 @@ if (!value.user_name) return that.$util.Tips({title: '请输入姓名'}); if (!value.phone) return that.$util.Tips({title: '请输入手机号'}); if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({title: '请输入正确的手机号码'}); - if (!value.yanzhengma) return that.$util.Tips({title: '请填写验证码'}); + // if (!value.yanzhengma) return that.$util.Tips({title: '请填写验证码'}); if (!value.classification) return that.$util.Tips({title: '请选择商户分类'}); if (!that.isAgree) return that.$util.Tips({title: '请勾选并同意入驻协议'}); if (that.isShowCode && !that.codeVal) return that.$util.Tips({title: '请填写图片验证码'}); + that.validate = true; return true; },