备份

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -12,8 +12,6 @@
 		1810C2B024E4E1D8006B8232 /* ZKFaceVerifyMsgView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1810C2AF24E4E1D8006B8232 /* ZKFaceVerifyMsgView.m */; };
 		182493C1255B8A3100BF4AB2 /* libc.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05CFF22F11D58001E5B44 /* libc.tbd */; };
 		182493C5255BB55F00BF4AB2 /* JYgRPCClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 182493C4255BB55F00BF4AB2 /* JYgRPCClient.m */; };
-		182ECCFB22FD221100FFC79E /* qidongye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 182ECCFA22FD221000FFC79E /* qidongye@2x.png */; };
-		182ECCFD22FD223A00FFC79E /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 182ECCFC22FD223A00FFC79E /* logo.png */; };
 		1849F8FA248B6E94008F9023 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1849F8F9248B6E94008F9023 /* JavaScriptCore.framework */; };
 		185F510A23A76765009F9022 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 185F510923A76765009F9022 /* CoreLocation.framework */; };
 		187B4EE321EC356100A9368D /* UIView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 187B4EE221EC356100A9368D /* UIView+Extension.m */; };
@@ -59,6 +57,7 @@
 		761BCA63272A816900259676 /* JYNewMessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 761BCA62272A816900259676 /* JYNewMessViewController.m */; };
 		761BCA72272AA0CE00259676 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 761BCA6F272AA0CE00259676 /* README.txt */; };
 		761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 761BCA71272AA0CE00259676 /* libWeChatSDK.a */; };
+		764C7D212A8DBE7600530FBC /* qidongye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 764C7D202A8DBE7600530FBC /* qidongye@2x.png */; };
 		76A2914D2A8B1DC00030E63A /* AppDelegateCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 76A2914C2A8B1DBF0030E63A /* AppDelegateCopy.m */; };
 		76A2914E2A8B423A0030E63A /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76AAC3C92A8A203F002C1D4F /* Network.framework */; };
 		76AAC3C12A89D771002C1D4F /* JYBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AAC3C02A89D771002C1D4F /* JYBaseViewController.m */; };
