中经联盟v2.2.2

ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -2673,6 +2673,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2787,6 +2788,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -49,34 +49,34 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "AB050733-677C-4F0B-839B-B5343C5C5C6B - 31c83d63b63a514e"
+                  uuid = "AB050733-677C-4F0B-839B-B5343C5C5C6B - 88d54e10e5f3c3e9"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "-[newsDetailVController collectionClick:]"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "247"
                   endingLineNumber = "247"
-                  offsetFromSymbolStart = "1892">
+                  offsetFromSymbolStart = "2219">
                </Location>
                <Location
-                  uuid = "AB050733-677C-4F0B-839B-B5343C5C5C6B - ec794e4297ddce6b"
+                  uuid = "AB050733-677C-4F0B-839B-B5343C5C5C6B - 55643d31c4145ccc"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "__41-[newsDetailVController collectionClick:]_block_invoke_3"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "248"
                   endingLineNumber = "248"
-                  offsetFromSymbolStart = "72">
+                  offsetFromSymbolStart = "51">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -126,8 +126,8 @@
             timestampString = "595241105.4388469"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "273"
-            endingLineNumber = "273"
+            startingLineNumber = "276"
+            endingLineNumber = "276"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -455,34 +455,34 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "AFFEED44-1771-4400-BCBB-1C34667484A4 - 6e190d735f3baca4"
+                  uuid = "AFFEED44-1771-4400-BCBB-1C34667484A4 - cc44b2a13edfb5d7"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "-[OrderPayViewController payBtnClik:]"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/OrderPayViewController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/OrderPayViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "178"
                   endingLineNumber = "178"
-                  offsetFromSymbolStart = "1488">
+                  offsetFromSymbolStart = "1536">
                </Location>
                <Location
-                  uuid = "AFFEED44-1771-4400-BCBB-1C34667484A4 - 80a59aa185f57d82"
+                  uuid = "AFFEED44-1771-4400-BCBB-1C34667484A4 - 22f82573e41164f1"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "__37-[OrderPayViewController payBtnClik:]_block_invoke_3"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/OrderPayViewController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/OrderPayViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "178"
                   endingLineNumber = "178"
-                  offsetFromSymbolStart = "16">
+                  offsetFromSymbolStart = "12">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -793,34 +793,34 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "647E6838-D4CE-4B4E-95F8-16B8863927BF - 8110d3943f68003"
+                  uuid = "647E6838-D4CE-4B4E-95F8-16B8863927BF - 98c390ccb0ecaf27"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "-[personalModifyController commitBtnClick:]"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "487"
                   endingLineNumber = "487"
-                  offsetFromSymbolStart = "1052">
+                  offsetFromSymbolStart = "1003">
                </Location>
                <Location
-                  uuid = "647E6838-D4CE-4B4E-95F8-16B8863927BF - a3a46c95a0d79196"
+                  uuid = "647E6838-D4CE-4B4E-95F8-16B8863927BF - 3376f16053cdbeb2"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "__43-[personalModifyController commitBtnClick:]_block_invoke"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "487"
                   endingLineNumber = "487"
-                  offsetFromSymbolStart = "16">
+                  offsetFromSymbolStart = "12">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -857,34 +857,34 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "22D316D8-2A7E-4F5E-8004-C81561A8CBF7 - 6ab70bb40ddac773"
+                  uuid = "22D316D8-2A7E-4F5E-8004-C81561A8CBF7 - fa659641fec0e857"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "-[personalModifyController imagePickerController:didFinishPickingMediaWithInfo:]"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "460"
                   endingLineNumber = "460"
-                  offsetFromSymbolStart = "740">
+                  offsetFromSymbolStart = "729">
                </Location>
                <Location
-                  uuid = "22D316D8-2A7E-4F5E-8004-C81561A8CBF7 - 8c3eb352bc50bc4"
+                  uuid = "22D316D8-2A7E-4F5E-8004-C81561A8CBF7 - 981176c0d8df24e0"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "__80-[personalModifyController imagePickerController:didFinishPickingMediaWithInfo:]_block_invoke.425"
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
+                  urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/me(%E6%88%91%E7%9A%84)/controller/personalModifyController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "461"
                   endingLineNumber = "461"
