构建供应商详情，店员详情，商户详情

sryao · Aug 30, 2015 · 59c2b00 · 59c2b00
1 parent c4d35a6
commit 59c2b00
Show file tree

Hide file tree

Showing 66 changed files with 1,633 additions and 49 deletions.
diff --git a/YHB_Prj/YHB_Prj.xcodeproj/project.pbxproj b/YHB_Prj/YHB_Prj.xcodeproj/project.pbxproj
@@ -50,6 +50,9 @@
 		AB8844171B913D6300FA526D /* UITableView+DelegateBlocks.m in Sources */ = {isa = PBXBuildFile; fileRef = AB8844141B913D6300FA526D /* UITableView+DelegateBlocks.m */; };
 		AB88441B1B913DBB00FA526D /* ChooseLocaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB88441A1B913DBB00FA526D /* ChooseLocaViewController.m */; };
 		AB88441E1B914D0F00FA526D /* CLTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AB88441D1B914D0F00FA526D /* CLTableViewCell.m */; };
+		ABEF1DA71B929D5400C1C2EA /* SupplierDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEF1DA61B929D5400C1C2EA /* SupplierDetailViewController.m */; };
+		ABEF1DAB1B92A18E00C1C2EA /* ClerkDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEF1DAA1B92A18E00C1C2EA /* ClerkDetailViewController.m */; };
+		ABEF1DAF1B92AD2700C1C2EA /* TenantViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEF1DAE1B92AD2700C1C2EA /* TenantViewController.m */; };
 		FF012FA91B8EB92C00AE563C /* VipInfoMode.m in Sources */ = {isa = PBXBuildFile; fileRef = FF012F941B8EB92C00AE563C /* VipInfoMode.m */; };
 		FF012FAA1B8EB92C00AE563C /* HYXFJLListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF012F961B8EB92C00AE563C /* HYXFJLListViewController.xib */; };
 		FF012FAB1B8EB92C00AE563C /* HYXFJLListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF012F971B8EB92C00AE563C /* HYXFJLListViewController.m */; };
