设置界面、注销

ALand.xcodeproj/project.pbxproj

@@ -119,7 +119,6 @@
 		199BC7CD1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 199BC7CB1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib */; };
 		199BC7D01C9BAC9600E4E0B8 /* MyTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7CF1C9BAC9600E4E0B8 /* MyTools.m */; };
 		199BC7D31C9BBE0100E4E0B8 /* StoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D21C9BBE0100E4E0B8 /* StoreViewController.m */; };
-		199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */; };
 		199BC7D91C9BBE1A00E4E0B8 /* MassageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */; };
 		19ADD3671CA3A16C00EE6E5A /* CoverShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD3661CA3A16C00EE6E5A /* CoverShadowView.m */; };
 		19ADD36A1CA3AC9D00EE6E5A /* UIButton+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD3691CA3AC9D00EE6E5A /* UIButton+Category.m */; };
@@ -134,6 +133,10 @@
 		19ADD38A1CA4E4BD00EE6E5A /* AddCommodityHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD3891CA4E4BD00EE6E5A /* AddCommodityHeaderView.m */; };
 		19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD38C1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m */; };
 		19ADD38F1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19ADD38D1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib */; };
+		19D906AC1CC7898C00CD42DC /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906AA1CC7898C00CD42DC /* MineViewController.m */; };
+		19D906AD1CC7898C00CD42DC /* MineViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906AB1CC7898C00CD42DC /* MineViewController.xib */; };
+		19D906B61CC86DA300CD42DC /* SettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906B41CC86DA300CD42DC /* SettingViewController.m */; };
+		19D906B71CC86DA300CD42DC /* SettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906B51CC86DA300CD42DC /* SettingViewController.xib */; };
 		19DC6AFC1CBF867E0064A9FD /* JavenShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */; };
 		19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */; };
 		19DC6B131CC0ACDE0064A9FD /* MyteamTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */; };
@@ -445,8 +448,6 @@
 		199BC7CF1C9BAC9600E4E0B8 /* MyTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTools.m; sourceTree = "<group>"; };
 		199BC7D11C9BBE0100E4E0B8 /* StoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoreViewController.h; sourceTree = "<group>"; };
 		199BC7D21C9BBE0100E4E0B8 /* StoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoreViewController.m; sourceTree = "<group>"; };
-		199BC7D41C9BBE0D00E4E0B8 /* MineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineViewController.h; sourceTree = "<group>"; };
-		199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineViewController.m; sourceTree = "<group>"; };
 		199BC7D71C9BBE1A00E4E0B8 /* MassageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MassageViewController.h; sourceTree = "<group>"; };
 		199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MassageViewController.m; sourceTree = "<group>"; };
 		19ADD3651CA3A16C00EE6E5A /* CoverShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoverShadowView.h; sourceTree = "<group>"; };
@@ -471,6 +472,12 @@
 		19ADD38B1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddCommodityHeaderCollectionReusableView.h; sourceTree = "<group>"; };
 		19ADD38C1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddCommodityHeaderCollectionReusableView.m; sourceTree = "<group>"; };
 		19ADD38D1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddCommodityHeaderCollectionReusableView.xib; sourceTree = "<group>"; };
+		19D906A91CC7898C00CD42DC /* MineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineViewController.h; sourceTree = "<group>"; };
+		19D906AA1CC7898C00CD42DC /* MineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineViewController.m; sourceTree = "<group>"; };
+		19D906AB1CC7898C00CD42DC /* MineViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MineViewController.xib; sourceTree = "<group>"; };
+		19D906B31CC86DA300CD42DC /* SettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingViewController.h; sourceTree = "<group>"; };
+		19D906B41CC86DA300CD42DC /* SettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingViewController.m; sourceTree = "<group>"; };
+		19D906B51CC86DA300CD42DC /* SettingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingViewController.xib; sourceTree = "<group>"; };
 		19DC6AFA1CBF867E0064A9FD /* JavenShopModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenShopModel.h; sourceTree = "<group>"; };
 		19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenShopModel.m; sourceTree = "<group>"; };
 		19DC6B0D1CC0AA7D0064A9FD /* MyTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTeamViewController.h; sourceTree = "<group>"; };
@@ -1089,8 +1096,12 @@
 		199BC79A1C9AA70C00E4E0B8 /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
-				199BC7D41C9BBE0D00E4E0B8 /* MineViewController.h */,
-				199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */,
+				19D906A91CC7898C00CD42DC /* MineViewController.h */,
+				19D906AA1CC7898C00CD42DC /* MineViewController.m */,
+				19D906AB1CC7898C00CD42DC /* MineViewController.xib */,
+				19D906B31CC86DA300CD42DC /* SettingViewController.h */,
+				19D906B41CC86DA300CD42DC /* SettingViewController.m */,
+				19D906B51CC86DA300CD42DC /* SettingViewController.xib */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -1827,9 +1838,11 @@
 				19632DB31CB39B250024A8A1 /* SelectPhotoView.xib in Resources */,
 				195EB1E11CA5292600E298BB /* AddCommodityFooterCollectionReusableView.xib in Resources */,
 				1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */,