-                  offsetFromSymbolStart = "96">
+                  offsetFromSymbolStart = "100">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -1183,8 +1183,8 @@
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "419"
-            endingLineNumber = "419"
+            startingLineNumber = "422"
+            endingLineNumber = "422"
             landmarkName = "-OrderToClick:"
             landmarkType = "7">
          </BreakpointContent>

ZhongJingLianMeng/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>weixin</string>

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.m

@@ -17,6 +17,8 @@
 #import "eventActivityVController.h"
 #import "OrderAirportPayCancelView.h"
 #import "joinAllianceVController.h"
+#import "VIPXuFeiController.h"
+#import "applyForDirectorController.h"
 @interface activityDetailVController ()<ZLCWebViewDelegate>
 @property (nonatomic, strong) ZLCWebView *webView;
 @property(nonatomic,strong) JSContext *jsContext;
@@ -26,6 +28,7 @@
 @property(nonatomic,strong)NSString *collectionStaus;
 @property(nonatomic,strong)UserInfoModel *userInfoModel;
 @property (strong, nonatomic) OrderAirportPayCancelView *cancelView;
+@property (strong, nonatomic) OrderAirportPayCancelView *vipContinueView;
 @end
 @implementation activityDetailVController
 - (HttpRequestManger*) sessionManager{
@@ -451,6 +454,37 @@
     return _cancelView;
 }
 
+
+- (OrderAirportPayCancelView*)vipContinueView{
+    WS(weakSelf);
+    if (!_vipContinueView) {
+        _vipContinueView = [[NSBundle mainBundle]loadNibNamed:@"OrderAirportPayCancelView" owner:self options:nil].firstObject;
+        _vipContinueView.frame = self.view.bounds;
+        //        _cancelView.isFromOrder = self.isFromOrder;
+        _vipContinueView.tipLabel.hidden = YES;
+        _vipContinueView.contentLabel.hidden = YES;
+        _vipContinueView.titleLabel.text = @"您的会员已经到期";
+        _vipContinueView.titleLabelTop.constant = 35;
+        [_vipContinueView.rightBtn setBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+        [_vipContinueView.leftBtn setTitle:@"待会再说" forState:UIControlStateNormal];
+        [_vipContinueView.rightBtn setTitle:@"申请续费" forState:UIControlStateNormal];
+        
+        _vipContinueView.leftBtnCallback = ^{
+             [weakSelf.cancelView removeFromSuperview];
+        };
+        _vipContinueView.rightBtnCallback = ^{
+            if ([weakSelf.userInfoModel.level isEqualToString:@"3"]){
+                applyForDirectorController *applyFor = [[applyForDirectorController alloc]init];
+               applyFor.model = self.userInfoModel;
+               [self.navigationController pushViewController:applyFor animated:YES];
+            }else{
+                VIPXuFeiController *control = [[VIPXuFeiController alloc] init];
+                [weakSelf.navigationController pushViewController:control animated:YES];
+            }
+        };
+    }
+    return _vipContinueView;
+}
 -(void)isSpeicialStatus{
     kWeakSelf(self);
        
@@ -467,17 +501,26 @@
            NSDictionary *dic = [response objectForKeySafely:@"memberInfo"];
            
            weakself.userInfoModel = [UserInfoModel mj_objectWithKeyValues:dic];
-           if ([weakself.userInfoModel.level isEqualToString:@"1"]||[weakself.userInfoModel.level isEqualToString:@"2"]||[weakself.userInfoModel.level isEqualToString:@"3"]){
-               
-               //是会员的话 走 loadActivityStatus 方法
-               [self loadActivityStatus];
+           //判断是否会员到期
+           if ([weakself.userInfoModel.term isEqualToString:@"2"]){
                
-           }else{
-              //弹窗
                UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
-                                  
-             [window addSubview: weakself.cancelView];
+                                    
+               [window addSubview: weakself.vipContinueView];
+           }else{
+               if ([weakself.userInfoModel.level isEqualToString:@"1"]||[weakself.userInfoModel.level isEqualToString:@"2"]||[weakself.userInfoModel.level isEqualToString:@"3"]){
+                             
+                             //是会员的话 走 loadActivityStatus 方法
+                             [self loadActivityStatus];
+                             
+                         }else{
+                            //弹窗
+                             UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+                                                
+                           [window addSubview: weakself.cancelView];
+                         }
            }
+          
          
        } failure:^(NSError *error) {
            NSLog(@"%@",error);