@@ -259,6 +262,12 @@
 		AB88441A1B913DBB00FA526D /* ChooseLocaViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseLocaViewController.m; sourceTree = "<group>"; };
 		AB88441C1B914D0F00FA526D /* CLTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLTableViewCell.h; sourceTree = "<group>"; };
 		AB88441D1B914D0F00FA526D /* CLTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CLTableViewCell.m; sourceTree = "<group>"; };
+		ABEF1DA51B929D5400C1C2EA /* SupplierDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SupplierDetailViewController.h; sourceTree = "<group>"; };
+		ABEF1DA61B929D5400C1C2EA /* SupplierDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SupplierDetailViewController.m; sourceTree = "<group>"; };
+		ABEF1DA91B92A18E00C1C2EA /* ClerkDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClerkDetailViewController.h; sourceTree = "<group>"; };
+		ABEF1DAA1B92A18E00C1C2EA /* ClerkDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClerkDetailViewController.m; sourceTree = "<group>"; };
+		ABEF1DAD1B92AD2700C1C2EA /* TenantViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TenantViewController.h; sourceTree = "<group>"; };
+		ABEF1DAE1B92AD2700C1C2EA /* TenantViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TenantViewController.m; sourceTree = "<group>"; };
 		FF012F941B8EB92C00AE563C /* VipInfoMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VipInfoMode.m; sourceTree = "<group>"; };
 		FF012F951B8EB92C00AE563C /* VipInfoMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VipInfoMode.h; sourceTree = "<group>"; };
 		FF012F961B8EB92C00AE563C /* HYXFJLListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HYXFJLListViewController.xib; sourceTree = "<group>"; };
@@ -651,6 +660,7 @@
 		AB40EAB21B8BF96700DE5ED7 /* ClerkVC */ = {
 			isa = PBXGroup;
 			children = (
+				ABEF1DA81B92A18300C1C2EA /* ClerkDetailVC */,
 				AB40EAB31B8BF97500DE5ED7 /* ClerkViewController.h */,
 				AB40EAB41B8BF97500DE5ED7 /* ClerkViewController.m */,
 				AB40EAB91B8BFA0100DE5ED7 /* ClerkTableViewCell.h */,
@@ -663,6 +673,7 @@
 		AB40EABE1B8C01FA00DE5ED7 /* SupplierVC */ = {
 			isa = PBXGroup;
 			children = (
+				ABEF1DA41B929D4100C1C2EA /* SupplierDetailVC */,
 				AB40EABF1B8C020700DE5ED7 /* SupplierViewController.h */,
 				AB40EAC01B8C020700DE5ED7 /* SupplierViewController.m */,
 				AB40EAC21B8C021800DE5ED7 /* SupplierTableViewCell.h */,
@@ -711,6 +722,33 @@
 			path = ChooseLocaVC;
 			sourceTree = "<group>";
 		};
+		ABEF1DA41B929D4100C1C2EA /* SupplierDetailVC */ = {
+			isa = PBXGroup;
+			children = (
+				ABEF1DA51B929D5400C1C2EA /* SupplierDetailViewController.h */,
+				ABEF1DA61B929D5400C1C2EA /* SupplierDetailViewController.m */,
+			);
+			path = SupplierDetailVC;
+			sourceTree = "<group>";
+		};
+		ABEF1DA81B92A18300C1C2EA /* ClerkDetailVC */ = {
+			isa = PBXGroup;
+			children = (
+				ABEF1DA91B92A18E00C1C2EA /* ClerkDetailViewController.h */,
+				ABEF1DAA1B92A18E00C1C2EA /* ClerkDetailViewController.m */,
+			);
+			path = ClerkDetailVC;
+			sourceTree = "<group>";
+		};
+		ABEF1DAC1B92AD1800C1C2EA /* Tenant */ = {
+			isa = PBXGroup;
+			children = (
+				ABEF1DAD1B92AD2700C1C2EA /* TenantViewController.h */,
+				ABEF1DAE1B92AD2700C1C2EA /* TenantViewController.m */,
+			);
+			path = Tenant;
+			sourceTree = "<group>";
+		};
 		FF2A6BD11A0F3780001607AC = {
 			isa = PBXGroup;
 			children = (
@@ -965,6 +1003,7 @@
 		FF2A6C8D1A0F3CC9001607AC /* FourthViewController */ = {
 			isa = PBXGroup;
 			children = (
+				ABEF1DAC1B92AD1800C1C2EA /* Tenant */,
 				AB8844181B913DA500FA526D /* ChooseLocaVC */,
 				AB88440E1B913D5A00FA526D /* DropDownView */,
 				AB40EABE1B8C01FA00DE5ED7 /* SupplierVC */,
@@ -1439,11 +1478,13 @@
 				FF5C86F91B81B72400F79EC1 /* MASConstraint.m in Sources */,
 				FFD26CDE1B8B0B4E0003F491 /* KCYJManager.m in Sources */,
 				FF2A6C021A0F398D001607AC /* BaseViewController.m in Sources */,
+				ABEF1DAB1B92A18E00C1C2EA /* ClerkDetailViewController.m in Sources */,
 				FF2A6C6C1A0F3B7B001607AC /* NSData+ImageContentType.m in Sources */,
 				FF2A6C701A0F3B7B001607AC /* SDWebImageDownloader.m in Sources */,
 				FF2A6C481A0F3B72001607AC /* JSONKit.m in Sources */,
 				FF2A6C781A0F3B7B001607AC /* UIImageView+HighlightedWebCache.m in Sources */,
 				FFD26CE11B8B10970003F491 /* KCYJMode.m in Sources */,
+				ABEF1DA71B929D5400C1C2EA /* SupplierDetailViewController.m in Sources */,
 				5B1F7FA01B90A9C000763059 /* DJProductCheckListCell.m in Sources */,
 				FF3C20081A2F2A440081D3C7 /* GlobObserverObject.m in Sources */,
 				AB25793A1B8F02010015039A /* IQKeyboardReturnKeyHandler.m in Sources */,
@@ -1453,6 +1494,7 @@
 				FFF391951B846F58007DC652 /* AFHTTPRequestOperationManager.m in Sources */,
 				5B1F7F951B8F6AAA00763059 /* DJStoryboadManager.m in Sources */,
 				FF012FAF1B8EB92C00AE563C /* HYGLViewController.m in Sources */,
+				ABEF1DAF1B92AD2700C1C2EA /* TenantViewController.m in Sources */,
 				FF2A6BE01A0F3780001607AC /* main.m in Sources */,
 				FFF3919C1B846F58007DC652 /* AFURLSessionManager.m in Sources */,
 				5B54BA1A1B91FCB7002098A4 /* DJProductCheckDetail.m in Sources */,

diff --git a/YHB_Prj/YHB_Prj.xcodeproj/project.xcworkspace/xcshareddata/YHB_Prj.xccheckout b/YHB_Prj/YHB_Prj.xcodeproj/project.xcworkspace/xcshareddata/YHB_Prj.xccheckout
@@ -7,14 +7,14 @@
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>C1828BDD-CDD8-43D9-8080-66E39763FEEE</string>
 	<key>IDESourceControlProjectName</key>
-	<string>project</string>
+	<string>YHB_Prj</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>706F4A54D6D98022B9E07F56AD29736D3F1A7ADB</key>
 		<string>https://github.com/liuchaogenius/DianjiaApp.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>YHB_Prj/YHB_Prj.xcodeproj/project.xcworkspace</string>
+	<string>YHB_Prj/YHB_Prj.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>706F4A54D6D98022B9E07F56AD29736D3F1A7ADB</key>

diff --git a/YHB_Prj/YHB_Prj/FourthViewController/ChooseLocaVC/ChooseLocaViewController.m b/YHB_Prj/YHB_Prj/FourthViewController/ChooseLocaVC/ChooseLocaViewController.m
@@ -78,6 +78,8 @@ - (void)viewDidLoad {
 
         UITextField *tf = [[UITextField alloc] initWithFrame:CGRectMake(3, 0, bgView.width-3-11, 16)];
         tf.delegate = self;
+        tf.font = kFont12;
+        tf.textAlignment = NSTextAlignmentCenter;
         tf.tag = 100+i;
         [bgView addSubview:tf];
 
@@ -96,7 +98,7 @@ - (void)viewDidLoad {
     NSString *title = @"详细地址:";
     CGSize stringSize = [title sizeWithAttributes:[NSDictionary dictionaryWithObjectsAndKeys:kFont12,NSFontAttributeName, nil]];
     CGFloat stringWidth = stringSize.width;
-    kCreateLabel(detailLabel, CGRectMake(15, endHeight+20, stringWidth, 16), 12, [UIColor blackColor], title);
+    kCreateLabel(detailLabel, CGRectMake(15, endHeight+25, stringWidth, 16), 12, [UIColor blackColor], title);
     [self.view addSubview:detailLabel];
 
     _detailTF = [[UITextField alloc] initWithFrame:CGRectMake(detailLabel.right+3, detailLabel.top, kMainScreenWidth-detailLabel.right-20, 16)];
@@ -111,7 +113,7 @@ - (void)viewDidLoad {
     UIColor *btnColor = [UIColor orangeColor];
     for (int i=0; i<2; i++)
     {
-        UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(15+kMainScreenWidth/2.0*i, lineView.bottom+40, kMainScreenWidth/2.0-30, 30)];
+        UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(15+kMainScreenWidth/2.0*i, lineView.bottom+35, kMainScreenWidth/2.0-30, 30)];
         btn.tag = 500+i;
         [btn setTitleColor:btnColor forState:UIControlStateNormal];
         btn.layer.borderColor = [btnColor CGColor];
@@ -158,12 +160,29 @@ - (void)viewDidLoad {
 
 - (void)touchLeftBtn
 {
-    NSLog(@"%s",__func__);
+    BOOL haveText = [self haveText];
+    if (haveText==YES)
+    {
+        NSString *locaStr = [NSString stringWithFormat:@"%@%@%@%@", _aTextField.text,_bTextField.text,_cTextField.text,_detailTF.text];
+        _myBlock(locaStr);
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+    else
+    {
+        [SVProgressHUD showErrorWithStatus:@"请核对输入信息" cover:YES offsetY:kMainScreenHeight/2.0];
+    }
+}
+
+- (BOOL)haveText
+{
+    BOOL detailHaveText;
+    kStringIsNotEmpty(detailHaveText, _detailTF.text);
+    return detailHaveText;
 }
 
 - (void)touchRightBtn
 {
-    NSLog(@"%s",__func__);
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (void)touchBtn:(UIButton *)sender

diff --git a/YHB_Prj/YHB_Prj/FourthViewController/ClerkVC/ClerkDetailVC/ClerkDetailViewController.h b/YHB_Prj/YHB_Prj/FourthViewController/ClerkVC/ClerkDetailVC/ClerkDetailViewController.h
@@ -0,0 +1,13 @@
+//
+//  ClerkDetailViewController.h
+//  YHB_Prj
+//
+//  Created by Johnny's on 15/8/30.
+//  Copyright (c) 2015年 striveliu. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface ClerkDetailViewController : BaseViewController
+
+@end