修改支付造成个别的问题

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -121,9 +121,9 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"https://web-jydev-wcj.jianyu360.cn/"//王传近
 
-//#define kHost @"https://app-jytest.jianyu360.cn/"//新测试
+#define kHost @"https://app-jytest.jianyu360.cn/"//新测试
 
-#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
+//#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
 //1453.5 854
 
 //#define kHost @"https://app1.jianyu360.com/"//弃用

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYExpViewController.m

@@ -57,6 +57,12 @@ JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
 JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 
+
+//支付相关
+JSExportAs(wxPay, -(void)jsWxPay:(NSString *)jsonString);
+
+JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
+
 @end
 
 
@@ -1032,6 +1038,47 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 
 
+#pragma mark  支付相关
+
+-(void)jsWxPay:(NSString *)jsonString
+{
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先安装微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&err];
+    if(err) {
+        NSLog(@"json解析失败：%@",err);
+        return;
+    }
+    //吊起微信
+    PayReq *request = [[PayReq alloc] init] ;
+    request.openID = dic[@"Appid"];
+    request.partnerId = dic[@"Partnerid"];
+    request.prepayId= dic[@"Prepayid"];
+    request.package = @"Sign=WXPay";
+    request.nonceStr= dic[@"Noncestr"];
+    request.timeStamp= [dic[@"Timestamp"] intValue];
+    request.sign= dic[@"Sign"];
+    
+    kMainQueue(^{
+        [WXApi sendReq:request];
+    });
+}
+-(void)jsAliPay:(NSString*)str
+{
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
+}
+
+
+
 
 /*
  #pragma mark - Navigation

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYMineViewController.m

@@ -55,6 +55,14 @@ JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
 JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 
+
+//支付相关
+JSExportAs(wxPay, -(void)jsWxPay:(NSString *)jsonString);
+
+JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
+
+
+
 @end
 
 
@@ -1062,6 +1070,50 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 
 
+
+#pragma mark  支付相关
+
+-(void)jsWxPay:(NSString *)jsonString
+{
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先安装微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&err];
+    if(err) {
+        NSLog(@"json解析失败：%@",err);
+        return;
+    }
+    //吊起微信
+    PayReq *request = [[PayReq alloc] init] ;
+    request.openID = dic[@"Appid"];
+    request.partnerId = dic[@"Partnerid"];
+    request.prepayId= dic[@"Prepayid"];
+    request.package = @"Sign=WXPay";
+    request.nonceStr= dic[@"Noncestr"];
+    request.timeStamp= [dic[@"Timestamp"] intValue];
+    request.sign= dic[@"Sign"];
+    
+    kMainQueue(^{
+        [WXApi sendReq:request];
+    });
+}
+-(void)jsAliPay:(NSString*)str
+{
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
+}
+
+
+
+
+
 /*
  #pragma mark - Navigation
  

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYSearchViewController.m

@@ -272,8 +272,6 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
                 AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
                 JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
                 tab.selectedIndex = 1;
-                
-                
                 [self performSelector:@selector(pushDY:) withObject:self.notiDict[@"info"] afterDelay:1];
                 
             }else {
@@ -438,7 +436,19 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
         url =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
         [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
         [[NSNotificationCenter defaultCenter] postNotificationName:@"kNewWebControllerDismiss" object:nil];
-        //
+        
+    }else if ([infoDict[@"type"] isEqualToString:@"titleMessage"]) {
+        //新增支付 后台唤起
+        
+        NSArray * array = [urlStr componentsSeparatedByString:@"=="];
+        urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        NSString * titleStr = @"消息通知";
+        titleStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"title"]];
+        if (urlStr) {
+            if(self.tabBarController.selectedIndex == 0) {
+                [self jsOpenExternalLink:urlStr title:titleStr];
+            }
+        }
     }else {
         NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
         url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -724,8 +734,7 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
 
 #pragma mark  webView代理方法
 - (void)webViewDidFinishLoad:(UIWebView *)webView{
-    
-    
+
     NSLog(@"加载完成：%@",[self.webView stringByEvaluatingJavaScriptFromString:@"document.location.href"]);
     
     if(!notiFinish) {
@@ -739,8 +748,6 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
         [self judgeIsHidden];//是否隐藏
     }
     
-    
-    
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
     JSContext *context = [webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
@@ -757,12 +764,7 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
         //        [context evaluateScript:@"afterOpenPushMessage()"];
         [context evaluateScript:[NSString stringWithFormat:@"afterOpenPushMessage('%d')", [self jsIsCanBack:nil]]];
     }
-    
-    
-    
-    
-    
-    
+
 }
 
 

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYSubViewController.m

@@ -37,19 +37,20 @@ JSExportAs(getCipherText, -(NSString *)jsGGetCipherText:(NSString *)phone);
 
 JSExportAs(business, -(NSInteger)jsBusiness:(NSInteger)shooID shopType:(NSInteger )shopType);
 
-JSExportAs(loginSuccess, -(void)jsLoginSuccess:(NSString*)status);
 
+//新增
+JSExportAs(hiddenBottom, -(void)jsHiddenBottom:(NSString*)hidden);
+JSExportAs(loginSuccess, -(void)jsLoginSuccess:(NSString*)status);
 JSExportAs(backUrl, -(void)jsBackUrl:(NSString*)str);
 
 JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
 JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
-
-
-
-
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
 
+//支付相关
+JSExportAs(wxPay, -(void)jsWxPay:(NSString *)jsonString);
+JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
 
 @end
 
@@ -1024,6 +1025,47 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 }
 
 
+
+#pragma mark  支付相关
+
+-(void)jsWxPay:(NSString *)jsonString
+{
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先安装微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&err];
+    if(err) {
+        NSLog(@"json解析失败：%@",err);
+        return;
+    }
+    //吊起微信
+    PayReq *request = [[PayReq alloc] init] ;
+    request.openID = dic[@"Appid"];
+    request.partnerId = dic[@"Partnerid"];
+    request.prepayId= dic[@"Prepayid"];
+    request.package = @"Sign=WXPay";
+    request.nonceStr= dic[@"Noncestr"];
+    request.timeStamp= [dic[@"Timestamp"] intValue];
+    request.sign= dic[@"Sign"];
+    
+    kMainQueue(^{
+        [WXApi sendReq:request];
+    });
+}
+-(void)jsAliPay:(NSString*)str
+{
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
+}
+
+
 /*
  #pragma mark - Navigation