@@ -126,8 +125,6 @@
 		1810C2AF24E4E1D8006B8232 /* ZKFaceVerifyMsgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZKFaceVerifyMsgView.m; sourceTree = "<group>"; };
 		182493C3255BB55F00BF4AB2 /* JYgRPCClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYgRPCClient.h; sourceTree = "<group>"; };
 		182493C4255BB55F00BF4AB2 /* JYgRPCClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYgRPCClient.m; sourceTree = "<group>"; };
-		182ECCFA22FD221000FFC79E /* qidongye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qidongye@2x.png"; sourceTree = "<group>"; };
-		182ECCFC22FD223A00FFC79E /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		1849F8F9248B6E94008F9023 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		185F510923A76765009F9022 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		187B4EE121EC356100A9368D /* UIView+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Extension.h"; sourceTree = "<group>"; };
@@ -204,6 +201,7 @@
 		761BCA6F272AA0CE00259676 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		761BCA70272AA0CE00259676 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
 		761BCA71272AA0CE00259676 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
+		764C7D202A8DBE7600530FBC /* qidongye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qidongye@2x.png"; sourceTree = "<group>"; };
 		76A2914B2A8B1DBF0030E63A /* AppDelegateCopy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegateCopy.h; sourceTree = "<group>"; };
 		76A2914C2A8B1DBF0030E63A /* AppDelegateCopy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegateCopy.m; sourceTree = "<group>"; };
 		76AAC3BF2A89D771002C1D4F /* JYBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYBaseViewController.h; sourceTree = "<group>"; };
@@ -686,8 +684,7 @@
 		C5493106201F04120080CD63 /* Image */ = {
 			isa = PBXGroup;
 			children = (
-				182ECCFC22FD223A00FFC79E /* logo.png */,
-				182ECCFA22FD221000FFC79E /* qidongye@2x.png */,
+				764C7D202A8DBE7600530FBC /* qidongye@2x.png */,
 				C5FE4B5120468AED00CC8A2F /* noNet@2x.png */,
 				C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */,
 				C5D01D7D20282543007F207E /* back_normal@2x.png */,
@@ -890,14 +887,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				182ECCFD22FD223A00FFC79E /* logo.png in Resources */,
+				764C7D212A8DBE7600530FBC /* qidongye@2x.png in Resources */,
 				18C78C4624E24407001208F2 /* NoNetView.xib in Resources */,
 				761BCA72272AA0CE00259676 /* README.txt in Resources */,
 				C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */,
 				18E05CFB22F11CDE001E5B44 /* AlipaySDK.bundle in Resources */,
 				76ED394C28813ACC00B211C9 /* JhtDocViewer.bundle in Resources */,
 				C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */,
-				182ECCFB22FD221100FFC79E /* qidongye@2x.png in Resources */,
 				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -151,10 +151,6 @@
     [[TXCommonHandler sharedInstance] setAuthSDKInfo:@"ofSiUlw/wTNRCfGu1m8VGPWVk8G7LfnJEQPaod9peceHQOS46AJkcbON9Xf0Heb4fs3zd7z1aOAYwB0eQRtzJpewigEewvttWIc852nd6dwxgW0N9I9nUqNF3GhVOnWM1aM0nHqjiMycz4PHlDjnLB2V3c7DfUOLQYe9kM9DqnurR0bB/+uqn7mo6/vznGSl5K2wSk8hcf94epFr0c2iWtSlViPlgyPloxELoDkkiSze8J8uWy7Aeuv01TPm5bduze94UkPCuOI=" complete:^(NSDictionary * _Nonnull resultDic) {
         NSLog(@"设置秘钥结果：%@", resultDic);
     }];
-    
-    //    [[TXCommonHandler sharedInstance] accelerateVerifyWithTimeout:3.0 complete:^(NSDictionary * _Nonnull resultDic) {
-    //            NSLog(@"为后面获取本机号码校验Token加个速，加速结果：%@", resultDic);
-    //    }];
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/authbtn_dis.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "disabled.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disabled@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "disabled@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/authbtn_nor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "nor.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "nor@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "nor@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/choose.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "unchoose.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "unchoose@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "unchoose@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/logo.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "logo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "logo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "logo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/unchoose.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "unchoose-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "unchoose@2x-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "unchoose@3x-1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -16,11 +16,11 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qidongye.png" translatesAutoresizingMaskIntoConstraints="NO" id="cnp-0C-3lp">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

ios/JianYuIOS/JianYuIOS/Classes(新模块)/JYBaseViewController.m

@@ -18,6 +18,7 @@
     CGPoint startTouch;
     BOOL _isMoving;
     BOOL isExistNoNewWork;
+    
 }
 
 @property (nonatomic, strong) UIProgressView *progressView;
@@ -28,7 +29,7 @@
 @property(nonatomic,strong)NSString *placeAdr;
 @property(nonatomic,strong)NSString *placeLli;
 @property(nonatomic,assign)BOOL isLocation;
-
+@property(nonatomic,assign)BOOL isCanBack;
 
 @property(nonatomic, strong)NoNetView *noNetView;
 @property(nonatomic, strong)NoNetView *failNetView;
@@ -136,13 +137,19 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
                            @"refreshAppointTab",
                            @"sendMsgCount",
                            @"downLoadFile",
-                           @"clearHistory"
-                
+                           @"clearHistory",
+                           @"sideslipOpen",
+                           @"sideslipClose",
+                           @"getLogin",
+                           @"checkLoginEnvAvailable",
+                           @"getPhoneBind"
+                    
+                           
         ];
         for (NSString*jsName in jsArr) {
             [config.userContentController addScriptMessageHandler:self name:jsName];
         }
-
+        
         //高端的自定义配置创建WKWebView
         if (iPhoneX) {
             _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, WIDTH, HEIGHT) configuration:config];
@@ -162,8 +169,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 }
 
 -(void)webViewFirstRequest{
-    //去时间戳-拼接
-    NSString *tmpUrl = [[NSString stringWithFormat:@"%@%@", kHost, @"jyapp/jylab/mainSearch"] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];;
+    NSString *tmpUrl =  [[NSString stringWithFormat:@"%@jyapp/free/index?sign=%@&deviceid=%@", kHost,[LXUserDefaults token],[LXUserDefaults getDeviceID]] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     kMainQueue(^{
         [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
     })
@@ -172,7 +178,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 #pragma mark - event response
 // 计算wkWebView进度条
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-//    NSLog(@"进度条加载中...");
+    //    NSLog(@"进度条加载中...");
     if (!self.isRuningLoad) {
         self.isRuningLoad = YES;
     }
@@ -188,11 +194,11 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
                                   delay:0.3f
                                 options:UIViewAnimationOptionCurveEaseOut
                              animations:^{
-                                 self.progressView.alpha = 0.0f;
-                             }
+                self.progressView.alpha = 0.0f;
+            }
                              completion:^(BOOL finished) {
-                                 [self.progressView setProgress:0 animated:NO];
-                             }];
+                [self.progressView setProgress:0 animated:NO];
+            }];
         }
         
     } else {
@@ -206,7 +212,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openPushUrlOtherMethods:) name:OpenPushUrlOtherMethods object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openPushLinkUrlMethods:) name:OpenPushLinkUrlMethods object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jyReceiveNewsRedPoint:) name:JYReceiveNewsRedPoint object:nil];
-
+    
     //支付状态通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(alipayWXpayStatus:) name:AlipayWXpayStatus object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notNetReloadWebVIew:) name:NotNetReloadWebVIew object:nil];
