root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_01'

Browse Source 
# Conflicts:
#	.DS_Store
This commit is contained in:
kai60
2019-11-20 09:55:09 +08:00
parent f8056dbea2 82590f8fba
commit 057d0da045
2085 changed files with 33132 additions and 87326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationHtmlController.h
+2 -2
View File
@@ -6,8 +6,8 @@
// Copyright © 2016年 lianxiang. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface ShopCertificationHtmlController : BaseVIewContorller
@interface ShopCertificationHtmlController : BaseViewController
@end
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationIntroduceController.h
+1 -1
View File
@@ -6,7 +6,7 @@
// Copyright © 2016年 lianxiang. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
#import "WhiteNavBaseViewController.h"
@interface ShopCertificationIntroduceController : WhiteNavBaseViewController
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.h
+1 -1
View File
@@ -6,7 +6,7 @@
// Copyright © 2016年 lianxiang. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
#import "WhiteNavBaseViewController.h"
//v4.4 后更改UI 此界面废弃
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m
+9 -3
View File
@@ -174,8 +174,14 @@
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
[[UIApplication sharedApplication]openURL:settingURL];
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
if([[UIApplication sharedApplication] canOpenURL:url]) {
if (@available(iOS 10.0, *)) {
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
}else {
[[UIApplication sharedApplication] openURL:url];
}
}
}];
UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
@@ -1097,7 +1103,7 @@
}
[self.view makeToastActivity];
[self.view makeToastActivity:CSToastPositionCenter];
CertifyListFourthCell *cell =[self.view viewWithTag:CERTYVIEW_CELLTAGROW9];
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertifyFailViewController.h
+1 -1
View File
@@ -6,7 +6,7 @@
// Copyright © 2016年 lianxiang. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
#import "WhiteNavBaseViewController.h"
#import "ShopCertifyStausModel.h"
Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertifySucssesViewController.m
-1
View File
@@ -7,7 +7,6 @@
//
#import "ShopCertifySucssesViewController.h"
//#import "WorkbechViewController.h"
#import "IfishKanHuGuanLiViewController.h"
#import "UINavigationBar+Background.h"
@interface ShopCertifySucssesViewController ()