yangguanglei 5 years ago
parent
commit
c18c564610
23 changed files with 797 additions and 20 deletions
  1. 16 0
      ZhongJingLianMeng.xcodeproj/project.pbxproj
  2. BIN
      ZhongJingLianMeng.xcworkspace/xcuserdata/vindesel.xcuserdatad/UserInterfaceState.xcuserstate
  3. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/Contents.json
  4. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/VipLishi@2x.png
  5. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/VipLishi@3x.png
  6. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@2x.png
  7. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@3x.png
  8. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/Contents.json
  9. 8 0
      ZhongJingLianMeng/Info.plist
  10. 1 1
      ZhongJingLianMeng/main/home(首页)/VipBenefitsController.m
  11. 1 1
      ZhongJingLianMeng/main/me(我的)/controller/BaseWebController.h
  12. 3 0
      ZhongJingLianMeng/main/me(我的)/controller/BaseWebController.m
  13. 93 3
      ZhongJingLianMeng/main/me(我的)/controller/MyJoinViewController.m
  14. 13 0
      ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.h
  15. 133 0
      ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.m
  16. 347 0
      ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.xib
  17. 90 5
      ZhongJingLianMeng/main/me(我的)/controller/mineViewController.m
  18. 3 3
      ZhongJingLianMeng/main/me(我的)/controller/personInfoViewController.m
  19. 6 6
      ZhongJingLianMeng/main/me(我的)/controller/personalModifyController.m
  20. 20 0
      ZhongJingLianMeng/main/me(我的)/model/MyJoinModel.h
  21. 13 0
      ZhongJingLianMeng/main/me(我的)/model/MyJoinModel.m
  22. 3 0
      ZhongJingLianMeng/main/me(我的)/model/UserInfoModel.h
  23. 3 1
      ZhongJingLianMeng/prefixHeader/AllUrl.h

+ 16 - 0
ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -89,6 +89,9 @@
 		9C5962A121B52685001FED0A /* UserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A021B52685001FED0A /* UserInfoModel.m */; };
 		9C5962A421B536BA001FED0A /* MemberDemandModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A321B536BA001FED0A /* MemberDemandModel.m */; };
 		9C5962B321BA4F8E001FED0A /* OrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962B221BA4F8E001FED0A /* OrderListModel.m */; };
+		9C5962B621BE56AB001FED0A /* MyJoinModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962B521BE56AB001FED0A /* MyJoinModel.m */; };
+		9C5962BA21BE6AF1001FED0A /* VIPXuFeiController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962B821BE6AF1001FED0A /* VIPXuFeiController.m */; };
+		9C5962BB21BE6AF1001FED0A /* VIPXuFeiController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C5962B921BE6AF1001FED0A /* VIPXuFeiController.xib */; };
 		CC140BF221B911FC00AFE57C /* activityDetailVController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC140BF121B911FC00AFE57C /* activityDetailVController.m */; };
 		CC140BF321B9235600AFE57C /* BaseWebController.h in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A821B8E9F0001FED0A /* BaseWebController.h */; };
 		CC140BF421B9236100AFE57C /* activityModel.h in Sources */ = {isa = PBXBuildFile; fileRef = CC265F1C21A262FD002EDBEC /* activityModel.h */; };
@@ -355,6 +358,11 @@
 		9C5962AF21B907C9001FED0A /* MyActivityModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyActivityModel.m; sourceTree = "<group>"; };
 		9C5962B121BA4F8E001FED0A /* OrderListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OrderListModel.h; sourceTree = "<group>"; };
 		9C5962B221BA4F8E001FED0A /* OrderListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OrderListModel.m; sourceTree = "<group>"; };
+		9C5962B421BE56AB001FED0A /* MyJoinModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyJoinModel.h; sourceTree = "<group>"; };
+		9C5962B521BE56AB001FED0A /* MyJoinModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyJoinModel.m; sourceTree = "<group>"; };
+		9C5962B721BE6AF1001FED0A /* VIPXuFeiController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VIPXuFeiController.h; sourceTree = "<group>"; };
+		9C5962B821BE6AF1001FED0A /* VIPXuFeiController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VIPXuFeiController.m; sourceTree = "<group>"; };
+		9C5962B921BE6AF1001FED0A /* VIPXuFeiController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VIPXuFeiController.xib; sourceTree = "<group>"; };
 		9C72715F3CD527BAF99561AD /* Pods-ZhongJingLianMeng.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZhongJingLianMeng.release.xcconfig"; path = "Pods/Target Support Files/Pods-ZhongJingLianMeng/Pods-ZhongJingLianMeng.release.xcconfig"; sourceTree = "<group>"; };
 		B49C007A967360A581DE648D /* libPods-ZhongJingLianMeng.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZhongJingLianMeng.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC140BF021B911FC00AFE57C /* activityDetailVController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = activityDetailVController.h; sourceTree = "<group>"; };
@@ -673,6 +681,9 @@
 				CC1CE969219BCF63004F8F79 /* mineViewController.h */,
 				CC1CE96A219BCF63004F8F79 /* mineViewController.m */,
 				9C216302219C071500FAFE94 /* mineViewController.xib */,
+				9C5962B721BE6AF1001FED0A /* VIPXuFeiController.h */,
+				9C5962B821BE6AF1001FED0A /* VIPXuFeiController.m */,
+				9C5962B921BE6AF1001FED0A /* VIPXuFeiController.xib */,
 				9C216304219D195E00FAFE94 /* personInfoViewController.h */,
 				9C216305219D195E00FAFE94 /* personInfoViewController.m */,
 				9C216306219D195E00FAFE94 /* personInfoViewController.xib */,
@@ -759,6 +770,8 @@
 				9C5962AF21B907C9001FED0A /* MyActivityModel.m */,
 				9C5962B121BA4F8E001FED0A /* OrderListModel.h */,
 				9C5962B221BA4F8E001FED0A /* OrderListModel.m */,
