Merge branch 'master' of ssh://10.10.100.21/source/UUEnt

UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -1273,7 +1273,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
 				"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle",
@@ -1286,7 +1286,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A2F6040888740937A057571A /* [CP] Check Pods Manifest.lock */ = {

UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRRegisterVC.m

@@ -42,17 +42,17 @@
     NSString *cPw = FORMAT(@"%@",_cPwTF.text);
     NSString *email = FORMAT(@"%@",_emailTF.text);
     
-//    if (name.length == 0 || tel.length == 0 || pw.length == 0 || cPw.length == 0) {
-//        [MBProgressHUD hideHUDForView:self.view animated:YES];
-//        [YRShowMessageFromNavi showDropViewWithMessage:@"请填写完整资料" ToNavi:self.navigationController withColor:nil];
-//        return;
-//    }
-//
-//    if (![pw isEqualToString:cPw]) {
-//        [MBProgressHUD hideHUDForView:self.view animated:YES];
-//        [YRShowMessageFromNavi showDropViewWithMessage:@"确认密码不一致" ToNavi:self.navigationController withColor:nil];
-//        return;
-//    }
+    if (name.length == 0 || tel.length == 0 || pw.length == 0 || cPw.length == 0) {
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        [YRShowMessageFromNavi showDropViewWithMessage:@"请填写完整资料" ToNavi:self.navigationController withColor:nil];
+        return;
+    }
+
+    if (![pw isEqualToString:cPw]) {
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        [YRShowMessageFromNavi showDropViewWithMessage:@"确认密码不一致" ToNavi:self.navigationController withColor:nil];
+        return;
+    }
     
     if (![NSString isEmail:email]) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
@@ -81,10 +81,11 @@
 
             [YRShowMessageFromNavi showDropViewWithMessage:@"注册成功" ToNavi:self.navigationController withColor:nil];
             
-            [self.navigationController popViewControllerAnimated:YES];
+            [self dismissViewControllerAnimated:YES completion:nil];
             
         }else{
             
+            [YRShowMessageFromNavi showDropViewWithMessage:FORMAT(@"%@",response.responseHeader.message) ToNavi:self.navigationController withColor:nil];
             
         }