@@ -224,6 +230,11 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 
 #pragma mark – Gesture Recognizer –
 -(void)paningGestureReceive:(UIPanGestureRecognizer *)recoginzer{
+    
+    if (!self.isCanBack){
+        NSLog(@"不可返回...");
+        return;
+    }
     NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
     NSLog(@"%@",current_url);
     CGRect rect = self.view.bounds;
@@ -312,39 +323,37 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     }else if ([message.name isEqualToString:@"alert"]) {
         [self jsAlert:message.body];
     }else if ([message.name isEqualToString:@"hiddenBottom"]) {
-//        [self jsHiddenBottom:message.body];
+        //        [self jsHiddenBottom:message.body];
     }else if ([message.name isEqualToString:@"checkLab"]) {
-//        [self jsCheckLab:message.body];
+        //        [self jsCheckLab:message.body];
     }else if ([message.name isEqualToString:@"chooseTab"]) {
-//        [self jsChooseTab:message.body];
-    }else if ([message.name isEqualToString:@"clearHistory"]) {
-//        [self jsClearHistory:message.body];
+        //        [self jsChooseTab:message.body];
     }else if ([message.name isEqualToString:@"loginSuccess"]) {
         [self jsLoginSuccess:message.body];
     }else if ([message.name isEqualToString:@"backUrl"]) {
-        [self jsBackUrl:message.body];
+        //        [self jsBackUrl:message.body];
     }else if ([message.name isEqualToString:@"clearPushMessage"]) {
         [self jsClearPushMessage:message.body];
     }else if ([message.name isEqualToString:@"hideRedSpotOnMenu"]) {
-//        [self jsHideRedSpotOnMenu:message.body];
+        //        [self jsHideRedSpotOnMenu:message.body];
     }else if ([message.name isEqualToString:@"showRedSpotOnMenu"]) {
-//        [self jsShowRedSpotOnMenu:message.body];
+        //        [self jsShowRedSpotOnMenu:message.body];
     }else if ([message.name isEqualToString:@"wxPay"]) {
         [self jsWxPay:message.body];
     }else if ([message.name isEqualToString:@"aliPay"]) {
         [self jsAliPay:message.body];
     }else if ([message.name isEqualToString:@"skipCameraWithParam"]) {
-       [self jsSkipCameraWithParam:message.body];
+        [self jsSkipCameraWithParam:message.body];
     }else if ([message.name isEqualToString:@"skipAlbumWithParam"]) {
-       [self jsSkipAlbumWithParam:message.body];
+        [self jsSkipAlbumWithParam:message.body];
     }else if ([message.name isEqualToString:@"openActivityPage"]) {
-       [self jsOpenActivityPage:message.body];
+        [self jsOpenActivityPage:message.body];
     }else if ([message.name isEqualToString:@"callPhone"]) {
-       [self jsCallPhone:message.body];
+        [self jsCallPhone:message.body];
     }else if ([message.name isEqualToString:@"openOtherAppLinks"]) {
-       [self jsOpenOtherAppLinks:message.body];
+        [self jsOpenOtherAppLinks:message.body];
     }else if ([message.name isEqualToString:@"inPurchasingVip"]) {
-       [self jsInPurchasingVip:message.body];
+        [self jsInPurchasingVip:message.body];
     }else if ([message.name isEqualToString:@"wirteRight"]) {
         [self jsWirteRight:message.body];
     }else if ([message.name isEqualToString:@"clearRight"]) {
@@ -352,13 +361,25 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     }else if ([message.name isEqualToString:@"savePic"]) {
         [self jsSavePic:message.body];
     }else if ([message.name isEqualToString:@"skipAppointTab"]) {
-//        [self jsSkipAppointTab:message.body];
+        //        [self jsSkipAppointTab:message.body];
     }else if ([message.name isEqualToString:@"refreshAppointTab"]) {
-//        [self jsRefreshAppointTab:message.body];
+        //        [self jsRefreshAppointTab:message.body];
     }else if ([message.name isEqualToString:@"sendMsgCount"]) {
-//        [self jsSendMsgCount:message.body];
+        //        [self jsSendMsgCount:message.body];
     }else if ([message.name isEqualToString:@"downLoadFile"]) {
         [self jsDownLoadFile:message.body];
+    }else if ([message.name isEqualToString:@"clearHistory"]) {
+        [self jsClearHistory:message.body];
+    }else if ([message.name isEqualToString:@"sideslipOpen"]) {
+        [self jsSideslipOpen:message.body];
+    }else if ([message.name isEqualToString:@"sideslipClose"]) {
+        [self jsSideslipClose:message.body];
+    }else if ([message.name isEqualToString:@"getLogin"]) {
+        [self jsGetLogin:message.body];
+    }else if ([message.name isEqualToString:@"checkLoginEnvAvailable"]) {
+        [self jsCheckLoginEnvAvailable:message.body];
+    }else if ([message.name isEqualToString:@"getPhoneBind"]) {
+        [self jsGetPhoneBind:message.body];
     }else {
         
     }
