Skip to content

pidan / FuSiLive

Go to a project
Commit 37fe80be by ludi
Options

修复私房童话价格选择的bug

parent 999b4358
Inline Side-by-side
Showing with 83 additions and 44 deletions
FuSiLive.xcodeproj/project.pbxproj
......@@ -493,7 +493,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113554;
CURRENT_PROJECT_VERSION = 20250402113555;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -761,7 +761,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113554;
CURRENT_PROJECT_VERSION = 20250402113555;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>80</integer>
<integer>83</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>81</integer>
<integer>80</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>83</integer>
<integer>79</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>79</integer>
<integer>81</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingOneToOneHeaderView.m
......@@ -370,18 +370,27 @@
}];
}
__block BOOL showTips = NO;
[self.priceModel.priceList enumerateObjectsUsingBlock:^(FUSPrivateLivePriceItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if (obj.status == 0) {
showTips = YES;
*stop = YES;
}
}];
// __block BOOL showTips = NO;
// [self.priceModel.priceList enumerateObjectsUsingBlock:^(FUSPrivateLivePriceItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
// if (obj.status == 0) {
// showTips = YES;
// *stop = YES;
// }
// }];
//
// if (showTips) {
// cell.priceLabelTop.constant = 22;
// cell.nexttipsLabel.hidden = NO;
// cell.nexttipsLabel.text = price.remark;
// }else {
// cell.priceLabelTop.constant = 38;
// cell.nexttipsLabel.hidden = YES;
// }
if (showTips) {
if (price.status == 0) {
cell.priceLabelTop.constant = 22;
cell.nexttipsLabel.hidden = NO;
cell.nexttipsLabel.text = price.remark;
cell.nexttipsLabel.text = price.nexttips;
}else {
cell.priceLabelTop.constant = 38;
cell.nexttipsLabel.hidden = YES;
......@@ -414,26 +423,26 @@
return;
}
if (price.price.integerValue > 0) {
if (self.detailCompleteStage == -1) {
//未完善
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"完善个人资料设定，可解锁价格"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确认"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
[vc fus_setControllerTypeWithType:1];
[[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
}];
return;
}
else if (self.detailCompleteStage == 0){
// 审核中
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"个人资料正在审核中，请耐心等候"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"我知道了"]] clickBlock:^(NSInteger buttonIndex) {
}];
return;
}
}
// if (price.price.integerValue > 0) {
// if (self.detailCompleteStage == -1) {
// //未完善
// [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"完善个人资料设定，可解锁价格"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确认"]] clickBlock:^(NSInteger buttonIndex) {
// if (buttonIndex == 1) {
// FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
// [vc fus_setControllerTypeWithType:1];
// [[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
// }
// }];
// return;
// }
// else if (self.detailCompleteStage == 0){
// // 审核中
// [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"个人资料正在审核中，请耐心等候"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"我知道了"]] clickBlock:^(NSInteger buttonIndex) {
//
// }];
// return;
// }
// }
MJWeakSelf
// 发起请求以
......@@ -472,15 +481,45 @@
}];
}
else if (code == -3035) {
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
[vc fus_setControllerTypeWithType:1];
[[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
}];
// [FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
//
// if (buttonIndex == 1) {
// FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
// [vc fus_setControllerTypeWithType:1];
// [[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
// }
//
// }];
if (weakSelf.detailCompleteStage == -1) {
//未完善
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"完善个人资料设定，可解锁价格"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确认"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
[vc fus_setControllerTypeWithType:1];
[[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
}];
return;
}
else if (weakSelf.detailCompleteStage == 0){
// 审核中
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"私房价格"] message:[NSString fus_localString:@"个人资料正在审核中，请耐心等候"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"我知道了"]] clickBlock:^(NSInteger buttonIndex) {
}];
return;
}
else {
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
FUSCompleteUserInfoViewController *vc = [[FUSCompleteUserInfoViewController alloc] init];
[vc fus_setControllerTypeWithType:1];
[[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
}];
}
}
else {
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:[NSString fus_localString:@"知道了"] otherButtonTitles:nil clickBlock:nil];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment