add flying commit

GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m

@@ -123,6 +123,25 @@
 
 #pragma mark -  登录
 -(void)loginBtnAction:(UIButton *)btn{
+    
+    if (self.acountTextField.text == nil) {
+        GIGA_ShowToast(@"请输入手机号");
+        return;
+    }
+    if (![GiGaHelper isPhoneNumber:self.acountTextField.text]) {
+        GIGA_ShowToast(@"请输入正确手机号");
+        return;
+    }
+    
+    if (self.passwordTextField.text == nil) {
+        GIGA_ShowToast(@"密码不能为空");
+        return;
+    }
+    if (self.passwordTextField.text.length < 6) {
+        GIGA_ShowToast(@"密码长度不能小于六位字符");
+        return;
+    }
+    
     //埋点
     [MobClick endEvent:MobClick_UserLogin];
     [GiGaUserDefault saveUserId:@"123"];

GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.xib

@@ -34,7 +34,7 @@
                         <constraint firstAttribute="height" constant="100" id="npT-8X-kmx"/>
                     </constraints>
                 </imageView>
-                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="账号" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yiv-h8-4V1">
+                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="账号" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Yiv-h8-4V1">
                     <rect key="frame" x="32" y="160" width="309" height="30"/>
                     <color key="backgroundColor" red="0.99607843139999996" green="0.94117647059999998" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
@@ -44,7 +44,7 @@
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Y1I-OE-6t1">
+                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Y1I-OE-6t1">
                     <rect key="frame" x="33" y="224" width="309" height="30"/>
                     <color key="backgroundColor" red="0.99607843139999996" green="0.94117647059999998" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>