+				19D906AD1CC7898C00CD42DC /* MineViewController.xib in Resources */,
 				197975241CA8FAAE00407E3F /* CommodityDetailTopView.xib in Resources */,
 				19ADD3851CA4D3C400EE6E5A /* AddCommodityCollectionViewCell.xib in Resources */,
 				199BC7BF1C9B045B00E4E0B8 /* RigistViewController.xib in Resources */,
+				19D906B71CC86DA300CD42DC /* SettingViewController.xib in Resources */,
 				195EB1DC1CA516CE00E298BB /* HotCommodityCell.xib in Resources */,
 				199B4D891CAE67C600451E0E /* SeeLogistics.xib in Resources */,
 				199BC7B21C9AD4FD00E4E0B8 /* LoginViewController.xib in Resources */,
@@ -1977,6 +1990,7 @@
 				1929F1811CA0E597000E9B26 /* UIView+Category.m in Sources */,
 				19DCCB631C9A9EB30072C3BF /* IBTTableViewSectionInfo.m in Sources */,
 				19DCCB5D1C9A9EB30072C3BF /* IBTImagePicker.m in Sources */,
+				19D906B61CC86DA300CD42DC /* SettingViewController.m in Sources */,
 				19DCCBCB1C9AA0450072C3BF /* UIApplication+CheckFirstRun.m in Sources */,
 				19DCCBD01C9AA0450072C3BF /* UIImage+WaterMark.m in Sources */,
 				19DCCB761C9A9EB30072C3BF /* IBTUIView.m in Sources */,
@@ -2032,7 +2046,6 @@
 				1979754D1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m in Sources */,
 				19DCCBCE1C9AA0450072C3BF /* UIImage+Fit.m in Sources */,
 				19DCCB681C9A9EB30072C3BF /* IBTLoadingView.m in Sources */,
-				199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */,
 				19DCCB5C1C9A9EB30072C3BF /* IBTAVAudioPlayWrapper.m in Sources */,
 				19DC6B2A1CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m in Sources */,
 				19DCCB601C9A9EB30072C3BF /* IBTScrollLoadMoreView.m in Sources */,
@@ -2053,6 +2066,7 @@
 				191AEE2C1CBB86C600F5E535 /* CommotityListCreateInfo.m in Sources */,
 				19DCCBE01C9AA0450072C3BF /* JTOptionCell.m in Sources */,
 				19DCCBE11C9AA0450072C3BF /* JTOptionsEntity.m in Sources */,
+				19D906AC1CC7898C00CD42DC /* MineViewController.m in Sources */,
 				19ADD36A1CA3AC9D00EE6E5A /* UIButton+Category.m in Sources */,
 				1940D2EC1C9A56730080678C /* main.m in Sources */,
 				19DCCBF91C9AA2180072C3BF /* RIButtonItem.m in Sources */,

