（手机 & 邮箱）绑定页面，如果什么都没绑定过，那么不需要输入密码项

Author: wanghengheng

Coding_iOS/Controllers/MeSetting/SettingEmailViewController.m

@@ -74,7 +74,7 @@ - (UIView *)customFooterView{
                                                               RACObserve(self, j_captcha),
                                                               RACObserve(self, two_factor_code)]
                                                      reduce:^id(NSString *email, NSString *j_captcha, NSString *two_factor_code){
-                                                         return @(email.length > 0 && j_captcha.length > 0 && two_factor_code.length > 0);
+                                                         return @(email.length > 0 && j_captcha.length > 0 && (two_factor_code.length > 0 || [Login curLoginUser].hasNoEamilAndPhone));
                                                      }];
 
     [footerV addSubview:_footerBtn];
@@ -114,6 +114,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if (indexPath.row == 1 && [Login curLoginUser].hasNoEamilAndPhone) {
+        return 0;
+    }
     return 50;
 }
 

Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m

@@ -107,6 +107,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if (indexPath.row == 2 && [Login curLoginUser].hasNoEamilAndPhone) {
+        return 0;
+    }
     return 50;
 }
 
@@ -204,7 +207,7 @@ - (void)doneBtnClicked:(id)sender{
         tipStr = @"手机号码格式有误";
     }else if (_code.length <= 0){
         tipStr = @"请填写手机验证码";
-    }else if (_verifyStr.length <= 0){
+    }else if (_verifyStr.length <= 0 && ![Login curLoginUser].hasNoEamilAndPhone){
         tipStr = _verifyType == VerifyTypePassword? @"请填写密码": @"请填写两步验证码";
     }
     if (tipStr.length > 0) {

Coding_iOS/Models/User.h

@@ -26,7 +26,7 @@
 
 @property (strong, nonatomic, readonly) NSString *skills_str, *degree_str, *vipName;
 
-@property (assign, nonatomic, readonly) BOOL isUserInfoCompleted, canUpgradeByCompleteUserInfo, willExpired;
+@property (assign, nonatomic, readonly) BOOL isUserInfoCompleted, canUpgradeByCompleteUserInfo, willExpired, hasNoEamilAndPhone;
 
 + (User *)userWithGlobalKey:(NSString *)global_key;
 

Coding_iOS/Models/User.m

@@ -236,6 +236,10 @@ - (BOOL)willExpired{
     return (self.vip.integerValue >= 3 && (timeInterval < 3 * 24 * 60 * 60));
 }
 
+- (BOOL)hasNoEamilAndPhone{
+    return YES;
+    return self.email.length <= 0 && self.phone.length <= 0;
+}
 
 - (NSString *)changePasswordTips{
     NSString *tipStr = nil;

Coding_iOS/Views/Cell/Input_OnlyText_Cell.m

@@ -36,6 +36,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         // Initialization code
+        self.clipsToBounds = YES;
         self.selectionStyle = UITableViewCellSelectionStyleNone;
         if (!_textField) {
             _textField = [UITextField new];