@@ -369,7 +390,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     NSError *err = nil;
     NSData *dataFromString = [prompt dataUsingEncoding:NSUTF8StringEncoding];
     NSDictionary *paramdict = [NSJSONSerialization JSONObjectWithData:dataFromString options:NSJSONReadingMutableContainers error:&err];
-//    NSLog(@"拦截prompt：%@",paramdict);
+    //    NSLog(@"拦截prompt：%@",paramdict);
     if (!err){
         NSString *type = [paramdict objectForKey:@"jsName"];
         if (type && [type isEqualToString:@"getUserToken"]) {
@@ -424,16 +445,16 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
             completionHandler(@"");
         }
         
-      
+        
     }
 }
 
 -(WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures{
     //假如是重新打开窗口的话
     if (!navigationAction.targetFrame.isMainFrame) {
-
+        
         [webView loadRequest:navigationAction.request];
-
+        
     }
     return nil;
 }
@@ -443,7 +464,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     //如果当前页面是三级页面-
     NSString *curUrl = [webView.URL absoluteString];
     if (navigationAction.targetFrame==nil) {
-       [webView loadRequest:navigationAction.request];
+        [webView loadRequest:navigationAction.request];
     }
     if ([curUrl containsString:@"jyapp/article/content"]) {
         //当前页面是三级页面--判断待跳转页面是否符合内置跳转
@@ -475,7 +496,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
                 ctr.url = nextUrl;
                 ctr.titleShow = @"公告信息";
                 kMainQueue(^{
-                     [self presentViewController:ctr animated:YES completion:nil];
+                    [self presentViewController:ctr animated:YES completion:nil];
                 });
                 // 不允许跳转-并跳转新页面
                 decisionHandler(WKNavigationActionPolicyCancel);
@@ -494,7 +515,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 //通过js alert 显示一个警告面板，调用原生会走此方法。
 - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
 {
-//    NSLog(@"显示一个JavaScript警告面板, message = %@",message);
+    //    NSLog(@"显示一个JavaScript警告面板, message = %@",message);
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:message preferredStyle:UIAlertControllerStyleAlert];
     [alertController addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         completionHandler();
@@ -504,7 +525,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 //通过 js confirm 显示一个确认面板，调用原生会走此方法。
 - (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL result))completionHandler
 {
-//    NSLog(@"运行JavaScript确认面板， message = %@", message);
+    //    NSLog(@"运行JavaScript确认面板， message = %@", message);
     UIAlertController *action = [UIAlertController alertControllerWithTitle:@"温馨提示" message:message preferredStyle:UIAlertControllerStyleAlert];
     [action addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
         completionHandler(NO);
@@ -521,7 +542,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         WeakSelf;
         [self->_webView evaluateJavaScript:jsName completionHandler:^(id _Nullable result, NSError * _Nullable error) {
-//            NSLog(@"是否存在 result:%@,error:%@",result,error);
+            //            NSLog(@"是否存在 result:%@,error:%@",result,error);
             if ([result intValue]==0) {
                 [weakSelf executeCallJS:jsStr];
             }else {
@@ -548,9 +569,8 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     NSLog(@"首页初始化");
     self.placeAdr = [NSString new];
     self.placeLli = [NSString new];
+    self.isCanBack = YES;
     self.view.backgroundColor = [UIColor whiteColor];
-
-
     [self.view addSubview:self.webView];
     [self.view addSubview:self.progressView];
     [self webViewFirstRequest];
@@ -560,14 +580,17 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     [self.recognizer delaysTouchesBegan];
     [self.view addGestureRecognizer:self.recognizer];
     
-    
-//
-    
     //监听购买结果
     [[SKPaymentQueue defaultQueue] addTransactionObserver:self];
     
+    
+//    UIButton *btn = [ZKControl createButtonWithFrame:CGRectMake(100, 100, 100, 100) title:@"点我点我" imageName:nil bgImageName:nil target:self method:@selector(click)];
+//    [self.view addSubview:btn];
+    
 }
-
+//-(void)click{
+//    [self jsGetPhoneBind:@{}];
+//}
 
 #pragma mark - WKNavigationDelegate
 /* 页面加载完成 */
@@ -741,7 +764,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 }
 // 跳转到系统设置
 -(void)jsOpenSystemNotification:(NSDictionary *)dict{
-   [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+    [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
 }
 // 获取推送id
 -(NSString *)jsGetPushRid:(NSDictionary *)dict{
@@ -839,7 +862,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
         NSString  *content = [UIPasteboard generalPasteboard].string;
         [self popPasteVIew:content];
     }
-  
+    
 }
 
 
@@ -863,7 +886,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
         return;
     }
     NSString *jsonString = [NSString stringWithFormat:@"%@",dict[@"order"]];
-
+    
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     NSError *err;
     NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&err];
@@ -956,7 +979,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 //拍照上传图片
 -(void)jsSkipCameraWithParam:(NSDictionary *)dict {
     [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
-
+    
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -968,7 +991,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 //相册选择照片
 -(void)jsSkipAlbumWithParam:(NSDictionary *)dict {
     [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
-
+    
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -982,7 +1005,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     NSDictionary * infoDic = @{@"url":[NSString stringWithFormat:@"%@",dict[@"url"]],
                                @"rectype":[NSString stringWithFormat:@"%@",dict[@"rectype"]],
                                @"openid":[NSString stringWithFormat:@"%@",dict[@"openid"]],
-                               };
+    };
     //post请求
     NSLog(@"%@",[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost]);
     [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost] parameters:infoDic progress:^(NSProgress *progress) {
@@ -991,7 +1014,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
         NSLog(@"responseObject=%@",responseObject);
     } failure:^(NSError *error) {
         NSLog(@"error=%@",error);
-
+        
     }];
 }
 
@@ -1016,25 +1039,25 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     NSLog(@"appName:%@",appName);
     NSURL *url = [NSURL URLWithString:appLink];
     if ([[UIApplication sharedApplication] canOpenURL:url]) {
-      if ([[UIApplication sharedApplication] respondsToSelector:@selector(openURL:options:completionHandler:)]) {
-        //iOS 10.0+
-          NSLog(@"iOS 10+");
-          if (@available(iOS 10.0, *)) {
-              [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
-                  if (!success) {
-                      [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:appName delay:2];
-                  }
-              }];
-          } else {
-              // Fallback on earlier versions
-              [[UIApplication sharedApplication] openURL:url];
-          }
-
-     }else{
-         NSLog(@"iOS 2~10");
-         //iOS 2~10
-         [[UIApplication sharedApplication] openURL:url];
-     }
+        if ([[UIApplication sharedApplication] respondsToSelector:@selector(openURL:options:completionHandler:)]) {
+            //iOS 10.0+
+            NSLog(@"iOS 10+");
+            if (@available(iOS 10.0, *)) {
+                [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
+                    if (!success) {
+                        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:appName delay:2];
+                    }
+                }];
+            } else {
+                // Fallback on earlier versions
+                [[UIApplication sharedApplication] openURL:url];
+            }
+            
+        }else{
+            NSLog(@"iOS 2~10");
+            //iOS 2~10
+            [[UIApplication sharedApplication] openURL:url];
+        }
     }else{
         //一般是没有安装
         NSLog(@"跳转下载app链接");
@@ -1051,7 +1074,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     UIImage *saveImg = [UIImage imageWithData:data];
     UIImageWriteToSavedPhotosAlbum(saveImg, self, @selector(image:didFinishSavingWithError:contextInfo:), NULL);
 }
-    
+
 #pragma mark 系统的完成保存图片的方法
 - (void)image: (UIImage *) image didFinishSavingWithError: (NSError *) error contextInfo: (void *) contextInfo
 {
@@ -1129,7 +1152,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     SKPayment * payment = [SKPayment paymentWithProduct:myProduct[0]];
     [[SKPaymentQueue defaultQueue] addPayment:payment];
 }
- 
+
 //监听购买结果
 - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions {
     NSLog(@"收到支付回调");
@@ -1163,37 +1186,37 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     NSError *error = nil;
     receiptData = [NSURLConnection sendSynchronousRequest:urlRequest returningResponse:nil error:&error];
     NSString *receipt = [receiptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
-     if ([productIdentifier length] > 0) {
-         // 向自己的服务器验证购买凭证
-     
-         if(self.tabBarController.selectedIndex == 0) {
-              [self isExitCallToJS:[NSString stringWithFormat:@"getReceipt('%@')", receipt] withMethodName:@"getReceipt"];
-         }else {
-             [[NSNotificationCenter defaultCenter] postNotificationName:@"receiptData" object:nil userInfo:@{@"receipt":receipt}];
-         }
-     }
-     // Remove the transaction from the payment queue.
-     [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
-  
+    if ([productIdentifier length] > 0) {
+        // 向自己的服务器验证购买凭证
+        
+        if(self.tabBarController.selectedIndex == 0) {
+            [self isExitCallToJS:[NSString stringWithFormat:@"getReceipt('%@')", receipt] withMethodName:@"getReceipt"];
+        }else {
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"receiptData" object:nil userInfo:@{@"receipt":receipt}];
+        }
+    }
+    // Remove the transaction from the payment queue.
+    [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
+    
 }
 
 
 - (void)failedTransaction:(SKPaymentTransaction *)transaction {
-     [[LXViewControllerManager shareViewControllerManager] hideHud];
-     if(transaction.error.code != SKErrorPaymentCancelled) {
-         NSLog(@"购买失败");
-         [[LXViewControllerManager shareViewControllerManager]showHudOnlyText:@"购买失败,请重新尝试。" delay:1];
-     } else {
-         NSLog(@"用户取消交易");
-         [[LXViewControllerManager shareViewControllerManager]showHudOnlyText:@"取消交易" delay:1];
-     }
-     [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
+    [[LXViewControllerManager shareViewControllerManager] hideHud];
+    if(transaction.error.code != SKErrorPaymentCancelled) {
+        NSLog(@"购买失败");
+        [[LXViewControllerManager shareViewControllerManager]showHudOnlyText:@"购买失败,请重新尝试。" delay:1];
+    } else {
+        NSLog(@"用户取消交易");
+        [[LXViewControllerManager shareViewControllerManager]showHudOnlyText:@"取消交易" delay:1];
+    }
+    [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
 }
 - (void)restoreTransaction:(SKPaymentTransaction *)transaction {
-     // 对于已购商品，处理恢复购买的逻辑
-     NSLog(@"对于已购商品，处理恢复购买的逻辑");
-     [[LXViewControllerManager shareViewControllerManager] hideHud];
-     [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
+    // 对于已购商品，处理恢复购买的逻辑
+    NSLog(@"对于已购商品，处理恢复购买的逻辑");
+    [[LXViewControllerManager shareViewControllerManager] hideHud];
+    [[SKPaymentQueue defaultQueue] finishTransaction: transaction];
 }
 
 
@@ -1234,6 +1257,215 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     
 }
 
+//清除历史返回列表
+-(void)jsClearHistory:(NSDictionary *)dict {
+    [_webView.backForwardList performSelector:NSSelectorFromString(@"_removeAllItems")];
+}
+//开启侧滑
+-(void)jsSideslipOpen:(NSDictionary *)dict {
+    self.isCanBack = YES;
+}
+//关闭侧滑
+-(void)jsSideslipClose:(NSDictionary *)dict {
+    self.isCanBack = NO;
+}
+//返回登录有效
+-(void)jsCheckLoginEnvAvailable:(NSDictionary *)dict {
+    __block BOOL support = NO;
+    __block NSString *sup = @"0";
+    [[TXCommonHandler sharedInstance] checkEnvAvailableWithAuthType:PNSAuthTypeLoginToken complete:^(NSDictionary * _Nullable resultDic) {
+        support = [PNSCodeSuccess isEqualToString:[resultDic objectForKey:@"resultCode"]];
+        if (support){
+            sup = @"1";
+        }
+        [self isExitCallToJS:[NSString stringWithFormat:@"checkLoginEnvAvailableCallback('%@')",sup] withMethodName:@"checkLoginEnvAvailableCallback"];
+    }];
+}
+
+-(void)jsGetLogin:(NSDictionary *)dict {
+    TXCustomModel *model = [[TXCustomModel alloc] init];
+    model.supportedInterfaceOrientations = UIInterfaceOrientationMaskPortrait;
+    //导航栏配置
+    model.navColor = UIColor.whiteColor;
+    NSDictionary *attributes = @{
+        NSForegroundColorAttributeName : [UIColor whiteColor],
+        NSFontAttributeName : [UIFont systemFontOfSize:18.0]
+    };
+    model.navTitle = [[NSAttributedString alloc] initWithString:@"" attributes:attributes];
+    model.navBackImage = [UIImage imageNamed:@"arrowLeft"];
+    
+    //logo配置
+    model.logoImage = [UIImage imageNamed:@"logo"];
+    model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        return CGRectMake((WIDTH-80)*0.5, 30, 80, 80);
+    };
+    model.numberColor = UIColorFromRGB(0x171826);
+    model.numberFont = [UIFont systemFontOfSize:24.0];
+    model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 110+30;
+        return frame;
+    };
+    model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 150+30;
+        return frame;
+    };
+    
+    model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录/注册" attributes:@{NSForegroundColorAttributeName : UIColor.whiteColor,NSFontAttributeName : [UIFont systemFontOfSize:18.0]}];
+    NSArray *BtnBgImgs = [NSArray arrayWithObjects:[UIImage imageNamed:@"authbtn_nor"],[UIImage imageNamed:@"authbtn_dis"],[UIImage imageNamed:@"authbtn_nor"], nil];
+    model.loginBtnBgImgs = BtnBgImgs;
+    
+    
+    model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"其他手机号登录/注册" attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0x2ABED1),NSFontAttributeName : [UIFont systemFontOfSize:16.0]}];
+    model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        return CGRectMake(10, frame.origin.y, WIDTH - 20, 30);
+    };
+    model.preferredStatusBarStyle = UIStatusBarStyleLightContent;
+    model.privacyNavBackImage = [UIImage imageNamed:@"arrowLeft"];
+    NSArray *boxImages = [NSArray arrayWithObjects:[UIImage imageNamed:@"unchoose"],[UIImage imageNamed:@"choose"], nil];
+    model.checkBoxImages = boxImages;
+    
+    model.privacyColors = @[UIColor.blackColor, UIColorFromRGB(0x2ABED1)];
+    model.privacyAlignment = NSTextAlignmentCenter;
+    model.privacyFont = [UIFont fontWithName:@"PingFangSC-Regular" size:13.0];
+    model.privacyOperatorPreText = @"《";
+    model.privacyOperatorSufText = @"》";
+    model.privacyPreText = @"已阅读并同意";
+    
+    NSString *onePrivacy = [NSString stringWithFormat:@"%@jyapp/free/staticPage/permission_rules.html",kHost];
+    NSString *twoPrivacy = [NSString stringWithFormat:@"%@/jyapp/free/staticPage/privacy_rules.html",kHost];
+    model.privacyOne = [NSArray arrayWithObjects:@"《使用协议》",onePrivacy,nil];
+    model.privacyTwo = [NSArray arrayWithObjects:@"《隐私政策》",twoPrivacy, nil];
+    [[TXCommonHandler sharedInstance] getLoginTokenWithTimeout:3.0 controller:self model:model complete:^(NSDictionary * _Nonnull resultDic) {
+//        NSLog(@"一键登录结果：%@", resultDic);
+        NSString *code = [resultDic objectForKey:@"resultCode"];
+        if ([PNSCodeLoginControllerPresentSuccess isEqualToString:code]) {
+            NSLog(@"弹起授权页成功");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getLoginCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getLoginCallback"];
+        } else if ([PNSCodeLoginControllerClickCancel isEqualToString:code]) {
+            NSLog(@"点击了授权页的返回");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getLoginCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getLoginCallback"];
+        } else if ([PNSCodeLoginControllerClickChangeBtn isEqualToString:code]) {
+            NSLog(@"点击切换其他登录方式按钮");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getLoginCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getLoginCallback"];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
+            });
+        } else if ([PNSCodeLoginControllerClickLoginBtn isEqualToString:code]) {
+            if ([[resultDic objectForKey:@"isChecked"] boolValue] == YES) {
+                NSLog(@"已勾选···点击登录···");
+            } else {
+                NSLog(@"未勾选···点击登录···");
+            }
+        } else if ([PNSCodeLoginControllerClickCheckBoxBtn isEqualToString:code]) {
+            NSLog(@"点击check box");
+        } else if ([PNSCodeLoginControllerClickProtocol isEqualToString:code]) {
+            NSLog(@"点击了协议富文本");
+        } else if ([PNSCodeSuccess isEqualToString:code]) {
+            //点击登录按钮获取登录Token成功回调
+            [self isExitCallToJS:[NSString stringWithFormat:@"getLoginCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getLoginCallback"];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
+            });
+        } else {
+            NSLog(@"获取登录Token失败");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getLoginCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getLoginCallback"];
+        }
+    }];
+}
+
+
+-(void)jsGetPhoneBind:(NSDictionary *)dict {
+    TXCustomModel *model = [[TXCustomModel alloc] init];
+    model.supportedInterfaceOrientations = UIInterfaceOrientationMaskPortrait;
+    //导航栏配置
+    model.navColor = UIColor.whiteColor;
+    NSDictionary *attributes = @{
+        NSForegroundColorAttributeName : [UIColor blackColor],
+        NSFontAttributeName : [UIFont systemFontOfSize:18.0]
+    };
+    model.navTitle = [[NSAttributedString alloc] initWithString:@"绑定手机号" attributes:attributes];
+    model.navBackImage = [UIImage imageNamed:@"arrowLeft"];
+    
+    //logo配置
+    model.logoIsHidden = YES;
+//    model.logoImage = [UIImage imageNamed:@""];
+//    model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+//        return CGRectMake((WIDTH-80)*0.5, 30, 80, 80);
+//    };
+    model.numberColor = UIColorFromRGB(0x171826);
+    model.numberFont = [UIFont systemFontOfSize:24.0];
+    model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 110+30;
+        return frame;
+    };
+    model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 150+30;
+        return frame;
+    };
+    
+    model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键绑定手机号" attributes:@{NSForegroundColorAttributeName : UIColor.whiteColor,NSFontAttributeName : [UIFont systemFontOfSize:18.0]}];
+    NSArray *BtnBgImgs = [NSArray arrayWithObjects:[UIImage imageNamed:@"authbtn_nor"],[UIImage imageNamed:@"authbtn_dis"],[UIImage imageNamed:@"authbtn_nor"], nil];
+    model.loginBtnBgImgs = BtnBgImgs;
+    
+    
+    model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"绑定其他手机号" attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0x2ABED1),NSFontAttributeName : [UIFont systemFontOfSize:16.0]}];
+    model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        return CGRectMake(10, frame.origin.y, WIDTH - 20, 30);
+    };
+    
+
+    model.preferredStatusBarStyle = UIStatusBarStyleLightContent;
+    model.privacyNavBackImage = [UIImage imageNamed:@"arrowLeft"];
+    NSArray *boxImages = [NSArray arrayWithObjects:[UIImage imageNamed:@"unchoose"],[UIImage imageNamed:@"choose"], nil];
+    model.checkBoxImages = boxImages;
+    
+    model.privacyColors = @[UIColor.blackColor, UIColorFromRGB(0x2ABED1)];
+    model.privacyAlignment = NSTextAlignmentCenter;
+    model.privacyFont = [UIFont fontWithName:@"PingFangSC-Regular" size:13.0];
+    model.privacyOperatorPreText = @"《";
+    model.privacyOperatorSufText = @"》";
+    model.privacyPreText = @"已阅读并同意";
+    
+    [[TXCommonHandler sharedInstance] getLoginTokenWithTimeout:3.0 controller:self model:model complete:^(NSDictionary * _Nonnull resultDic) {
+//        NSLog(@"一键登录结果：%@", resultDic);
+        NSString *code = [resultDic objectForKey:@"resultCode"];
+        if ([PNSCodeLoginControllerPresentSuccess isEqualToString:code]) {
+            NSLog(@"弹起授权页成功");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getPhoneBindCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getPhoneBindCallback"];
+        } else if ([PNSCodeLoginControllerClickCancel isEqualToString:code]) {
+            NSLog(@"点击了授权页的返回");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getPhoneBindCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getPhoneBindCallback"];
+        } else if ([PNSCodeLoginControllerClickChangeBtn isEqualToString:code]) {
+            NSLog(@"点击切换其他登录方式按钮");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getPhoneBindCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getPhoneBindCallback"];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
+            });
+        } else if ([PNSCodeLoginControllerClickLoginBtn isEqualToString:code]) {
+            if ([[resultDic objectForKey:@"isChecked"] boolValue] == YES) {
+                NSLog(@"已勾选···点击登录···");
+            } else {
+                NSLog(@"未勾选···点击登录···");
+            }
+        } else if ([PNSCodeLoginControllerClickCheckBoxBtn isEqualToString:code]) {
+            NSLog(@"点击check box");
+        } else if ([PNSCodeLoginControllerClickProtocol isEqualToString:code]) {
+            NSLog(@"点击了协议富文本");
+        } else if ([PNSCodeSuccess isEqualToString:code]) {
+            //点击登录按钮获取登录Token成功回调
+            NSString *token = [resultDic objectForKey:@"token"];
+            NSLog(@"成功获取Token:%@",token);
+            [self isExitCallToJS:[NSString stringWithFormat:@"getPhoneBindCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getPhoneBindCallback"];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
+            });
+        } else {
+            NSLog(@"获取登录Token失败");
+            [self isExitCallToJS:[NSString stringWithFormat:@"getPhoneBindCallback('%@')",[self convertToJsonData:resultDic]] withMethodName:@"getPhoneBindCallback"];
+        }
+    }];
+}
+
 
 
 #pragma mark   *****其他方法

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -144,7 +144,7 @@
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>LaunchScreen.storyboard</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>