+				9C5962B421BE56AB001FED0A /* MyJoinModel.h */,
+				9C5962B521BE56AB001FED0A /* MyJoinModel.m */,
 			);
 			path = model;
 			sourceTree = "<group>";
@@ -1466,6 +1479,7 @@
 				9C21630F219D3AD000FAFE94 /* BirthdaySelectionView.xib in Resources */,
 				CC1CE9CD219BED3B004F8F79 /* 1.png in Resources */,
 				9C21637F21A24E6F00FAFE94 /* VipBenefitsController.xib in Resources */,
+				9C5962BB21BE6AF1001FED0A /* VIPXuFeiController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1567,8 +1581,10 @@
 				CC265F1A21A262A7002EDBEC /* activityCell.m in Sources */,
 				9C21635D219EB80300FAFE94 /* MemberDemandController.m in Sources */,
 				CC274DDB21B5000500F3800F /* ZLCWebView.m in Sources */,
+				9C5962B621BE56AB001FED0A /* MyJoinModel.m in Sources */,
 				9C216359219EB7F000FAFE94 /* MyOrderViewController.m in Sources */,
 				9C21635A219EB7F000FAFE94 /* MyJoinViewController.m in Sources */,
+				9C5962BA21BE6AF1001FED0A /* VIPXuFeiController.m in Sources */,
 				9C21635B219EB7F000FAFE94 /* MyActivityController.m in Sources */,
 				9C21639521A2937F00FAFE94 /* VipDemandController.m in Sources */,
 				9C21635C219EB7F000FAFE94 /* MyCollectController.m in Sources */,

BIN
ZhongJingLianMeng.xcworkspace/xcuserdata/vindesel.xcuserdatad/UserInterfaceState.xcuserstate


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/Contents.json

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

BIN
ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/VipLishi@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/VipLishi.imageset/VipLishi@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/Contents.json

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

+ 8 - 0
ZhongJingLianMeng/Info.plist

@@ -27,6 +27,14 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>此App需要修改头像或者上传文件时访问您的相机权限,是否允许访问?</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>此App需要在修改头像和上传文件的时访问你的相册权限,是否允许?</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>此App需要在修改头像和上传文件的时访问你的相册权限,是否允许?</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>需要使用麦克风发送语音片段</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

+ 1 - 1
ZhongJingLianMeng/main/home(首页)/VipBenefitsController.m

@@ -76,7 +76,7 @@
     // Dispose of any resources that can be recreated.
 }
 - (IBAction)commitBtn:(id)sender {
-    [ToastView showToast:@"根据情况判断跳转~"];
+//    [ToastView showToast:@"根据情况判断跳转~"];
     
     if ([self.UserInfoModel.level isEqualToString:@"0"]) {
         //游客身份

+ 1 - 1
ZhongJingLianMeng/main/me(我的)/controller/BaseWebController.h

@@ -10,7 +10,7 @@
 
 @interface BaseWebController : UIViewController
 @property (nonatomic, copy) NSString *H5Url;
-//1:关于
+//1:关于 2:会员标准
 @property (nonatomic, copy) NSString *type;
 @property (nonatomic, copy) NSString *titleName;
 @property (nonatomic, copy) NSString *teamId;

+ 3 - 0
ZhongJingLianMeng/main/me(我的)/controller/BaseWebController.m

@@ -36,6 +36,9 @@
         _commitBtn.titleLabel.font = [UIFont systemFontOfSize:14];
         [_commitBtn addTarget:self action:@selector(commitBtnClick:) forControlEvents:UIControlEventTouchUpInside];
         [ self.BGView addSubview:_commitBtn];
+    }else if ([self.type isEqualToString:@"2"]){
+        DebugLog(@"不显示按钮");
+        [self.navigationView setTitle:self.titleName];
     }
     CGFloat viewHeight;
     if (kIs_iPhoneX) {

+ 93 - 3
ZhongJingLianMeng/main/me(我的)/controller/MyJoinViewController.m

@@ -10,6 +10,7 @@
 #import "HttpRequestManger.h"
 #import "JoinOrActivityCell.h"
 #import "OrderListEmptyView.h"
+#import "MyJoinModel.h"
 
 @interface MyJoinViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
@@ -20,6 +21,12 @@
 @property (nonatomic, strong) NSMutableArray *ListDataSource;
 @property (strong, nonatomic) HttpRequestManger *sessionManager;
 @property (strong, nonatomic) OrderListEmptyView *saleEmpty;
+//列表上一次的请求参数
+@property (nonatomic, strong) NSDictionary *params;
+//当前页码
+@property (nonatomic, assign) NSInteger Page;
+@property (nonatomic, assign) BOOL isLoading;
+@property (strong, nonatomic) MyJoinModel *MyJoinModel;
 @end
 
 @implementation MyJoinViewController
@@ -67,7 +74,76 @@
     }
     [self setupView];
 }