ALand/Assets.xcassets/01我的_iPhone_assets/Contents.json

+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/01我的_iPhone_assets/icon_mine_card.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_card.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_card@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/01我的_iPhone_assets/icon_mine_friends.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_friends.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_friends@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/01我的_iPhone_assets/icon_mine_help.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_help.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_help@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/01我的_iPhone_assets/icon_mine_setting.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_setting.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_mine_setting@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/01我的_iPhone_assets/icon_myacount.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_myacount.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_myacount@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/cross29/Contents.json

+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/cross29/cross.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图层-0.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图层-0@2x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m

@@ -200,11 +200,12 @@
 }
 
 - (void)setUpData {
+    UserInfo *info = [UserInfo shareInstance];
     
     NSDictionary *params = @{@"defintion" : @{@"probePages" : @0,
                                                     @"orders" : @[@{@"field" : self.field,
                                                                     @"direction" : self.direction}],
-                                                    @"conditions" : @[@{@"parameters" : @[[UserInfo shareInstance].domain],
+                                                    @"conditions" : @[@{@"parameters" : @[info.domain],
                                                                         @"operation" : @"domain equals",
                                                                         @"parameter" : @{@"operation" : @"string"}},
                                                                       @{@"parameters" : @[@[[UserInfo shareInstance].shop.uuid]],

ALand/CodeClass/Home/ViewController/ManagementViewController.m

@@ -32,7 +32,7 @@
     [super viewDidLoad];
     self.field = @"";
     self.direction = @"desc";
-    
+     self.condition = @"";
     self.navigationItem.title = @"批量管理";
 
     

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m

@@ -12,6 +12,7 @@
 #import "CoverShadowView.h"
 #import "StoreNameViewController.h"
 #import "introductionViewController.h"
+#import "CommodityManagementViewController.h"
 @interface StoreManagermentViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 @property (nonatomic, strong) SelectPhotoView *photoView;
 @property (nonatomic, strong) CoverShadowView *shadowView;
@@ -127,6 +128,13 @@
     [self.shadowView hide];
 }
 
+#pragma mark =========== actions ===========
+- (IBAction)actionCommodityManagement:(id)sender {
+    CommodityManagementViewController *commodityVC = [[CommodityManagementViewController alloc] init];
+    commodityVC.isShowNavigationBar = YES;
+    [self.navigationController pushViewController:commodityVC animated:YES];
+}
+
 - (IBAction)actionBack:(id)sender {
     [self PopViewControllerAnimated:YES];
 }

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib

@@ -433,6 +433,9 @@
                                     <exclude reference="uM8-0K-LZn"/>
                                 </mask>
                             </variation>
+                            <connections>
+                                <action selector="actionCommodityManagement:" destination="-1" eventType="touchUpInside" id="rJN-HD-dOX"/>
+                            </connections>
                         </button>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>

ALand/CodeClass/Login/LoginViewController.m

@@ -43,7 +43,7 @@
 
 //本地已有密码时登录
 - (void)defaultLoginAction {
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"userName"]) {
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"passWord"]) {
         
         NSDictionary *paramers = @{@"domain":kDomain,
                                    @"loginName":[[NSUserDefaults standardUserDefaults] objectForKey:@"userName"] ,
@@ -52,14 +52,21 @@
         [MBProgressHUD showHUDAddedTo:self.view animated:YES];
         WS(weakSelf)
         [[HTTPCilent shareCilent] POST:@"app/resellerLogin" parameters:paramers success:^(NSURLSessionDataTask *task, id responseObject) {
-            UserInfo *info = [UserInfo shareInstance];
-            [info UserInfoWithDictionary:responseObject[@"reseller"]];
-            
             
             [MBProgressHUD hideHUDForView:self.view animated:YES];
-            BaseViewController *baseVC = [[BaseViewController alloc] init];
-            baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-            [weakSelf presentViewController:baseVC animated:YES completion:nil];
+            
+            if ([responseObject[@"code"] isEqualToNumber:@0]) {
+                
+                UserInfo *info = [UserInfo shareInstance];
+                [info UserInfoWithDictionary:responseObject[@"reseller"]];
+                BaseViewController *baseVC = [[BaseViewController alloc] init];
+                baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+                [weakSelf presentViewController:baseVC animated:YES completion:nil];
+                
+            }else{
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:@"passWord"];
+                [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:nil];
+            }
         } failure:^(NSURLSessionDataTask *task, NSError *error) {
              [MBProgressHUD hideHUDForView:self.view animated:YES];
         }];

ALand/CodeClass/Login/RigistViewController.m

@@ -81,13 +81,29 @@
     WS(weakSelf)
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [[HTTPCilent shareCilent] POST:@"app/resellerRegister" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
-        
-        [[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
-        [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-       
-        [weakSelf.navigationController popViewControllerAnimated:YES];
         [MBProgressHUD hideHUDForView:self.view animated:YES];
+
+        
+        if ([responseObject[@"code"] isEqualToNumber:@0]) {
+            
+            [[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
+            [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
+            [[NSUserDefaults standardUserDefaults] synchronize];
+            
+            [weakSelf.navigationController popViewControllerAnimated:YES];
+
+
+            
+        }else{
+            
+            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:^{
+                
+            }];
+        }
+
+        
+        
+        
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];

ALand/CodeClass/Login/ToLoginViewController.m

@@ -35,17 +35,28 @@
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     WS(weakSelf)
     [[HTTPCilent shareCilent] POST:@"app/resellerLogin" parameters:paramers success:^(NSURLSessionDataTask *task, id responseObject) {
-        UserInfo *info = [UserInfo shareInstance];
-        [info UserInfoWithDictionary:responseObject[@"reseller"]];
         
-        [[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
-        [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
+            [MBProgressHUD hideHUDForView:self.view animated:YES];
         
-        
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        BaseViewController *baseVC = [[BaseViewController alloc] init];
-        baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-        [weakSelf presentViewController:baseVC animated:YES completion:nil];
+        if ([responseObject[@"code"] isEqualToNumber:@0]) {
+            
+            UserInfo *info = [UserInfo shareInstance];
+            [info UserInfoWithDictionary:responseObject[@"reseller"]];
+            
+            [[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
+            [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
+            
+            BaseViewController *baseVC = [[BaseViewController alloc] init];
+            baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+            [weakSelf presentViewController:baseVC animated:YES completion:nil];
+            
+        }else{
+            
+            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:^{
+                
+            }];
+        }
+
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];

ALand/CodeClass/MIne/ViewController/MineViewController.h

@@ -2,7 +2,7 @@
 //  MineViewController.h
 //  ALand
 //
-//  Created by Z on 16/3/18.
+//  Created by Z on 16/4/20.
 //  Copyright © 2016年 Z. All rights reserved.
 //
 

ALand/CodeClass/MIne/ViewController/MineViewController.m

@@ -2,12 +2,12 @@
 //  MineViewController.m
 //  ALand
 //
-//  Created by Z on 16/3/18.
+//  Created by Z on 16/4/20.
 //  Copyright © 2016年 Z. All rights reserved.
 //
 
 #import "MineViewController.h"
-
+#import "SettingViewController.h"
 @interface MineViewController ()
 
 @end
@@ -16,12 +16,18 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    // Do any additional setup after loading the view from its nib.
+}
+- (IBAction)myAcount:(id)sender {
+    CLog(@"myAcount");
 }
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:YES];
+- (IBAction)actionSetting:(id)sender {
+    SettingViewController *settingVC = [[SettingViewController alloc] init];
+    settingVC.isShowNavigationBar = YES;
+    [self.navigationController pushViewController:settingVC animated:YES];
+    
 }
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

ALand/CodeClass/MIne/ViewController/SettingViewController.h

+//
+//  SettingViewController.h
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface SettingViewController : IBTUIViewController
+
+@end

ALand/CodeClass/MIne/ViewController/SettingViewController.m

+//
+//  SettingViewController.m
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "SettingViewController.h"
+
+@interface SettingViewController ()
+
+@end
+
+@implementation SettingViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+- (IBAction)loginOut:(id)sender {
+    [[HTTPCilent shareCilent] GET:@"app/resellerLogout" parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        
+        WS(weakSelf)
+        if ([responseObject[@"code"] isEqualToNumber:@0]) {
+            
+            [MBProgressHUD Javen_showSuccess:@"注销成功！" onView:weakSelf.view delay:0.5 complete:^{
+                
+                [self.tabBarController dismissViewControllerAnimated:YES completion:nil];
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:@"passWord"];
+                
+            }];
+            
+        }else{
+            [MBProgressHUD Javen_showError:@"注销异常" onView:weakSelf.view delay:0.5 complete:nil];
+            
+        }
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        
+    }];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ALand/CodeClass/MIne/ViewController/SettingViewController.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettingViewController">
+            <connections>
+                <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>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eb3-WB-kbh">
+                    <rect key="frame" x="0.0" y="314" width="375" height="55"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dl4-5c-CIj">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                            <state key="normal" title="注销"/>
+                            <connections>
+                                <action selector="loginOut:" destination="-1" eventType="touchUpInside" id="gdE-lx-MLO"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="dl4-5c-CIj" firstAttribute="top" secondItem="eb3-WB-kbh" secondAttribute="top" id="5Co-rY-tIi"/>
+                        <constraint firstAttribute="height" constant="55" id="5V9-ef-LcW"/>
+                        <constraint firstAttribute="bottom" secondItem="dl4-5c-CIj" secondAttribute="bottom" id="DUD-Sa-lWi"/>
+                        <constraint firstAttribute="trailing" secondItem="dl4-5c-CIj" secondAttribute="trailing" id="PoM-gd-DEv"/>
+                        <constraint firstItem="dl4-5c-CIj" firstAttribute="leading" secondItem="eb3-WB-kbh" secondAttribute="leading" id="jJX-WC-mIm"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="eb3-WB-kbh" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="314" id="egd-LD-njq"/>
+                <constraint firstAttribute="trailing" secondItem="eb3-WB-kbh" secondAttribute="trailing" id="mop-NU-Hd2"/>
+                <constraint firstItem="eb3-WB-kbh" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ppU-mO-N1f"/>
+            </constraints>
+            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <point key="canvasLocation" x="384.5" y="218.5"/>
+        </view>
+    </objects>
+</document>

ALand/General/Categories/MBProgressHUD+Javen.h

@@ -34,4 +34,5 @@ typedef void (^succeBlock)(void);
 
 
 + (MBProgressHUD *)Javen_showSuccess:(NSString *)success onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete;
++ (void)Javen_showError:(NSString *)error onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete;
 @end

ALand/General/Categories/MBProgressHUD+Javen.m

@@ -140,18 +140,46 @@
 {
     MBProgressHUD *hud = [[MBProgressHUD alloc] initWithView:view];
     [view addSubview:hud];
+    
     UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
     UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
     imageView.tintColor = kSysWhite;
     hud.customView = imageView;
     hud.mode = MBProgressHUDModeCustomView;
-    hud.labelText = @"修改成功！";
+    hud.labelText = success;
     [hud show:YES];
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self hideHUD];
-        complete();
+        
+        if (complete) {
+            
+            complete();
+        }
     });
     return hud;
 }
+
++ (void)Javen_showError:(NSString *)error onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete {
+    MBProgressHUD *hud = [[MBProgressHUD alloc] initWithView:view];
+    [view addSubview:hud];
+    
+    UIImage *image = [[UIImage imageNamed:@"cross"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
+    imageView.tintColor = kSysWhite;
+    hud.customView = imageView;
+    hud.mode = MBProgressHUDModeCustomView;
+    hud.labelText = error;
+    [hud show:YES];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [hud hide:YES];
+        
+        if (complete) {
+            
+            complete();
+        }
+    });
+}
+
 @end