修改bug

VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGRepayment/Controller/QGRepayment/Controller/QGRepayResultViewController.m

@@ -103,12 +103,11 @@
     self.subTitleLab = subTitleLab;
     
     /// 再转一笔
-    self.repayBtn = [QGGradientShadowButton creatGradientColorButtonWithSuperView:self.view title:@" " textFont:[UIFont qg_regularFontOfSize:17.0]];
+    self.repayBtn = [QGGradientShadowButton creatGradientColorButtonWithSuperView:self.view title:@"返回" textFont:[UIFont qg_regularFontOfSize:17.0]];
     _repayBtn.layer.cornerRadius = 20;
     _repayBtn.layer.borderColor = UIColor.yyMainThemeColor.CGColor;
     _repayBtn.layer.borderWidth = 1;
     _repayBtn.layer.masksToBounds = YES;
-    _repayBtn.hidden = YES;
     [_repayBtn addTarget:self action:@selector(depositBtnAction:) forControlEvents:UIControlEventTouchUpInside];
     
     [self.repayBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -146,6 +145,13 @@
 }
 
 ///成功/失败/处理中,交易状态 0-处理中 1-成功 2-失败
+///NONE(0, "None", "未找到支付订单"),
+
+//PROCESSING(1, "Processing", "处理中订单"),
+//
+//COMPLETE(2, "Complete", "支付完成"),
+//
+//FAILED(3, "Failed", "支付失败");
 /// 查询交易结果
 - (void)queryResult
 {
@@ -156,12 +162,12 @@
             NSDictionary *data = responseObject[@"data"];
             NSInteger status = [data[@"status"] integerValue];
             /// 仅处理成功和失败, status=0 在计时seconds=15的逻辑里
-            if (status == 1) {
+            if (status == 2) {
                 [self stopTimer];
                 self.viewType = QGRepayResultViewTypeSuccess;
                 /// 通知刷新页面
                 [[NSNotificationCenter defaultCenter] postNotificationName:VCCRepaymentReloadNotification object:nil];
-            }else if (status == 2){
+            }else if (status == 3){
                 [self stopTimer];
                 self.errorMsg = data[@"failedReason"];
                 self.viewType = QGRepayResultViewTypeFailure;
@@ -194,20 +200,8 @@
         self.actionBlock(self.viewType);
     }
     
-    if (self.viewType ==  QGRepayResultViewTypeSuccess) {
-        NSArray *viewControllers = self.navigationController.viewControllers;
-        UIViewController *popVC = nil;
-        for (UIViewController *vc in viewControllers) {
-            if ([vc isKindOfClass:NSClassFromString(@"QGRepaymentGroupViewController")]) {
-                popVC = vc;
-                break;
-            }
-        }
-        if (popVC) {
-            [self.navigationController popToViewController:popVC animated:YES];
-        }else{
-            [self.navigationController popViewControllerAnimated:YES];
-        }
+    if (self.viewType ==  QGRepayResultViewTypeSuccess || self.viewType == QGRepayResultViewTypeWaiting) {
+        [self.navigationController popToRootViewControllerAnimated:YES];
     }else{
         [self.navigationController popViewControllerAnimated:YES];
     }
@@ -224,7 +218,8 @@
             self.imageView.image = [UIImage imageNamed:@"deposit_wait"];
             self.titleLab.text = @"还款中,请稍后…";
             self.subTitleLab.text = nil;
-            self.repayBtn.hidden = YES;
+            self.repayBtn.hidden = NO;
+            [self.repayBtn setTitle:@"返回" forState:UIControlStateNormal];
         }
             break;
         case QGRepayResultViewTypeSuccess: /// 转账成功

VirtualPayment/VirtualPayment/QGClasses/UserCenter/Function/SafeCenter/QGSafeBindSmsVerifyViewController.m

@@ -115,7 +115,7 @@
         make.left.equalTo(vCodeTF.mas_right);
         make.top.height.equalTo(vCodeTF);
         make.right.inset(40);
-        make.width.equalTo(vCodeTF.mas_width).multipliedBy(1/2.0);
+        make.width.equalTo(vCodeTF.mas_width).multipliedBy(2/3.0);
     }];
     self.vCodeBtn = vCodeBtn;
     
@@ -215,6 +215,11 @@
         if ([QGTalosNetwork checkBusinessCodeAndCodeWithResponseObjectObject:responseObject]) {
              [self fireTimer];
         }else{
+            NSString *msg = responseObject[@"msg"]? responseObject[@"msg"]:@"授权失败";
+            [QGHUDManager showHud:msg];
+            [self.countDownTimer destoryTimer];
+            self.vCodeBtn.titleLabel.text = @"重新发送";
+            [self.vCodeBtn setTitle:@"重新发送" forState:UIControlStateNormal];
             self.vCodeBtn.userInteractionEnabled = YES;
         }
     } failure:^(NSURLSessionDataTask * _Nonnull task, NSError * _Nonnull error) {
@@ -238,6 +243,7 @@
         }else{
             self.vCodeBtn.titleLabel.text = [NSString stringWithFormat:@"重新发送(%lds)",(long)self.residueTime];
             [self.vCodeBtn setTitle:[NSString stringWithFormat:@"重新发送(%lds)",(long)self.residueTime] forState:UIControlStateNormal];
+            self.vCodeBtn.userInteractionEnabled = NO;
         }
     }];
 }