-
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self TabSetupRefresh];
+}
+#pragma 列表数据请求
+- (void)TabSetupRefresh
+{
+    [self.TableView.mj_header beginRefreshing];
+}
+//加载最新数据
+- (void)TabloadNews
+{
+    WS(weakSelf);
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    params[@"pageNum"] = @"1";
+    params[@"pageSize"] = @"10";
+    weakSelf.params = params;
+    [ProgressHUD show];
+    [self.sessionManager sendPostHttpRequestWithUrl:MyJoinList params:params bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        [ProgressHUD hide];
+        [weakSelf.TableView.mj_header endRefreshing];
+        weakSelf.listArray = [response objectForKeySafely:@"memberJoinList"];
+        weakSelf.ListDataSource = [MyJoinModel mj_objectArrayWithKeyValuesArray:weakSelf.listArray];
+        if (weakSelf.listArray.count == 0) {
+            weakSelf.saleEmpty.frame = weakSelf.view.bounds;
+            weakSelf.saleEmpty.actionButton.hidden = YES;
+            [weakSelf.TableView addSubview:weakSelf.saleEmpty];
+        }else{
+            [weakSelf.saleEmpty removeFromSuperview];
+        }
+        [weakSelf.TableView reloadData];
+        weakSelf.Page = 1;
+    } failure:^(NSError *error) {
+        [ProgressHUD hide];
+        [weakSelf.TableView.mj_header endRefreshing];
+    }];
+}
+//加载更多
+- (void)TabloadMoreTopics
+{
+    WS(weakSelf);
+    _isLoading = YES;
+    self.Page ++;
+    NSNumber *current = [NSNumber numberWithInt:(int)self.Page];
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    params[@"pageNum"] = current;
+    params[@"pageSize"] = @"10";
+    [ProgressHUD show];
+    weakSelf.params = params;
+    [self.sessionManager sendPostHttpRequestWithUrl:MyJoinList params:params bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        [ProgressHUD hide];
+        [weakSelf.TableView.mj_footer endRefreshing];
+        if (weakSelf.params != params) return;
+        weakSelf.listArray = [response objectForKeySafely:@"memberJoinList"];
+        if (weakSelf.listArray.count > 0) {
+            NSArray *array = [MyJoinModel mj_objectArrayWithKeyValuesArray:weakSelf.listArray];
+            [weakSelf.ListDataSource addObjectsFromArray:array];
+        }else{
+            if (weakSelf.Page > 1) {
+                weakSelf.Page--;
+                [ToastView showToast:@"暂无更多数据"];
+            }
+        }
+        [weakSelf.TableView reloadData];
+    } failure:^(NSError *error) {
+        [ProgressHUD hide];
+        [weakSelf.TableView.mj_footer endRefreshing];
+    }];
+}
 - (void)setupView
 {
     _TableView = [[UITableView alloc] initWithFrame:CGRectMake(0, viewHeight, SCREEN_WIDTH, SCREEN_HEIGHT - viewHeight)];
@@ -80,8 +156,10 @@
     WS(weakSelf);
     weakSelf.TableView.tableFooterView = [[UIView alloc]init];
     // 下拉刷新
-    weakSelf.TableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadNews)];
+    weakSelf.TableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(TabloadNews)];
     weakSelf.TableView.mj_header.automaticallyChangeAlpha = YES;
+    // 上拉加载
+    weakSelf.TableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(TabloadMoreTopics)];
     if (@available(iOS 11.0, *)) {
         _TableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }else {
@@ -97,7 +175,7 @@
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 6;
+    return self.ListDataSource.count;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -105,8 +183,20 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    _MyJoinModel = self.ListDataSource[indexPath.row];
     JoinOrActivityCell *cell = [JoinOrActivityCell JoinOrActivityCellWithTableView:tableView];
     cell.selectionStyle = UITableViewCellEditingStyleNone;
+    cell.titleLabel.text = _MyJoinModel.levelName;
+    if ([_MyJoinModel.audit_status isEqualToString:@"2"]) {
+        cell.zhuangtaiLabel.textColor = [UIColor colorWithHexValue:0xCC5836];
+    }else{
+        cell.zhuangtaiLabel.textColor = [UIColor colorWithHexValue:0x558F61];
+    }
+    cell.zhuangtaiLabel.text = _MyJoinModel.statusText;
+    cell.contentLabel.text = _MyJoinModel.service_name;
+    cell.timeLabel.text = _MyJoinModel.apply_time;
+    cell.moneyLabel.text = [NSString stringWithFormat:@"%@元",_MyJoinModel.fee];
+    cell.moneYtYPElabel.text = @"联盟会费";
     return cell;
 }
 

+ 13 - 0
ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.h

@@ -0,0 +1,13 @@
+//
+//  VIPXuFeiController.h
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface VIPXuFeiController : UIViewController
+
+@end

+ 133 - 0
ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.m

