This commit is contained in:
lianxiang
2018-09-20 00:25:25 +08:00
parent 27e27d5d12
commit 309cae4ab2
56 changed files with 1755 additions and 39 deletions
@@ -99,7 +99,6 @@
self.loginBtn.layer.cornerRadius = self.loginBtn.frame.size.height / 2;
NSMutableAttributedString *attri = [[NSMutableAttributedString alloc] init];
NSTextAttachment *attch = [[NSTextAttachment alloc] init];
attch.image = [UIImage imageNamed:@"ic_wechat"];
attch.bounds = CGRectMake(0,-4, 12.9, 12.5);
@@ -169,13 +168,20 @@
GIGA_ShowToast(@"密码不能为空");
return;
}
BOOL isPass = [GiGaHelper checkPassWord:self.passwordTextField.text];
if (isPass == NO) {
// BOOL isPass = [GiGaHelper checkPassWord:self.passwordTextField.text];
//
// if (isPass == NO) {
// GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
// return;
// }
int leng = [GiGaHelper convertToInt: self.passwordTextField.text];
if (!(leng >= 6 && leng <= 20)) {
GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
return;
}
[self loginWithAction:btn];
}
@@ -153,9 +153,10 @@
return;
}
BOOL isPass = [GiGaHelper checkPassWord:self.passNewTextField.text];
//BOOL isPass = [GiGaHelper checkPassWord:self.passNewTextField.text];
int leng = [GiGaHelper convertToInt: self.passNewTextField.text];
if (isPass == NO) {
if (!(leng >= 6 && leng <= 20)) {
GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
return;
}