区分活体和短验

VirtualPayment/VirtualPayment/QGClasses/Login/Function/RetrievePassword/ViewController/QGSucceedRetrieceSetNewPasswordViewController.h

@@ -14,6 +14,10 @@
 @property (nonatomic, copy)NSString *token;
 /// 重置密码类型 “body”：活体，“code”：短信
 @property (nonatomic, copy)NSString *resetType;
+///身份证号
+@property (nonatomic, copy)NSString *idCard;
+///姓名
+@property (nonatomic, copy)NSString *name;
 
 
 @end

VirtualPayment/VirtualPayment/QGClasses/Login/Function/RetrievePassword/ViewController/QGSucceedRetrieceSetNewPasswordViewController.m

@@ -34,6 +34,7 @@
     
     //创建header
     UILabel *titleLable = [UILabel creatLabelWithSuperView:self.tableHeaderView title:@"短信验证成功，请设置新登录密码" titleFontSize:[UIFont qg_mediumFontOfSize:18] textColor:[UIColor textColor3333] alignment:NSTextAlignmentLeft];
+    //如果是活体认证修改密码
     if ([self.resetType isEqualToString:@"body"]) {
         titleLable.text = @"刷脸验证成功，请设置新登录密码";
     }
@@ -64,11 +65,26 @@
         return;
     }
     
+    //请求连接根据短信或者活体验证
+    NSString *url;
+    
     NSMutableDictionary *parame = [[NSMutableDictionary alloc]init];
     [parame setObject:self.firstPassword forKey:@"password"];
     
-    //此处区分短验和活体
-    NSString *url = [QGLoginRequestApi urlWithQGLoginRequestServerMethod:([self.resetType isEqualToString:@"code"]?QGLoginRequestServerMethodSetNewPasswordCode:QGLoginRequestServerMethodSetNewPasswordBody)];
+    if ([self.resetType isEqualToString:@"body"]) {
+        [parame setObject:self.phoneNumberStr forKey:@"phone"];
+        [parame setObject:self.name forKey:@"name"];
+        [parame setObject:self.idCard forKey:@"idCard"];
+        //活体
+        url = [QGLoginRequestApi urlWithQGLoginRequestServerMethod:QGLoginRequestServerMethodSetNewPasswordBody];
+    }else{
+        //短验
+        url = [QGLoginRequestApi urlWithQGLoginRequestServerMethod:QGLoginRequestServerMethodSetNewPasswordCode];
+    }
+    
+    
+    
+    
     
     NSMutableDictionary *header = [[NSMutableDictionary alloc] initWithCapacity:1];
     if (![QGUserInfo sharedUserInfo].login) {
@@ -229,7 +245,8 @@
     self.phoneNumberStr = [param objectForKey:@"phoneNumberStr"];
     self.token = [param objectForKey:@"token"];
     self.resetType = [param objectForKey:@"resetType"];
-
+    self.name = [param objectForKey:@"name"];
+    self.idCard = [param objectForKey:@"idCard"];
 }
 
 @end

VirtualPayment/VirtualPayment/QGClasses/Login/Function/VerifyCentre/ViewController/QGVerifyFaceViewController.m

@@ -147,10 +147,20 @@
      msg = success;
      }
      */
+    
+    
+  
     @weakify(self);
     self.megliveSuccessBlock = ^(NSDictionary * _Nonnull successDic) {
         @strongify(self);
-        [Mediator performTarget:[QGMediatorClassTools QGClassNameWithHeaderType:QGHeaderTypeQGSucceedRetrieceSetNewPasswordViewController] parameters:@{@"phoneNumberStr":self.phoneNumberStr, @"token":[successDic valueForKeyPath:@"data.token"],@"resetType":@"body"} handlerBlock:self.callBackBlock];
+        NSMutableDictionary *parame = [[NSMutableDictionary alloc] init];
+        [parame setObject:self.identityCardNum forKey:@"idCard"];
+        [parame setObject:self.nameStr forKey:@"name"];
+        [parame setObject:self.phoneNumberStr forKey:@"phoneNumberStr"];
+        [parame setObject:@"body" forKey:@"resetType"];
+        [parame setObject:[successDic valueForKeyPath:@"data.token"] forKey:@"token"];
+
+        [Mediator performTarget:[QGMediatorClassTools QGClassNameWithHeaderType:QGHeaderTypeQGSucceedRetrieceSetNewPasswordViewController] parameters:parame handlerBlock:self.callBackBlock];
     };
 }
 
@@ -185,7 +195,7 @@
         
         QGQGVerifyFaceCell *cell = [tableView dequeueReusableCellWithIdentifier:@"cardCell"];
         if (!cell) {
-            cell = [[QGQGVerifyFaceCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cardCell" cellTitle:@"身份证号" placeHolder:@"请输入本人18位身份证号"];
+            cell = [[QGQGVerifyFaceCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cardCell" cellTitle:@"身份证号" placeHolder:@"请输入本人身份证号"];
             
         }
         @weakify(self)

VirtualPayment/VirtualPayment/QGClasses/UserCenter/Function/UserCenterAboutUs/VC/CWAboutUsViewController.m

@@ -95,7 +95,8 @@
 - (void)userProtocol {
 
 //    NSString *url = [QGRequestCenter urlWithIndex:QGRequestServerMethodUserAgreement];
-//    [self pushWebViewControllerWithUrlString:url title:@"用户协议"];
+//    [self pushWebViewControllerWithUrlString:@"http://pages.xyqb.com/fa-lv-xie-yi/" title:@"用户协议"];
+    [self navigationToWeb:@"http://pages.xyqb.com/fa-lv-xie-yi/"];
 }
 
 #pragma mark - UITableViewDataSource