From 8066ec642f6cdf1d32aed206c702e7c1c27ba3a1 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 1 Nov 2023 11:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8C=85=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m | 6 ++++-- .../YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m | 6 ++++-- YuMi/Modules/YMRoom/View/XPRoomViewController.m | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m index 3c202bdf..cdb38214 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m @@ -18,6 +18,7 @@ #import "XPIAPRechargeViewController.h" #import "XCCurrentVCStackManager.h" #import "ClientConfig.h" +#import "XPWebViewController.h" @interface PIRoomSendRedPacketItemVC () ///host代理 @@ -254,8 +255,9 @@ config.message = YMLocalizedString(@"XPTreasureFairyViewController5"); config.confirmButtonConfig.title = YMLocalizedString(@"XPTreasureFairyViewController6"); [TTPopup alertWithConfig:config confirmHandler:^{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; + XPWebViewController * rechargeVC =[[XPWebViewController alloc] initWithCustomizeNav:NO]; + NSString *url = [NSString stringWithFormat:URLWithType(kThirdPartyPay),@"4",[YYUtility deviceID]]; + rechargeVC.url = url; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; } cancelHandler:^{ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m index 3b296dc2..b22f7631 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m @@ -17,6 +17,7 @@ #import "XPIAPRechargeViewController.h" #import "XCCurrentVCStackManager.h" #import "XPRoomHalfWebView.h" +#import "XPWebViewController.h" @interface PIRoomSendRedPacketVC () ///host代理 @property (nonatomic,weak) idhostDelegate; @@ -219,8 +220,9 @@ [self dismissViewControllerAnimated:YES completion:nil]; } -(void)getDiamondAction{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; + XPWebViewController * rechargeVC =[[XPWebViewController alloc] initWithCustomizeNav:NO]; + NSString *url = [NSString stringWithFormat:URLWithType(kThirdPartyPay),@"4",[YYUtility deviceID]]; + rechargeVC.url = url; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 5dab752a..7f6dd9ba 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -2134,10 +2134,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 -(void)rechargeHandle{ XPWebViewController * vc =[[XPWebViewController alloc] initWithCustomizeNav:YES]; - NSString *channel = @"p"; - channel = [NSString stringWithFormat:@"%@a",channel]; - channel = [NSString stringWithFormat:@"%@y",channel]; - NSString *url = [NSString stringWithFormat:URLWithType(kChannelUrl),channel,@"6",[YYUtility deviceID]]; + NSString *url = [NSString stringWithFormat:URLWithType(kThirdPartyPay),@"6",[YYUtility deviceID]]; vc.url = url; vc.isPush = YES; vc.modalPresentationStyle = UIModalPresentationFullScreen;