no message

Dolphins/Classes/Goods/Controller/ZJGoodsViewController.m

@@ -273,22 +273,34 @@
     
     [self.xuanZheButoon addTarget:self action:@selector(xuanZheButoonClick:) forControlEvents:UIControlEventTouchUpInside];
     
+    
+    UILabel * lab = [UILabel labelWithtext:@"购买前请先阅读并同意" font:[UIFont systemFontOfSize:KFont(13)] textColor:[UIColor colorWithHex:0x666666] alignment:NSTextAlignmentLeft];
+    [lab sizeToFit];
+    lab.userInteractionEnabled = YES;
+    [self.beiJingView addSubview:lab];
+    [lab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.xuanZheButoon.mas_right).mas_offset(KScaleWidth(5));
+        make.centerY.equalTo(self.xuanZheButoon).mas_offset(KScaleWidth(0));
+        make.size.mas_equalTo(lab.size);
+    }];
+    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(protocolTextGesTap)];
+    [lab addGestureRecognizer:tap];
+    
     //同意Button
     self.tongYButton = [UIButton buttonWithType:UIButtonTypeCustom];
     //    self.tongYButton.backgroundColor = [UIColor redColor];
     self.tongYButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
-    [self.tongYButton setTitle:@"购买前请先阅读并同意《海豚守护付费会员服务协议》" forState:0];
-    [self.tongYButton setTitleColor:[UIColor colorWithHex:0x666666] forState:UIControlStateNormal];
+    [self.tongYButton setTitle:@"《海豚守护付费会员服务协议》" forState:0];
+    [self.tongYButton setTitleColor:kColorWithRGB(86, 142, 252) forState:UIControlStateNormal];
     [self.tongYButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(13)]];
     self.tongYButton.titleLabel.adjustsFontSizeToFitWidth = YES;
     [self.beiJingView addSubview:self.tongYButton];
     [self.tongYButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.xuanZheButoon.mas_right).mas_offset(KScaleWidth(5));
+        make.left.equalTo(lab.mas_right).mas_offset(KScaleWidth(0));
         make.centerY.equalTo(self.xuanZheButoon).mas_offset(KScaleWidth(0));
-        make.size.mas_offset(CGSizeMake(KScaleWidth(300), KScaleWidth(12.5)));
+        make.size.mas_offset(CGSizeMake(KScaleWidth(200), KScaleWidth(12.5)));
     }];
-    //    [self.tongYButton addTarget:self action:@selector(tongYButtonClick) forControlEvents:UIControlEventTouchUpInside];
-    
+    [self.tongYButton addTarget:self action:@selector(protocolButoonClick:) forControlEvents:UIControlEventTouchUpInside];
 }
 
 - (void)fanHuiButtonClick{
@@ -383,10 +395,22 @@
     }
 }
 
+- (void)protocolTextGesTap{
+    [self xuanZheButoonClick:nil];
+}
+
 - (void)xuanZheButoonClick:(UIButton *)btn{
+    btn = self.xuanZheButoon;
     btn.selected = !btn.selected;
 }
 
+- (void)protocolButoonClick:(UIButton *)btn{
+    NSDictionary * dic = [ZJUserInfoManager shared].h5_url;
+    BaseWebViewController * web = [[BaseWebViewController alloc] init];
+    web.url = [dic objectForKey:@"pay"];
+    [self.navigationController pushViewController:web animated:YES];
+}
+
 -(void)getIpaList {
     __weak typeof(self) weakSelf = self;
     [[TQNetworkTools shared]getWithAction:PaymentConfiguration parameters:@{} success:^(id  _Nonnull response) {

Dolphins/Classes/Guard/Controller/ZJGuardViewController.m

@@ -135,17 +135,6 @@
 //        return;
 //    }
 
-    if(![ZJUserInfoManager shared].userInfoModel.isMember){
-        [[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
-            [[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
-
-            } failure:^(id _Nonnull error) {
-
-            }];
-        }];
-        return;
-    }
-
     switch (sender.tag-0x64) {
         case 0:{
             [MobClick event:@"friends_location_card_click"];
@@ -158,12 +147,36 @@
         }
             break;
         case 1:{
+            
+            if(![ZJUserInfoManager shared].userInfoModel.isMember){
+                [[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
+                    [[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
+
+                    } failure:^(id _Nonnull error) {
+
+                    }];
+                }];
+                return;
+            }
+            
             [MobClick event:@"place_remind_card_click"];
             ZJLocationAttentionVC * vc = [ZJLocationAttentionVC new];
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
         case 2:{
+            
+            if(![ZJUserInfoManager shared].userInfoModel.isMember){
+                [[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
+                    [[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
+
+                    } failure:^(id _Nonnull error) {
+
+                    }];
+                }];
+                return;
+            }
+            
             [MobClick event:@"low_power_card_click"];
             ZJElectricalRemindVC * remind = [[UIStoryboard storyboardWithName:@"Guard" bundle:nil] instantiateViewControllerWithIdentifier:@"ZJElectricalRemindVC"];
             [self.navigationController pushViewController:remind animated:YES];

Dolphins/Classes/Tools/GoodsManager/ZJGoodsMagager.m

@@ -80,7 +80,7 @@ static ZJGoodsMagager * manager;
 
 - (void)goodsWithVC:(UIViewController *)currentVC callBack:(resultCallBack)callBack{
     
-//    if ([self ckeak]){
+    if ([self ckeak]){
         
         [MobClick event:@"go_member_with_Apple"];
         ZJGoodsViewController *goods = [[ZJGoodsViewController alloc] init];
@@ -93,18 +93,18 @@ static ZJGoodsMagager * manager;
             [weak.navigationController popViewControllerAnimated:YES];
         };
         
-//    }else{
-//        [MobClick event:@"go_member_with_H5"];
-//        _tradeNoCount = 0;
-//        _goodsCount = 0;
-//        _callBack = callBack;
-//        _currentVC = currentVC;
-//        if ([self.products firstObject]) {
-//            [self getUrl_new:0];
-//        }else{
-//            [self getGoods];
-//        }
-//    }
+    }else{
+        [MobClick event:@"go_member_with_H5"];
+        _tradeNoCount = 0;
+        _goodsCount = 0;
+        _callBack = callBack;
+        _currentVC = currentVC;
+        if ([self.products firstObject]) {
+            [self getUrl_new:0];
+        }else{
+            [self getGoods];
+        }
+    }
 }
 
 - (void)getGoods{

Dolphins/Classes/Tools/PCH/ResourceHeader.pch

@@ -19,7 +19,7 @@
 
 #define AppLs @"ed32f8b2bd3e7e58"
 
-#define ShanYanAppID @"CiuaRN4D" //创蓝appid
+#define ShanYanAppID @"DVcuQ8Or" //创蓝appid
 
 #define WXAppId @"wxe24b15232c28e77c"
 #define WXUniversalLink @"https://www.wayaya.info/dolphins/"
@@ -37,14 +37,14 @@
 
 //#if DEBUG
 //
-#define ServerReport   @"http://report.zhangxinhulian.com"
-#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
-#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
+//#define ServerReport   @"http://report.zhangxinhulian.com"
+//#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
+//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
 
 //#else
 
-//#define ServerReport   @"http://report.zhangxinhulian.com"
-//#define ServerHost     @"https://feedapi.zhangxinhulian.com"
-//#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
+#define ServerReport   @"http://report.zhangxinhulian.com"
+#define ServerHost     @"https://feedapi.zhangxinhulian.com"
+#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
 
 //#endif