@@ -0,0 +1,133 @@
+//
+//  VIPXuFeiController.m
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import "VIPXuFeiController.h"
+#import "HttpRequestManger.h"
+#import "UserInfoModel.h"
+#import "BaseWebController.h"
+@interface VIPXuFeiController ()
+{
+    CGFloat viewHeight;
+}
+@property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *scrollViewTop;
+@property (weak, nonatomic) IBOutlet UILabel *Label1;
+@property (weak, nonatomic) IBOutlet UILabel *Label2;
+@property (weak, nonatomic) IBOutlet UILabel *Label3;
+@property (weak, nonatomic) IBOutlet UILabel *Label4;
+@property (weak, nonatomic) IBOutlet UILabel *Label5;
+@property (weak, nonatomic) IBOutlet UILabel *Label6;
+@property (weak, nonatomic) IBOutlet UILabel *Label7;
+@property (weak, nonatomic) IBOutlet UILabel *Label8;
+@property (weak, nonatomic) IBOutlet UILabel *Label9;
+@property (strong, nonatomic) UIButton *recommandBtn;
+@property (nonatomic, strong) UIView *BGView;
+@property (strong, nonatomic) HttpRequestManger *sessionManager;
+@property (strong, nonatomic)  UserInfoModel*userInfoModel;
+
+
+@end
+
+@implementation VIPXuFeiController
+- (HttpRequestManger*) sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+    WS(weakSelf);
+    self.navigationView.hidden = NO;
+    [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+    [self.navigationView removeAllLeftButton];
+        [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"whiteBack"] clickCallBack:^(UIView *view) {
+            [weakSelf.navigationController popViewControllerAnimated:YES];
+        }];
+    [self.navigationView setTitle:@"会员续费"];
+    self.navigationView.titleLabel.textColor=[UIColor whiteColor];
+    if (kIs_iPhoneX) {
+        viewHeight = 88;
+    }else{
+        viewHeight = 64;
+    }
+    self.scrollViewTop.constant = viewHeight;
+    self.BGView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 80, 44)];
+    [self.navigationView addRightView: self.BGView clickCallback:nil];
+    _recommandBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, self.BGView.frame.size.width, self.BGView.frame.size.height)];
+    [_recommandBtn setTitle:@"会员标准" forState:UIControlStateNormal];
+    [_recommandBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    _recommandBtn.titleLabel.font = [UIFont systemFontOfSize:14];
+    [_recommandBtn addTarget:self action:@selector(tiaoguo:) forControlEvents:UIControlEventTouchUpInside];
+    [ self.BGView addSubview:_recommandBtn];
+}
+-(void)tiaoguo:(UIButton *)sender{
+//    [ToastView showToast:@"会费标准"];
+    BaseWebController *control = [[BaseWebController alloc] init];
+    control.type =@"2";
+    control.titleName = @"会员标准";
+    control.H5Url = [NSString stringWithFormat:@"%@/dues?move=ios",baseH5];
+    [self.navigationController pushViewController:control animated:YES];
+    
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self loadData];
+}
+
+//获取个人信息
+-(void)loadData
+{
+    WS(weakSelf)
+    //    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [ProgressHUD show];
+    _sessionManager = [[HttpRequestManger alloc] init];
+    [self.sessionManager sendPostHttpRequestWithUrl:getMemberInfo params:nil bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        [ProgressHUD hide];
+        DebugLog(@"正确方法");
+        DebugLog(@"++++++%@",response);
+        NSDictionary *dic = [response objectForKeySafely:@"memberInfo"];
+        weakSelf.userInfoModel = [UserInfoModel mj_objectWithKeyValues:dic];
+        [self reloadData];
+    } failure:^(NSError *error) {
+        [ProgressHUD hide];
+        DebugLog(@"错误方法");
+    }];
+}
+- (void)reloadData
+{
+    self.Label1.text = self.userInfoModel.name;
+    self.Label2.text = self.userInfoModel.company;
+    self.Label3.text = self.userInfoModel.position;
+    self.Label4.text = self.userInfoModel.phone;
+    self.Label5.text = self.userInfoModel.organizationId;
+    self.Label6.text = self.userInfoModel.type;
+//    self.Label7.text = self.userInfoModel.
+//    self.Label8.text = self.userInfoModel.
+//    self.Label9.text = self.userInfoModel.
+}
+- (IBAction)xufeiBtnClick:(id)sender {
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+- (void)dealloc {
+    if (_sessionManager) {
+        [_sessionManager cancelAllTask];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    DebugLog(@"%@没有造成循环引用", [self class]);
+}
+
+
+@end

+ 347 - 0
ZhongJingLianMeng/main/me(我的)/controller/VIPXuFeiController.xib

@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VIPXuFeiController">
+            <connections>
+                <outlet property="Label1" destination="1vZ-TB-UOb" id="7AX-Kr-hc8"/>
+                <outlet property="Label2" destination="bBJ-ay-vGd" id="xXn-UI-c0Q"/>
+                <outlet property="Label3" destination="KA4-9K-s70" id="JxO-jQ-VCl"/>
+                <outlet property="Label4" destination="G0P-Sm-0jc" id="X8q-5l-wZe"/>
+                <outlet property="Label5" destination="MiV-zM-qrX" id="jUB-nY-2ED"/>
+                <outlet property="Label6" destination="FOh-uz-gQK" id="9ap-z7-ZR4"/>
+                <outlet property="Label7" destination="b5Y-vT-yaz" id="gQz-zy-NJd"/>
+                <outlet property="Label8" destination="fWf-CP-OLq" id="I5X-IA-As5"/>
+                <outlet property="Label9" destination="Uek-Dm-mX7" id="bmk-V2-YX6"/>
+                <outlet property="scrollView" destination="dQI-j5-1z9" id="Bkq-4e-cAn"/>
+                <outlet property="scrollViewTop" destination="pJe-13-xoi" id="ARn-1s-JPV"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dQI-j5-1z9">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8F5-da-tyr">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*真实姓名" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Ym-as-Grk">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="o6N-rB-Ob9"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1vZ-TB-UOb">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="1vZ-TB-UOb" firstAttribute="leading" secondItem="0Ym-as-Grk" secondAttribute="trailing" constant="10" id="LO4-mm-cZl"/>
+                                <constraint firstItem="0Ym-as-Grk" firstAttribute="centerY" secondItem="8F5-da-tyr" secondAttribute="centerY" id="R0v-k8-zkw"/>
+                                <constraint firstItem="0Ym-as-Grk" firstAttribute="leading" secondItem="8F5-da-tyr" secondAttribute="leading" constant="15" id="iKn-N9-G0h"/>
+                                <constraint firstAttribute="height" constant="45" id="kiB-7p-tkZ"/>
+                                <constraint firstItem="1vZ-TB-UOb" firstAttribute="centerY" secondItem="8F5-da-tyr" secondAttribute="centerY" id="vaS-gb-ByM"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9dw-6T-Bgz">
+                            <rect key="frame" x="0.0" y="46" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*所在公司" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5je-sF-Qo8">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="hYL-7H-9F7"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bBJ-ay-vGd">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="5je-sF-Qo8" firstAttribute="centerY" secondItem="9dw-6T-Bgz" secondAttribute="centerY" id="30V-Ia-cH6"/>
+                                <constraint firstAttribute="height" constant="45" id="AYG-rX-y3B"/>
+                                <constraint firstItem="bBJ-ay-vGd" firstAttribute="leading" secondItem="5je-sF-Qo8" secondAttribute="trailing" constant="10" id="g3v-VP-fAR"/>
+                                <constraint firstItem="5je-sF-Qo8" firstAttribute="leading" secondItem="9dw-6T-Bgz" secondAttribute="leading" constant="15" id="mZE-tK-8E4"/>
+                                <constraint firstItem="bBJ-ay-vGd" firstAttribute="centerY" secondItem="9dw-6T-Bgz" secondAttribute="centerY" id="rc0-uT-olk"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dd8-g7-PeO">
+                            <rect key="frame" x="0.0" y="92" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*职位" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jwP-hK-hiV">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="vBk-Xx-mgF"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KA4-9K-s70">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="jwP-hK-hiV" firstAttribute="centerY" secondItem="Dd8-g7-PeO" secondAttribute="centerY" id="57V-lS-ek6"/>
+                                <constraint firstItem="KA4-9K-s70" firstAttribute="centerY" secondItem="Dd8-g7-PeO" secondAttribute="centerY" id="CU2-W7-Tqc"/>
+                                <constraint firstItem="KA4-9K-s70" firstAttribute="leading" secondItem="jwP-hK-hiV" secondAttribute="trailing" constant="10" id="TXb-d2-VHR"/>
+                                <constraint firstItem="jwP-hK-hiV" firstAttribute="leading" secondItem="Dd8-g7-PeO" secondAttribute="leading" constant="15" id="aMz-td-HBL"/>
+                                <constraint firstAttribute="height" constant="45" id="h8K-gi-zlP"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CPo-tj-S0D">
+                            <rect key="frame" x="0.0" y="138" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*手机号" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VUJ-TI-0fX">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="uJT-fB-nKs"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G0P-Sm-0jc">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="VUJ-TI-0fX" firstAttribute="leading" secondItem="CPo-tj-S0D" secondAttribute="leading" constant="15" id="2uk-y6-cwM"/>
+                                <constraint firstItem="VUJ-TI-0fX" firstAttribute="centerY" secondItem="CPo-tj-S0D" secondAttribute="centerY" id="Fn7-ey-gD5"/>
+                                <constraint firstAttribute="height" constant="45" id="S4S-R9-A6j"/>
+                                <constraint firstItem="G0P-Sm-0jc" firstAttribute="centerY" secondItem="CPo-tj-S0D" secondAttribute="centerY" id="Si8-25-d7R"/>
+                                <constraint firstItem="G0P-Sm-0jc" firstAttribute="leading" secondItem="VUJ-TI-0fX" secondAttribute="trailing" constant="10" id="udB-ni-Ozr"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J9i-N8-YVs">
+                            <rect key="frame" x="0.0" y="184" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分支机构" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fbe-go-7ia">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="Qrz-Eg-gWS"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MiV-zM-qrX">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="fbe-go-7ia" firstAttribute="centerY" secondItem="J9i-N8-YVs" secondAttribute="centerY" id="5h7-Uz-RTE"/>
+                                <constraint firstItem="fbe-go-7ia" firstAttribute="leading" secondItem="J9i-N8-YVs" secondAttribute="leading" constant="15" id="HcO-0y-Kuh"/>
+                                <constraint firstAttribute="height" constant="45" id="IKz-i4-2mb"/>
+                                <constraint firstItem="MiV-zM-qrX" firstAttribute="centerY" secondItem="J9i-N8-YVs" secondAttribute="centerY" id="Kp7-dR-PeK"/>
+                                <constraint firstItem="MiV-zM-qrX" firstAttribute="leading" secondItem="fbe-go-7ia" secondAttribute="trailing" constant="10" id="UFO-UJ-YcV"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kIl-dG-H6s">
+                            <rect key="frame" x="0.0" y="230" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*类型" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EUt-aC-X6X">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="CSv-BP-kNv"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FOh-uz-gQK">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="FOh-uz-gQK" firstAttribute="centerY" secondItem="kIl-dG-H6s" secondAttribute="centerY" id="Ku9-5N-OBS"/>
+                                <constraint firstAttribute="height" constant="45" id="N5Q-g6-fFT"/>
+                                <constraint firstItem="EUt-aC-X6X" firstAttribute="leading" secondItem="kIl-dG-H6s" secondAttribute="leading" constant="15" id="Otk-b5-gNI"/>
+                                <constraint firstItem="EUt-aC-X6X" firstAttribute="centerY" secondItem="kIl-dG-H6s" secondAttribute="centerY" id="nyx-bf-bDw"/>
+                                <constraint firstItem="FOh-uz-gQK" firstAttribute="leading" secondItem="EUt-aC-X6X" secondAttribute="trailing" constant="10" id="qns-L6-178"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iTh-yg-Kfl">
+                            <rect key="frame" x="0.0" y="276" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*类别" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hbk-ow-Mso">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="FH1-i6-nkm"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b5Y-vT-yaz">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="Hbk-ow-Mso" firstAttribute="leading" secondItem="iTh-yg-Kfl" secondAttribute="leading" constant="15" id="3aB-x6-FSG"/>
+                                <constraint firstAttribute="height" constant="45" id="BYb-HJ-Uau"/>
+                                <constraint firstItem="Hbk-ow-Mso" firstAttribute="centerY" secondItem="iTh-yg-Kfl" secondAttribute="centerY" id="Lp9-Jt-608"/>
+                                <constraint firstItem="b5Y-vT-yaz" firstAttribute="centerY" secondItem="iTh-yg-Kfl" secondAttribute="centerY" id="Vct-MA-qhB"/>
+                                <constraint firstItem="b5Y-vT-yaz" firstAttribute="leading" secondItem="Hbk-ow-Mso" secondAttribute="trailing" constant="10" id="Y1G-H9-1ra"/>
+                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="iaf-eB-fek"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EvZ-hd-gd8">
+                            <rect key="frame" x="0.0" y="322" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*级别" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8VM-cj-r58">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="TGA-Bx-IQS"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fWf-CP-OLq">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="45" id="KYE-zT-8jE"/>
+                                <constraint firstItem="fWf-CP-OLq" firstAttribute="centerY" secondItem="EvZ-hd-gd8" secondAttribute="centerY" id="TIW-sJ-90k"/>
+                                <constraint firstItem="8VM-cj-r58" firstAttribute="centerY" secondItem="EvZ-hd-gd8" secondAttribute="centerY" id="VEF-zG-siO"/>
+                                <constraint firstItem="8VM-cj-r58" firstAttribute="leading" secondItem="EvZ-hd-gd8" secondAttribute="leading" constant="15" id="sRA-Uj-uXZ"/>
+                                <constraint firstItem="fWf-CP-OLq" firstAttribute="leading" secondItem="8VM-cj-r58" secondAttribute="trailing" constant="10" id="yoZ-V0-Kgx"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hsw-Nq-Wdv">
+                            <rect key="frame" x="0.0" y="368" width="375" height="45"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会费" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bFd-Gg-QMv">
+                                    <rect key="frame" x="15" y="14" width="80" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="80" id="Vc3-7u-45L"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uek-Dm-mX7">
+                                    <rect key="frame" x="105" y="14.5" width="29" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="45" id="M6w-0I-ygI"/>
+                                <constraint firstItem="Uek-Dm-mX7" firstAttribute="centerY" secondItem="Hsw-Nq-Wdv" secondAttribute="centerY" id="WZk-io-wbq"/>
+                                <constraint firstItem="Uek-Dm-mX7" firstAttribute="leading" secondItem="bFd-Gg-QMv" secondAttribute="trailing" constant="10" id="ezR-Zy-VUv"/>
+                                <constraint firstItem="bFd-Gg-QMv" firstAttribute="centerY" secondItem="Hsw-Nq-Wdv" secondAttribute="centerY" id="tAo-Wi-DAR"/>
+                                <constraint firstItem="bFd-Gg-QMv" firstAttribute="leading" secondItem="Hsw-Nq-Wdv" secondAttribute="leading" constant="15" id="tBf-sD-e1t"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="0.96862745098039216" green="0.97254901960784312" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="9dw-6T-Bgz" secondAttribute="trailing" id="4ZC-sP-vhD"/>
+                        <constraint firstItem="kIl-dG-H6s" firstAttribute="top" secondItem="J9i-N8-YVs" secondAttribute="bottom" constant="1" id="59Z-gz-WRu"/>
+                        <constraint firstItem="8F5-da-tyr" firstAttribute="top" secondItem="dQI-j5-1z9" secondAttribute="top" id="AWc-0w-LPl"/>
+                        <constraint firstItem="9dw-6T-Bgz" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="Axp-Tf-nkf"/>
+                        <constraint firstItem="EvZ-hd-gd8" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="HeV-wd-6CX"/>
+                        <constraint firstAttribute="trailing" secondItem="J9i-N8-YVs" secondAttribute="trailing" id="IOu-xE-3Nx"/>
+                        <constraint firstAttribute="trailing" secondItem="kIl-dG-H6s" secondAttribute="trailing" id="Joz-KL-qpn"/>
+                        <constraint firstItem="iTh-yg-Kfl" firstAttribute="top" secondItem="kIl-dG-H6s" secondAttribute="bottom" constant="1" id="ODC-b5-AOG"/>
+                        <constraint firstItem="Hsw-Nq-Wdv" firstAttribute="top" secondItem="EvZ-hd-gd8" secondAttribute="bottom" constant="1" id="Q77-1K-ja0"/>
+                        <constraint firstItem="iTh-yg-Kfl" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="QSB-sq-4Eg"/>
+                        <constraint firstAttribute="bottom" secondItem="8F5-da-tyr" secondAttribute="bottom" constant="622" id="Sxs-6L-jgZ"/>
+                        <constraint firstAttribute="trailing" secondItem="CPo-tj-S0D" secondAttribute="trailing" id="TNO-iU-cvD"/>
+                        <constraint firstItem="Dd8-g7-PeO" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="Ucw-OM-Afg"/>
+                        <constraint firstItem="Hsw-Nq-Wdv" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="VNi-pG-ir1"/>
+                        <constraint firstItem="kIl-dG-H6s" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="ZEE-7U-ken"/>
+                        <constraint firstItem="Dd8-g7-PeO" firstAttribute="top" secondItem="9dw-6T-Bgz" secondAttribute="bottom" constant="1" id="aID-Ua-E4h"/>
+                        <constraint firstItem="9dw-6T-Bgz" firstAttribute="top" secondItem="8F5-da-tyr" secondAttribute="bottom" constant="1" id="bEs-b5-jz5"/>
+                        <constraint firstAttribute="trailing" secondItem="iTh-yg-Kfl" secondAttribute="trailing" id="bIi-0K-Vcd"/>
+                        <constraint firstItem="J9i-N8-YVs" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="bLt-vY-I66"/>
+                        <constraint firstAttribute="trailing" secondItem="EvZ-hd-gd8" secondAttribute="trailing" id="f4a-JG-qea"/>
+                        <constraint firstItem="8F5-da-tyr" firstAttribute="width" secondItem="dQI-j5-1z9" secondAttribute="width" id="hck-nR-G6u"/>
+                        <constraint firstItem="CPo-tj-S0D" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="jlf-mH-ZMV"/>
+                        <constraint firstAttribute="trailing" secondItem="8F5-da-tyr" secondAttribute="trailing" id="oEA-Ss-NRn"/>
+                        <constraint firstAttribute="trailing" secondItem="Dd8-g7-PeO" secondAttribute="trailing" id="p9s-5b-I9v"/>
+                        <constraint firstItem="CPo-tj-S0D" firstAttribute="top" secondItem="Dd8-g7-PeO" secondAttribute="bottom" constant="1" id="pWs-ek-6mh"/>
+                        <constraint firstItem="EvZ-hd-gd8" firstAttribute="top" secondItem="iTh-yg-Kfl" secondAttribute="bottom" constant="1" id="rdi-zo-JX3"/>
+                        <constraint firstAttribute="trailing" secondItem="Hsw-Nq-Wdv" secondAttribute="trailing" id="rtR-IL-bms"/>
+                        <constraint firstItem="J9i-N8-YVs" firstAttribute="top" secondItem="CPo-tj-S0D" secondAttribute="bottom" constant="1" id="w5A-V7-93y"/>
+                        <constraint firstItem="8F5-da-tyr" firstAttribute="leading" secondItem="dQI-j5-1z9" secondAttribute="leading" id="wWJ-H4-HTy"/>
+                    </constraints>
+                </scrollView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nT6-UM-Ced">
+                    <rect key="frame" x="0.0" y="617" width="375" height="50"/>
+                    <color key="backgroundColor" red="0.23529411759999999" green="0.56862745100000001" blue="0.36078431370000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <state key="normal" title="确认并缴费">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="xufeiBtnClick:" destination="-1" eventType="touchUpInside" id="Sg8-ra-LtY"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="nT6-UM-Ced" secondAttribute="trailing" id="75u-00-tcf"/>
+                <constraint firstAttribute="trailing" secondItem="dQI-j5-1z9" secondAttribute="trailing" id="H77-wE-WDg"/>
+                <constraint firstAttribute="bottom" secondItem="nT6-UM-Ced" secondAttribute="bottom" id="QBY-vA-Sdt"/>
+                <constraint firstAttribute="bottom" secondItem="dQI-j5-1z9" secondAttribute="bottom" constant="50" id="Ryt-Bc-H21"/>
+                <constraint firstItem="nT6-UM-Ced" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="XNR-vS-wVN"/>
+                <constraint firstItem="dQI-j5-1z9" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ZRc-kR-Nse"/>
+                <constraint firstItem="dQI-j5-1z9" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="pJe-13-xoi"/>
+                <constraint firstItem="nT6-UM-Ced" firstAttribute="top" secondItem="dQI-j5-1z9" secondAttribute="bottom" id="rgY-Jg-GeE"/>
+            </constraints>
+        </view>
+    </objects>
+</document>

+ 90 - 5
ZhongJingLianMeng/main/me(我的)/controller/mineViewController.m

@@ -20,6 +20,9 @@
 #import "OrderPayViewController.h"
 #import "UserInfoModel.h"
 #import "BaseWebController.h"
+#import "joinAllianceVController.h"
+#import "applyForDirectorController.h"
+#import "VIPXuFeiController.h"
 @interface mineViewController ()
 @property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *scrollViewTop;
@@ -109,8 +112,59 @@
         self.newsNumLabel.hidden = NO;
         self.newsNumLabel.text = self.userInfoModel.pushCount;
     }
-//    self.zhiwuLabel.text = self.userInfoModel.committee_id;
-    
+//    level :级别 0 游客 1 普通会员 2 企业会员 3 常务理事
+    if ([self.userInfoModel.level isEqualToString:@"0"]) {
+        self.zhiwuLabel.hidden = YES;
+        self.vipImg.hidden = YES;
+        self.VIPtYPE.text = @"游客";
+    }else if ([self.userInfoModel.level isEqualToString:@"1"]){
+        self.zhiwuLabel.hidden = NO;
+        self.zhiwuLabel.text = self.userInfoModel.committeeId;
+        self.vipImg.hidden = NO;
+        self.vipImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"Vip"]];
+        self.VIPtYPE.text = @"普通会员";
+    }else if ([self.userInfoModel.level isEqualToString:@"2"]){
+        self.zhiwuLabel.hidden = NO;
+        self.zhiwuLabel.text = self.userInfoModel.committeeId;
+        self.vipImg.hidden = NO;
+        self.vipImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"Vip"]];
+        self.VIPtYPE.text = @"企业会员";
+    }else if ([self.userInfoModel.level isEqualToString:@"3"]){
+        self.zhiwuLabel.hidden = NO;
+        self.zhiwuLabel.text = self.userInfoModel.committeeId;
+        self.vipImg.hidden = NO;
+        self.vipImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"VipLishi"]];
+        self.VIPtYPE.text = @"常务理事";
+    }
+//    isExpires :是否到期续费标识 1 到期 0 未到期      level :级别 0 游客 1 普通会员 2 企业会员 3 常务理事
+
+        if ([self.userInfoModel.level isEqualToString:@"0"]) {
+            self.rightImg.hidden = NO;
+            self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"jiarulianmeng"]];
+        }else if ([self.userInfoModel.level isEqualToString:@"1"]){
+            self.rightImg.hidden = NO;
+            if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+            }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+            }
+        }else if ([self.userInfoModel.level isEqualToString:@"2"]){
+            if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+                self.rightImg.hidden = NO;
+                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+            }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+                self.rightImg.hidden = YES;
+//                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+            }
+        }else if ([self.userInfoModel.level isEqualToString:@"3"]){
+            if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+                self.rightImg.hidden = NO;
+                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+            }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+                self.rightImg.hidden = YES;
+                // self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+            }
+        }
 }
 
 - (void)addimgTaps{
@@ -142,7 +196,40 @@
 //理事点击
 - (void)rightImgTapSelect
 {
-    logInViewController *control = [[logInViewController alloc] init];
+    //    isExpires :是否到期续费标识 1 到期 0 未到期      level :级别 0 游客 1 普通会员 2 企业会员 3 常务理事
+//    if ([self.userInfoModel.level isEqualToString:@"0"]) {
+//        self.rightImg.hidden = NO;
+//        self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"jiarulianmeng"]];
+//        [ToastView showToast:@"跳加入联盟"];
+//    }else if ([self.userInfoModel.level isEqualToString:@"1"]){
+//        self.rightImg.hidden = NO;
+//        if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+//            self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+//            [ToastView showToast:@"跳会员续费"];
+//        }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+//            self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+//            [ToastView showToast:@"跳申请理事"];
+//        }
+//    }else if ([self.userInfoModel.level isEqualToString:@"2"]){
+//        if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+//            self.rightImg.hidden = NO;
+//            self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+//            [ToastView showToast:@"跳会员续费"];
+//        }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+//            self.rightImg.hidden = YES;
+//            //                self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+//        }
+//    }else if ([self.userInfoModel.level isEqualToString:@"3"]){
+//        if ([self.userInfoModel.isExpires isEqualToString:@"1"]) {
+//            self.rightImg.hidden = NO;
+//            self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"daoqi"]];
+//            [ToastView showToast:@"跳会员续费"];
+//        }else if ([self.userInfoModel.isExpires isEqualToString:@"0"]){
+//            self.rightImg.hidden = YES;
+//            // self.rightImg.image = [UIImage imageNamed:[NSString stringWithFormat:@"lishi"]];
+//        }
+//    }
+    VIPXuFeiController *control = [[VIPXuFeiController alloc] init];
     [self.navigationController pushViewController:control animated:YES];
 }
 - (void)viewTapsBlcok{
@@ -177,8 +264,6 @@
     }];
 }
 
