未绑定手机号以及邮箱的用户在第一次绑定时不需要输入密码

wanghengheng · wanghengheng · commit 5b38083a4d2d · 2018-06-20T09:09:38.000+08:00
diff --git a/Coding_iOS/Coding_Enterprise_iOS-Info.plist b/Coding_iOS/Coding_Enterprise_iOS-Info.plist
@@ -28,7 +28,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.9.5.201806190930</string>
+	<string>2.9.5.201806191800</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/Coding_iOS/Coding_iOS-Info.plist b/Coding_iOS/Coding_iOS-Info.plist
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.4.201806151800</string>
+	<string>5.4.201806191800</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/Coding_iOS/Controllers/MeSetting/SettingEmailViewController.m b/Coding_iOS/Controllers/MeSetting/SettingEmailViewController.m
@@ -143,7 +143,7 @@ - (void)doneBtnClicked:(id)sender{
     NSString *tipStr;
     if (![_email isEmail]) {
         tipStr = @"邮箱格式有误";
-    }else if (_two_factor_code.length <= 0){
+    }else if (_two_factor_code.length <= 0 && ![Login curLoginUser].hasNoEamilAndPhone){
         tipStr = !_is2FAOpen? @"请填写密码": @"请填写两步验证码";
     }else if (_j_captcha.length <= 0){
         tipStr = @"请填写验证码";