-
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

+ 3 - 3
ZhongJingLianMeng/main/me(我的)/controller/personInfoViewController.m

@@ -84,7 +84,7 @@
 }
 
 -(void)tiaoguo:(UIButton *)sender{
-    [ToastView showToast:@"跳过"];
+//    [ToastView showToast:@"跳过"];
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
 
@@ -95,7 +95,7 @@
     }];
     //性别
     [self.sexView addTapGestureWithBlock:^{
-        [ToastView showToast:@"性别"];
+//        [ToastView showToast:@"性别"];
         _array = @[@"女",@"男"];
         [LSActionSheet showWithTitle:nil destructiveTitle:nil otherTitles:_array block:^(int index) {
             //            NSLog(@"-----%d",index);
@@ -115,7 +115,7 @@
     }];
     //生日
     [self.birthDayView addTapGestureWithBlock:^{
-        [ToastView showToast:@"生日"];
+//        [ToastView showToast:@"生日"];
         WS(weakSelf);
         BirthdaySelectionView *birthdayView = [[NSBundle mainBundle]loadNibNamed:@"BirthdaySelectionView" owner:weakSelf options:nil].firstObject;
         birthdayView.frame = weakSelf.view.bounds;

+ 6 - 6
ZhongJingLianMeng/main/me(我的)/controller/personalModifyController.m

@@ -140,19 +140,19 @@
 - (void)viewTapsBock{
     //头像
     [self.headView addTapGestureWithBlock:^{
-        [ToastView showToast:@"头像"];
+//        [ToastView showToast:@"头像"];
         [self showActionSheet];
     }];
     //姓名
     [self.nameView addTapGestureWithBlock:^{
-        [ToastView showToast:@"姓名"];
+//        [ToastView showToast:@"姓名"];
         changeNameViewController *control = [[changeNameViewController alloc] init];
         control.type = @"1";
         [self.navigationController pushViewController:control animated:YES];
     }];
     //性别
     [self.sexView addTapGestureWithBlock:^{
-        [ToastView showToast:@"性别"];
+//        [ToastView showToast:@"性别"];
         _array = @[@"女",@"男"];
         [LSActionSheet showWithTitle:nil destructiveTitle:nil otherTitles:_array block:^(int index) {
             //            NSLog(@"-----%d",index);
@@ -172,7 +172,7 @@
     }];
     //生日
     [self.birthdayView addTapGestureWithBlock:^{
-        [ToastView showToast:@"生日"];
+//        [ToastView showToast:@"生日"];
         WS(weakSelf);
         BirthdaySelectionView *birthdayView = [[NSBundle mainBundle]loadNibNamed:@"BirthdaySelectionView" owner:weakSelf options:nil].firstObject;
         birthdayView.frame = weakSelf.view.bounds;
@@ -184,14 +184,14 @@
     }];
     //公司
     [self.companyView addTapGestureWithBlock:^{
-        [ToastView showToast:@"公司"];
+//        [ToastView showToast:@"公司"];
         changeNameViewController *control = [[changeNameViewController alloc] init];
         control.type = @"2";
         [self.navigationController pushViewController:control animated:YES];
     }];
     //职位
     [self.jobView addTapGestureWithBlock:^{
-        [ToastView showToast:@"职位"];
+//        [ToastView showToast:@"职位"];
         changeNameViewController *control = [[changeNameViewController alloc] init];
         control.type = @"3";
         [self.navigationController pushViewController:control animated:YES];

+ 20 - 0
ZhongJingLianMeng/main/me(我的)/model/MyJoinModel.h

@@ -0,0 +1,20 @@
+//
+//  MyJoinModel.h
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface MyJoinModel : NSObject
+@property (nonatomic, copy) NSString *level;
+@property (nonatomic, copy) NSString *service_name;
+@property (nonatomic, copy) NSString *fee;
+@property (nonatomic, copy) NSString *statusText;
+@property (nonatomic, copy) NSString *levelName;
+@property (nonatomic, copy) NSString *apply_time;
+@property (nonatomic, copy) NSString *audit_status;
+
+@end

+ 13 - 0
ZhongJingLianMeng/main/me(我的)/model/MyJoinModel.m

@@ -0,0 +1,13 @@
+//
+//  MyJoinModel.m
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import "MyJoinModel.h"
+
+@implementation MyJoinModel
+
+@end

+ 3 - 0
ZhongJingLianMeng/main/me(我的)/model/UserInfoModel.h

@@ -24,6 +24,9 @@
 @property (nonatomic, copy) NSString *committee_id;
 @property (nonatomic, copy) NSString *pushStatus;
 @property (nonatomic, copy) NSString *pushCount;
+@property (nonatomic, copy) NSString *committeeId;
+@property (nonatomic, copy) NSString *isExpires;
+@property (nonatomic, copy) NSString *organizationId;
 
 @property(nonatomic,copy) NSString *auditStatus;
 

+ 3 - 1
ZhongJingLianMeng/prefixHeader/AllUrl.h

@@ -25,7 +25,7 @@
 
 //H5基网址链接
 
-#define baseH5 @"http://192.168.1.182:8090"
+#define baseH5 @"http://192.168.1.183:8090"
 
 #define upload_form_upload @"/upload/formUpload"
 
@@ -73,4 +73,6 @@
 
 #define OrderList  @"/memberOrder/auth/selectOrderList"
 
+#define MyJoinList @"/memberOrder/auth/memberJoin"
+
 #endif /* AllUrl_h */