订单管理界面、订单详情界面顶部视图自适应内容高度

c2758b36 · Sandy · 3aba241b · c2758b36 · c2758b36 · c2758b36
Commit c2758b36 authored Mar 31, 2016 by Sandy
58 changed files
--- a/ALand.xcodeproj/project.pbxproj
+++ b/ALand.xcodeproj/project.pbxproj
@@ -7,6 +7,11 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		191383351CAB95F5005F6440 /* NoPaymentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */; };
+		1913833A1CAB96D4005F6440 /* OrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 191383381CAB96D4005F6440 /* OrderTableViewCell.m */; };
+		1913833B1CAB96D4005F6440 /* OrderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 191383391CAB96D4005F6440 /* OrderTableViewCell.xib */; };
+		1913833D1CAB9DC2005F6440 /* OrderCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1913833C1CAB9DC2005F6440 /* OrderCellView.xib */; };
+		191383401CAB9DD4005F6440 /* OrderCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1913833F1CAB9DD4005F6440 /* OrderCellView.m */; };
 		1929F16D1C9FCB62000E9B26 /* NSDictionary+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929F16C1C9FCB62000E9B26 /* NSDictionary+Category.m */; };
 		1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */; };
 		1929F17C1CA0DD77000E9B26 /* HomeTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929F17B1CA0DD77000E9B26 /* HomeTopView.m */; };
@@ -42,6 +47,16 @@
 		197975451CAA2FAB00407E3F /* ManagementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 197975441CAA2FAB00407E3F /* ManagementViewController.m */; };
 		197975481CAA4DAD00407E3F /* CommodityMutipleSelectBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 197975471CAA4DAD00407E3F /* CommodityMutipleSelectBottomView.m */; };
 		1979754A1CAA4DB900407E3F /* CommodityMutipleSelectBottomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 197975491CAA4DB900407E3F /* CommodityMutipleSelectBottomView.xib */; };
+		1979754D1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1979754C1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m */; };
+		197975511CAB6F5D00407E3F /* OrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 197975501CAB6F5D00407E3F /* OrderViewController.m */; };
+		199B4D5B1CABB86E00451E0E /* WaitForDispatchTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D5A1CABB86E00451E0E /* WaitForDispatchTableViewController.m */; };
+		199B4D5E1CABBA5A00451E0E /* TransportedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D5D1CABBA5A00451E0E /* TransportedTableViewController.m */; };
+		199B4D611CABBB3800451E0E /* CommpleteTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D601CABBB3800451E0E /* CommpleteTableViewController.m */; };
+		199B4D641CABBB4C00451E0E /* CanceledTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D631CABBB4C00451E0E /* CanceledTableViewController.m */; };
+		199B4D681CABBCF600451E0E /* OrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D671CABBCF600451E0E /* OrderDetailViewController.m */; };
+		199B4D6A1CABBEF400451E0E /* OrderDetailTopView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */; };
+		199B4D6D1CABBF0800451E0E /* OrderDetailTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */; };
+		199B4D741CABE4B300451E0E /* NSString+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B4D731CABE4B300451E0E /* NSString+Category.m */; };
 		199BC7A11C9AA7DF00E4E0B8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7A01C9AA7DF00E4E0B8 /* HomeViewController.m */; };
 		199BC7B11C9AD4FD00E4E0B8 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7AF1C9AD4FD00E4E0B8 /* LoginViewController.m */; };
 		199BC7B21C9AD4FD00E4E0B8 /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 199BC7B01C9AD4FD00E4E0B8 /* LoginViewController.xib */; };
@@ -166,6 +181,14 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		191383331CAB95F5005F6440 /* NoPaymentTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NoPaymentTableViewController.h; path = ../NoPaymentTableViewController.h; sourceTree = "<group>"; };
+		191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NoPaymentTableViewController.m; path = ../NoPaymentTableViewController.m; sourceTree = "<group>"; };
+		191383371CAB96D4005F6440 /* OrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderTableViewCell.h; sourceTree = "<group>"; };
+		191383381CAB96D4005F6440 /* OrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderTableViewCell.m; sourceTree = "<group>"; };
+		191383391CAB96D4005F6440 /* OrderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderTableViewCell.xib; sourceTree = "<group>"; };
+		1913833C1CAB9DC2005F6440 /* OrderCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderCellView.xib; sourceTree = "<group>"; };
+		1913833E1CAB9DD4005F6440 /* OrderCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderCellView.h; sourceTree = "<group>"; };
+		1913833F1CAB9DD4005F6440 /* OrderCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderCellView.m; sourceTree = "<group>"; };
 		1929F16B1C9FCB62000E9B26 /* NSDictionary+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Category.h"; sourceTree = "<group>"; };
 		1929F16C1C9FCB62000E9B26 /* NSDictionary+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Category.m"; sourceTree = "<group>"; };
 		1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -227,6 +250,25 @@
 		197975461CAA4DAD00407E3F /* CommodityMutipleSelectBottomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommodityMutipleSelectBottomView.h; sourceTree = "<group>"; };
 		197975471CAA4DAD00407E3F /* CommodityMutipleSelectBottomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommodityMutipleSelectBottomView.m; sourceTree = "<group>"; };
 		197975491CAA4DB900407E3F /* CommodityMutipleSelectBottomView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CommodityMutipleSelectBottomView.xib; sourceTree = "<group>"; };
+		1979754B1CAB6E1300407E3F /* JavenMultipleViewWithHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenMultipleViewWithHeader.h; sourceTree = "<group>"; };
+		1979754C1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenMultipleViewWithHeader.m; sourceTree = "<group>"; };
+		1979754F1CAB6F5D00407E3F /* OrderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderViewController.h; sourceTree = "<group>"; };
+		197975501CAB6F5D00407E3F /* OrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderViewController.m; sourceTree = "<group>"; };
+		199B4D591CABB86E00451E0E /* WaitForDispatchTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WaitForDispatchTableViewController.h; path = ../WaitForDispatchTableViewController.h; sourceTree = "<group>"; };
+		199B4D5A1CABB86E00451E0E /* WaitForDispatchTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WaitForDispatchTableViewController.m; path = ../WaitForDispatchTableViewController.m; sourceTree = "<group>"; };
+		199B4D5C1CABBA5A00451E0E /* TransportedTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TransportedTableViewController.h; path = ../TransportedTableViewController.h; sourceTree = "<group>"; };
+		199B4D5D1CABBA5A00451E0E /* TransportedTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TransportedTableViewController.m; path = ../TransportedTableViewController.m; sourceTree = "<group>"; };
+		199B4D5F1CABBB3800451E0E /* CommpleteTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommpleteTableViewController.h; path = ../CommpleteTableViewController.h; sourceTree = "<group>"; };
+		199B4D601CABBB3800451E0E /* CommpleteTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommpleteTableViewController.m; path = ../CommpleteTableViewController.m; sourceTree = "<group>"; };
+		199B4D621CABBB4C00451E0E /* CanceledTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CanceledTableViewController.h; path = ../CanceledTableViewController.h; sourceTree = "<group>"; };
+		199B4D631CABBB4C00451E0E /* CanceledTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CanceledTableViewController.m; path = ../CanceledTableViewController.m; sourceTree = "<group>"; };
+		199B4D661CABBCF600451E0E /* OrderDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailViewController.h; sourceTree = "<group>"; };
+		199B4D671CABBCF600451E0E /* OrderDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailViewController.m; sourceTree = "<group>"; };
+		199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderDetailTopView.xib; sourceTree = "<group>"; };
+		199B4D6B1CABBF0800451E0E /* OrderDetailTopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailTopView.h; sourceTree = "<group>"; };
+		199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailTopView.m; sourceTree = "<group>"; };
+		199B4D721CABE4B300451E0E /* NSString+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Category.h"; sourceTree = "<group>"; };
+		199B4D731CABE4B300451E0E /* NSString+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Category.m"; sourceTree = "<group>"; };
 		199BC79F1C9AA7DF00E4E0B8 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
 		199BC7A01C9AA7DF00E4E0B8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		199BC7AE1C9AD4FD00E4E0B8 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
@@ -474,6 +516,22 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		191383361CAB961B005F6440 /* Order */ = {
+			isa = PBXGroup;
+			children = (
+				191383371CAB96D4005F6440 /* OrderTableViewCell.h */,
+				191383381CAB96D4005F6440 /* OrderTableViewCell.m */,
+				191383391CAB96D4005F6440 /* OrderTableViewCell.xib */,
+				1913833E1CAB9DD4005F6440 /* OrderCellView.h */,
+				1913833F1CAB9DD4005F6440 /* OrderCellView.m */,
+				1913833C1CAB9DC2005F6440 /* OrderCellView.xib */,
+				199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */,
+				199B4D6B1CABBF0800451E0E /* OrderDetailTopView.h */,
+				199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */,
+			);
+			path = Order;
+			sourceTree = "<group>";
+		};
 		1940D2DE1C9A56730080678C = {
 			isa = PBXGroup;
 			children = (
@@ -612,6 +670,35 @@
 			name = CommodityManagement;
 			sourceTree = "<group>";
 		};
+		1979754E1CAB6F4700407E3F /* Order */ = {
+			isa = PBXGroup;
+			children = (
+				199B4D651CABBCA700451E0E /* OrderViewcontrollerSubviews */,
+				1979754F1CAB6F5D00407E3F /* OrderViewController.h */,
+				197975501CAB6F5D00407E3F /* OrderViewController.m */,
+				199B4D661CABBCF600451E0E /* OrderDetailViewController.h */,
+				199B4D671CABBCF600451E0E /* OrderDetailViewController.m */,
+			);
+			path = Order;
+			sourceTree = "<group>";
+		};
+		199B4D651CABBCA700451E0E /* OrderViewcontrollerSubviews */ = {
+			isa = PBXGroup;
+			children = (
+				191383331CAB95F5005F6440 /* NoPaymentTableViewController.h */,
+				191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */,
+				199B4D591CABB86E00451E0E /* WaitForDispatchTableViewController.h */,
+				199B4D5A1CABB86E00451E0E /* WaitForDispatchTableViewController.m */,
+				199B4D5C1CABBA5A00451E0E /* TransportedTableViewController.h */,
+				199B4D5D1CABBA5A00451E0E /* TransportedTableViewController.m */,
+				199B4D5F1CABBB3800451E0E /* CommpleteTableViewController.h */,
+				199B4D601CABBB3800451E0E /* CommpleteTableViewController.m */,
+				199B4D621CABBB4C00451E0E /* CanceledTableViewController.h */,
+				199B4D631CABBB4C00451E0E /* CanceledTableViewController.m */,
+			);
+			path = OrderViewcontrollerSubviews;
+			sourceTree = "<group>";
+		};
 		199BC7931C9AA70C00E4E0B8 /* Massage */ = {
 			isa = PBXGroup;
 			children = (
@@ -821,6 +908,7 @@
 		19DCCA871C9A95E70072C3BF /* View */ = {
 			isa = PBXGroup;
 			children = (
+				191383361CAB961B005F6440 /* Order */,
 				1979752F1CA90D8600407E3F /* CommodityManagement */,
 				19ADD3781CA4D38B00EE6E5A /* Commodity */,
 				1929F18F1CA11472000E9B26 /* HomeCollectionViewCell.h */,
@@ -839,6 +927,7 @@
 		19DCCA881C9A95E70072C3BF /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
+				1979754E1CAB6F4700407E3F /* Order */,
 				19ADD36B1CA3B88A00EE6E5A /* Commodity */,
 				1979752B1CA90D3900407E3F /* CommodityManagement */,
 				199BC79F1C9AA7DF00E4E0B8 /* HomeViewController.h */,
@@ -1005,6 +1094,8 @@
 		19DCCB7E1C9AA0450072C3BF /* General */ = {
 			isa = PBXGroup;
 			children = (
+				1979754B1CAB6E1300407E3F /* JavenMultipleViewWithHeader.h */,
+				1979754C1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m */,
 				199BC7CE1C9BAC9600E4E0B8 /* MyTools.h */,
 				199BC7CF1C9BAC9600E4E0B8 /* MyTools.m */,
 				19DCCB7F1C9AA0450072C3BF /* Categories */,
@@ -1075,6 +1166,8 @@
 				1929F1801CA0E597000E9B26 /* UIView+Category.m */,
 				197975401CAA23BC00407E3F /* UITableView+Category.h */,
 				197975411CAA23BC00407E3F /* UITableView+Category.m */,
+				199B4D721CABE4B300451E0E /* NSString+Category.h */,
+				199B4D731CABE4B300451E0E /* NSString+Category.m */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -1275,7 +1368,10 @@
 				19ADD3871CA4E21100EE6E5A /* AddCommodityHeaderView.xib in Resources */,
 				199BC7CD1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib in Resources */,
 				1929F1861CA0EA74000E9B26 /* MoneyView.xib in Resources */,
+				1913833D1CAB9DC2005F6440 /* OrderCellView.xib in Resources */,
+				199B4D6A1CABBEF400451E0E /* OrderDetailTopView.xib in Resources */,
 				199BC7B81C9ADD5500E4E0B8 /* ToLoginViewController.xib in Resources */,
+				1913833B1CAB96D4005F6440 /* OrderTableViewCell.xib in Resources */,
 				1979751C1CA8CDF300407E3F /* CommodityDetailBottomView.xib in Resources */,
 				195EB1E11CA5292600E298BB /* AddCommodityFooterCollectionReusableView.xib in Resources */,
 				1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */,
@@ -1371,6 +1467,7 @@
 				19ADD3671CA3A16C00EE6E5A /* CoverShadowView.m in Sources */,
 				199BC7BE1C9B045B00E4E0B8 /* RigistViewController.m in Sources */,
 				199BC7D01C9BAC9600E4E0B8 /* MyTools.m in Sources */,
+				199B4D681CABBCF600451E0E /* OrderDetailViewController.m in Sources */,
 				199BC7B11C9AD4FD00E4E0B8 /* LoginViewController.m in Sources */,
 				1979752E1CA90D6C00407E3F /* CommodityManagementViewController.m in Sources */,
 				19DCCBE21C9AA0450072C3BF /* JTOptionsViewController.m in Sources */,
@@ -1381,8 +1478,10 @@
 				19DCCBD11C9AA0450072C3BF /* UILabel+SizeCalculate.m in Sources */,
 				19DCCB751C9A9EB30072C3BF /* IBTUITextField.m in Sources */,
 				197975481CAA4DAD00407E3F /* CommodityMutipleSelectBottomView.m in Sources */,
+				199B4D741CABE4B300451E0E /* NSString+Category.m in Sources */,
 				19DCCBE31C9AA0450072C3BF /* ICRFunctionBaseView.m in Sources */,
 				19DCCB6A1C9A9EB30072C3BF /* IBTSegmentContainer.m in Sources */,
+				199B4D641CABBB4C00451E0E /* CanceledTableViewController.m in Sources */,
 				19DCCB5F1C9A9EB30072C3BF /* IBTRefreshTableView.m in Sources */,
 				1979751F1CA8D51700407E3F /* CommodityDetailBottomView.m in Sources */,
 				19DCCBD81C9AA0450072C3BF /* UIViewController+LogicController.m in Sources */,
@@ -1411,8 +1510,12 @@
 				19DCCB691C9A9EB30072C3BF /* IBTObject.m in Sources */,
 				19DCCBDD1C9AA0450072C3BF /* IBTFileManager.m in Sources */,
 				19ADD3771CA4D19F00EE6E5A /* AddCommodityViewController.m in Sources */,
+				199B4D6D1CABBF0800451E0E /* OrderDetailTopView.m in Sources */,
 				19DCCBC71C9AA0450072C3BF /* NSDate+FormatterAdditions.m in Sources */,
 				19DCCB6F1C9A9EB30072C3BF /* IBTUIButton.m in Sources */,
+				1913833A1CAB96D4005F6440 /* OrderTableViewCell.m in Sources */,
+				199B4D611CABBB3800451E0E /* CommpleteTableViewController.m in Sources */,
+				191383401CAB9DD4005F6440 /* OrderCellView.m in Sources */,
 				199BC7C71C9BA2A300E4E0B8 /* ResetPasswordViewController.m in Sources */,
 				19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */,
 				199BC7C31C9B9B7700E4E0B8 /* UIButton+countDown.m in Sources */,
@@ -1437,6 +1540,7 @@
 				19DCCB6D1C9A9EB30072C3BF /* IBTTableView.m in Sources */,
 				19DCCB731C9A9EB30072C3BF /* IBTUIScrollView.m in Sources */,
 				199BC7D91C9BBE1A00E4E0B8 /* MassageViewController.m in Sources */,
+				1979754D1CAB6E1300407E3F /* JavenMultipleViewWithHeader.m in Sources */,
 				19DCCBCE1C9AA0450072C3BF /* UIImage+Fit.m in Sources */,
 				19DCCB681C9A9EB30072C3BF /* IBTLoadingView.m in Sources */,
 				199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */,
@@ -1446,12 +1550,14 @@
 				19DCCB671C9A9EB30072C3BF /* IBTCustomButtom.m in Sources */,
 				195EB1DB1CA516CE00E298BB /* HotCommodityCell.m in Sources */,
 				19DCCB711C9A9EB30072C3BF /* IBTUILabel.m in Sources */,
+				199B4D5E1CABBA5A00451E0E /* TransportedTableViewController.m in Sources */,
 				19DCCB651C9A9EB30072C3BF /* IBTBadgeView.m in Sources */,
 				19DCCBEF1C9AA1D50072C3BF /* QueryOrder.m in Sources */,
 				19DCCB5E1C9A9EB30072C3BF /* IBTModel.m in Sources */,
 				19DCCBD51C9AA0450072C3BF /* UITableViewCell+Helper.m in Sources */,
 				19DCCBE01C9AA0450072C3BF /* JTOptionCell.m in Sources */,
 				19DCCBE11C9AA0450072C3BF /* JTOptionsEntity.m in Sources */,
+				199B4D5B1CABB86E00451E0E /* WaitForDispatchTableViewController.m in Sources */,
 				19ADD36A1CA3AC9D00EE6E5A /* UIButton+Category.m in Sources */,
 				1940D2EC1C9A56730080678C /* main.m in Sources */,
 				19DCCBF91C9AA2180072C3BF /* RIButtonItem.m in Sources */,
@@ -1463,10 +1569,12 @@
 				19DCCB6C1C9A9EB30072C3BF /* IBTTabBarController.m in Sources */,
 				19DCCB621C9A9EB30072C3BF /* IBTTableViewInfo.m in Sources */,
 				19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */,
+				191383351CAB95F5005F6440 /* NoPaymentTableViewController.m in Sources */,
 				19DCCB6B1C9A9EB30072C3BF /* IBTSegmentedControl.m in Sources */,
 				19ADD3841CA4D3C400EE6E5A /* AddCommodityCollectionViewCell.m in Sources */,
 				199BC7D31C9BBE0100E4E0B8 /* StoreViewController.m in Sources */,
 				19DCCBD71C9AA0450072C3BF /* UIView+ViewFrameGeometry.m in Sources */,
+				197975511CAB6F5D00407E3F /* OrderViewController.m in Sources */,
 				19DCCBDF1C9AA0450072C3BF /* ICRPlaceholderTextView.m in Sources */,
 				19DCCBCD1C9AA0450072C3BF /* UIFont+Custom.m in Sources */,
 				19DCCBE41C9AA0450072C3BF /* ICRFunctionEntity.m in Sources */,

--- a/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/Contents.json
+++ b/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/Contents.json
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/Contents.json
+++ b/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_noPayment.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_noPayment@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/order_state_noPayment.png
+++ b/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/order_state_noPayment.png
--- a/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/order_state_noPayment@2x.png
+++ b/ALand/Assets.xcassets/02订单详情-待支付_iPhone_assets/order_state_noPayment.imageset/order_state_noPayment@2x.png
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/Contents.json
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/Contents.json
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/Contents.json
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "call_icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "call_icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/call_icon.png
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/call_icon.png
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/call_icon@2x.png
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/call_icon.imageset/call_icon@2x.png
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/Contents.json
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "order_state.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_state@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/order_state.png
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/order_state.png
--- a/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/order_state@2x.png
+++ b/ALand/Assets.xcassets/02订单详情_iPhone_assets/order_state.imageset/order_state@2x.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/Contents.json
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/Contents.json
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/Contents.json
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "call_icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "call_icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/call_icon.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/call_icon.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/call_icon@2x.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/call_icon.imageset/call_icon@2x.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/Contents.json
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_unstasport.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_unstasport@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/order_state_unstasport.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/order_state_unstasport.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/order_state_unstasport@2x.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/order_state_unstasport.imageset/order_state_unstasport@2x.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/Contents.json
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "state_unstasport.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "state_unstasport@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/state_unstasport.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/state_unstasport.png
--- a/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/state_unstasport@2x.png
+++ b/ALand/Assets.xcassets/03订单详情待发货_iPhone_assets/state_unstasport.imageset/state_unstasport@2x.png
--- a/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/Contents.json
+++ b/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/Contents.json
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/Contents.json
+++ b/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_transported.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "order_state_transported@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/order_state_transported.png
+++ b/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/order_state_transported.png
--- a/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/order_state_transported@2x.png
+++ b/ALand/Assets.xcassets/04订单详情已发货_iPhone_assets/order_state_transported.imageset/order_state_transported@2x.png
--- a/ALand/CodeClass/Home/View/CommodityManagementTopView.m
+++ b/ALand/CodeClass/Home/View/CommodityManagementTopView.m
@@ -10,6 +10,7 @@
 #import "UIView+Category.h"
 #import "ManagementViewController.h"
 #import "CommodityManagementViewController.h"
+#import "AddCommodityViewController.h"
 @interface CommodityManagementTopView ()
 @property (weak, nonatomic) IBOutlet UIButton *buttonAdd;
 @property (weak, nonatomic) IBOutlet UIButton *buttonManagement;
@@ -33,6 +34,10 @@
 }
 - (IBAction)addAct:(id)sender {
    [self hideSortView];
+    AddCommodityViewController *addVC = [[AddCommodityViewController alloc] init];
+    addVC.hidesBottomBarWhenPushed = YES;
+    [[self viewController].navigationController pushViewController:addVC animated:YES];
+    
    CLog(@"a");
 }
 - (void)hideSortView {

--- a/ALand/CodeClass/Home/View/CommodityTableViewCell.xib
+++ b/ALand/CodeClass/Home/View/CommodityTableViewCell.xib
@@ -39,14 +39,14 @@
                        <color key="textColor" red="1" green="0.3921568627" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
                        <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="ovJ-rr-g9w">
-                        <rect key="frame" x="174" y="69" width="57" height="23"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ovJ-rr-g9w">
+                        <rect key="frame" x="174" y="69" width="44" height="23"/>
                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
                        <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                        <nil key="highlightedColor"/>
                    </label>
                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥9.8" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSJ-Pe-NgQ">
-                        <rect key="frame" x="231" y="69" width="50" height="24"/>
+                        <rect key="frame" x="218" y="69" width="50" height="24"/>
                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                        <nil key="highlightedColor"/>

--- a/ALand/CodeClass/Home/View/Order/OrderCellView.h
+++ b/ALand/CodeClass/Home/View/Order/OrderCellView.h
+//
+//  OrderCellView.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OrderCellView : UIView
+
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderCellView.m
+++ b/ALand/CodeClass/Home/View/Order/OrderCellView.m
+//
+//  OrderCellView.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderCellView.h"
+
+@implementation OrderCellView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderCellView.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderCellView.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"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="commodityManagementImage" translatesAutoresizingMaskIntoConstraints="NO" id="gvZ-Yx-Ujy">
+                    <rect key="frame" x="8" y="8" width="90" height="121"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="90" id="92I-IA-f2F"/>
+                        <constraint firstAttribute="height" constant="81" id="C9T-Ih-pvI"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="oly-J2-P6X"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="C9T-Ih-pvI"/>
+                        </mask>
+                    </variation>
+                </imageView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bloem天然草本更年期综合营养 胶囊100粒 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dhI-dB-05Q">
+                    <rect key="frame" x="106" y="8" width="206" height="41"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="96粒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bGv-K4-Dnw">
+                    <rect key="frame" x="106" y="82" width="43" height="23"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OR2-4k-rSi">
+                    <rect key="frame" x="157" y="82" width="21" height="23"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="售价：￥279" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vW8-v5-AfH">
+                    <rect key="frame" x="106" y="108" width="98" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="acf-qI-3N1">
+                    <rect key="frame" x="8" y="138" width="304" height="1"/>
+                    <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="23G-ad-XsJ"/>
+                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="1" id="Z3D-fb-vaB"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="bGv-K4-Dnw" firstAttribute="leading" secondItem="dhI-dB-05Q" secondAttribute="leading" id="0l8-KH-vVl"/>
+                <constraint firstAttribute="trailingMargin" secondItem="dhI-dB-05Q" secondAttribute="trailing" id="8t4-X9-fTa"/>
+                <constraint firstItem="dhI-dB-05Q" firstAttribute="leading" secondItem="gvZ-Yx-Ujy" secondAttribute="trailing" constant="8" id="DyV-JN-MBh"/>
+                <constraint firstItem="gvZ-Yx-Ujy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="E1r-kk-ilm"/>
+                <constraint firstItem="vW8-v5-AfH" firstAttribute="top" secondItem="bGv-K4-Dnw" secondAttribute="bottom" constant="3" id="TUm-3B-rCo"/>
+                <constraint firstItem="vW8-v5-AfH" firstAttribute="bottom" secondItem="gvZ-Yx-Ujy" secondAttribute="bottom" id="Vyg-Eu-u0I"/>
+                <constraint firstItem="gvZ-Yx-Ujy" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="topMargin" id="Wka-bt-cZs"/>
+                <constraint firstItem="vW8-v5-AfH" firstAttribute="leading" secondItem="bGv-K4-Dnw" secondAttribute="leading" id="Wps-v8-DZG"/>
+                <constraint firstItem="acf-qI-3N1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="XW2-I5-FBt"/>
+                <constraint firstItem="OR2-4k-rSi" firstAttribute="leading" secondItem="bGv-K4-Dnw" secondAttribute="trailing" constant="8" id="ZRX-DE-Tgo"/>
+                <constraint firstAttribute="bottomMargin" secondItem="gvZ-Yx-Ujy" secondAttribute="bottom" constant="3" id="cJq-F0-J8w"/>
+                <constraint firstItem="dhI-dB-05Q" firstAttribute="top" secondItem="gvZ-Yx-Ujy" secondAttribute="top" id="g7A-BG-g7x"/>
+                <constraint firstAttribute="trailing" secondItem="acf-qI-3N1" secondAttribute="trailing" constant="8" id="qgd-jV-kN7"/>
+                <constraint firstItem="OR2-4k-rSi" firstAttribute="centerY" secondItem="bGv-K4-Dnw" secondAttribute="centerY" id="qiC-Hv-sB8"/>
+                <constraint firstAttribute="bottom" secondItem="acf-qI-3N1" secondAttribute="bottom" constant="1" id="zcZ-yg-SPG"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="252" y="351"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="commodityManagementImage" width="185" height="185"/>
+    </resources>
+</document>
--- a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
+//
+//  OrderDetailTopView.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OrderDetailTopView : UIView
+@property (weak, nonatomic) IBOutlet UILabel *labelAddress;
+@property (nonatomic) CGFloat viewHeight;
+
+
+- (CGFloat)viewHeight;
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
+//
+//  OrderDetailTopView.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderDetailTopView.h"
+
+@interface OrderDetailTopView ()
+@property (weak, nonatomic) IBOutlet UILabel *labelBottom;
+@property (weak, nonatomic) IBOutlet UIView *labelLastView;
+
+@end
+@implementation OrderDetailTopView
+- (void)awakeFromNib {
+    
+   
+    
+}
+
+
+- (CGFloat)viewHeight {
+    return self.labelLastView.bottom;
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.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"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDetailTopView"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="OrderDetailTopView">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="419"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZw-qi-pdT">
+                    <rect key="frame" x="8" y="8" width="68" height="21"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="21" id="qYp-VA-CoQ"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" red="0.60138541666666667" green="0.60138541666666667" blue="0.60138541666666667" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kwe-gE-Axq">
+                    <rect key="frame" x="0.0" y="37" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KHj-g2-F1Z">
+                            <rect key="frame" x="8" y="14" width="85" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="85" id="1DP-ou-pkO"/>
+                                <constraint firstAttribute="height" constant="21" id="mji-Wf-vx2"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00022334432345" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="awy-IH-s2E">
+                            <rect key="frame" x="93" y="14" width="144" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zPc-Iq-6AX">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="i7N-ac-rWN"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="49" id="1rY-gm-4fC"/>
+                        <constraint firstItem="KHj-g2-F1Z" firstAttribute="centerY" secondItem="kwe-gE-Axq" secondAttribute="centerY" id="Agh-cM-C8g"/>
+                        <constraint firstItem="awy-IH-s2E" firstAttribute="centerY" secondItem="KHj-g2-F1Z" secondAttribute="centerY" id="ExR-tH-Ljx"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="zPc-Iq-6AX" secondAttribute="trailing" id="Ijy-Ql-SGn"/>
+                        <constraint firstItem="zPc-Iq-6AX" firstAttribute="bottom" secondItem="kwe-gE-Axq" secondAttribute="bottomMargin" constant="1" id="Xy8-q6-gma"/>
+                        <constraint firstItem="KHj-g2-F1Z" firstAttribute="leading" secondItem="kwe-gE-Axq" secondAttribute="leading" constant="8" id="e6s-3E-ehV"/>
+                        <constraint firstItem="awy-IH-s2E" firstAttribute="leading" secondItem="KHj-g2-F1Z" secondAttribute="trailing" id="f7Z-bx-Aja"/>
+                        <constraint firstAttribute="bottom" secondItem="zPc-Iq-6AX" secondAttribute="bottom" id="h7T-wk-ldL"/>
+                        <constraint firstItem="zPc-Iq-6AX" firstAttribute="leading" secondItem="kwe-gE-Axq" secondAttribute="leadingMargin" id="iNJ-qC-P6C"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="Xy8-q6-gma"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="frY-Ni-LsQ">
+                    <rect key="frame" x="0.0" y="86" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xzc-tf-koH">
+                            <rect key="frame" x="8" y="14" width="85" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00022334432345" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="azl-X9-pOX">
+                            <rect key="frame" x="93" y="14" width="144" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="90e-Nx-kwS">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="7Qz-8T-x1E"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="trailingMargin" secondItem="90e-Nx-kwS" secondAttribute="trailing" id="0Vx-y9-XlN"/>
+                        <constraint firstAttribute="bottom" secondItem="90e-Nx-kwS" secondAttribute="bottom" id="7yr-rF-YBK"/>
+                        <constraint firstItem="Xzc-tf-koH" firstAttribute="centerY" secondItem="frY-Ni-LsQ" secondAttribute="centerY" id="JZ3-Uj-IVa"/>
+                        <constraint firstItem="90e-Nx-kwS" firstAttribute="leading" secondItem="frY-Ni-LsQ" secondAttribute="leadingMargin" id="U5A-aL-RfR"/>
+                        <constraint firstAttribute="height" constant="49" id="X4e-iG-mnJ"/>
+                        <constraint firstItem="azl-X9-pOX" firstAttribute="leading" secondItem="Xzc-tf-koH" secondAttribute="trailing" id="eim-or-fgc"/>
+                        <constraint firstItem="azl-X9-pOX" firstAttribute="centerY" secondItem="Xzc-tf-koH" secondAttribute="centerY" id="fLF-w3-cDC"/>
+                        <constraint firstItem="90e-Nx-kwS" firstAttribute="bottom" secondItem="frY-Ni-LsQ" secondAttribute="bottomMargin" constant="1" id="iee-t1-dhY"/>
+                        <constraint firstItem="Xzc-tf-koH" firstAttribute="leading" secondItem="frY-Ni-LsQ" secondAttribute="leading" constant="8" id="vo1-pQ-0FV"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="iee-t1-dhY"/>
+                        </mask>
+                    </variation>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2rG-ti-JCC">
+                    <rect key="frame" x="8" y="143" width="85" height="21"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="21" id="UOj-5n-TCa"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" red="0.60138541670000001" green="0.60138541670000001" blue="0.60138541670000001" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o64-Kj-GIA">
+                    <rect key="frame" x="0.0" y="172" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMC-E5-B9j">
+                            <rect key="frame" x="8" y="14" width="68" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <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="hff-wW-3rZ">
+                            <rect key="frame" x="93" y="14" width="51" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ezy-Pc-QZ3">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="eIX-CW-iFz"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="49" id="B5h-cf-3e2"/>
+                        <constraint firstAttribute="bottom" secondItem="ezy-Pc-QZ3" secondAttribute="bottom" id="FYb-to-TU9"/>
+                        <constraint firstItem="ezy-Pc-QZ3" firstAttribute="bottom" secondItem="o64-Kj-GIA" secondAttribute="bottomMargin" constant="1" id="Vo6-mB-mS7"/>
+                        <constraint firstItem="pMC-E5-B9j" firstAttribute="centerY" secondItem="o64-Kj-GIA" secondAttribute="centerY" id="aqR-jL-zo3"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="ezy-Pc-QZ3" secondAttribute="trailing" id="b0x-Dr-UOK"/>
+                        <constraint firstItem="hff-wW-3rZ" firstAttribute="centerY" secondItem="pMC-E5-B9j" secondAttribute="centerY" id="bE0-UF-mZd"/>
+                        <constraint firstItem="hff-wW-3rZ" firstAttribute="leading" secondItem="pMC-E5-B9j" secondAttribute="trailing" id="dhA-dI-v6H"/>
+                        <constraint firstItem="ezy-Pc-QZ3" firstAttribute="leading" secondItem="o64-Kj-GIA" secondAttribute="leadingMargin" id="fir-b6-gP1"/>
+                        <constraint firstItem="pMC-E5-B9j" firstAttribute="leading" secondItem="o64-Kj-GIA" secondAttribute="leading" constant="8" id="suW-Er-yy7"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="Vo6-mB-mS7"/>
+                            <exclude reference="dhA-dI-v6H"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5It-5A-BoF">
+                    <rect key="frame" x="0.0" y="221" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系电话：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="otl-rE-SZa">
+                            <rect key="frame" x="8" y="14" width="85" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="182525435332" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g9c-Jz-PuK">
+                            <rect key="frame" x="93" y="14" width="120" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cmZ-vl-b4K">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="6rJ-qd-LaZ"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="otl-rE-SZa" firstAttribute="leading" secondItem="5It-5A-BoF" secondAttribute="leading" constant="8" id="4n9-CO-D8L"/>
+                        <constraint firstAttribute="height" constant="49" id="B6a-9l-HQw"/>
+                        <constraint firstItem="cmZ-vl-b4K" firstAttribute="bottom" secondItem="5It-5A-BoF" secondAttribute="bottomMargin" constant="1" id="Hcl-0P-p3u"/>
+                        <constraint firstItem="cmZ-vl-b4K" firstAttribute="leading" secondItem="5It-5A-BoF" secondAttribute="leadingMargin" id="Sj3-w5-CBv"/>
+                        <constraint firstItem="g9c-Jz-PuK" firstAttribute="leading" secondItem="otl-rE-SZa" secondAttribute="trailing" id="cVt-0n-37E"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="cmZ-vl-b4K" secondAttribute="trailing" id="gDh-jj-d0J"/>
+                        <constraint firstItem="g9c-Jz-PuK" firstAttribute="centerY" secondItem="otl-rE-SZa" secondAttribute="centerY" id="pl3-oG-dPc"/>
+                        <constraint firstAttribute="bottom" secondItem="cmZ-vl-b4K" secondAttribute="bottom" id="wkO-10-Og1"/>
+                        <constraint firstItem="otl-rE-SZa" firstAttribute="centerY" secondItem="5It-5A-BoF" secondAttribute="centerY" id="yGq-4d-7M6"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="Hcl-0P-p3u"/>
+                            <exclude reference="cVt-0n-37E"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L3h-Sp-ioz">
+                    <rect key="frame" x="0.0" y="270" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货地址：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ro9-2J-A4r">
+                            <rect key="frame" x="8" y="14" width="85" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="85" id="aso-kW-N9V"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="上海市 上海市 闵行区" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tAt-2m-H2J">
+                            <rect key="frame" x="93" y="14" width="219" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                            <size key="shadowOffset" width="0.0" height="0.0"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zgR-vR-1fa">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="uaG-aO-qVA"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="zgR-vR-1fa" firstAttribute="top" secondItem="tAt-2m-H2J" secondAttribute="bottom" constant="13" id="4DM-xk-e5D"/>
+                        <constraint firstItem="tAt-2m-H2J" firstAttribute="top" secondItem="L3h-Sp-ioz" secondAttribute="top" constant="14" id="GF3-HS-g6E"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="tAt-2m-H2J" secondAttribute="trailing" id="K8F-Zh-88H"/>
+                        <constraint firstItem="tAt-2m-H2J" firstAttribute="centerY" secondItem="ro9-2J-A4r" secondAttribute="centerY" id="PaD-HV-PLT"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="zgR-vR-1fa" secondAttribute="trailing" id="dKl-lJ-wpY"/>
+                        <constraint firstItem="zgR-vR-1fa" firstAttribute="bottom" secondItem="L3h-Sp-ioz" secondAttribute="bottomMargin" constant="1" id="inD-X0-fx1"/>
+                        <constraint firstItem="ro9-2J-A4r" firstAttribute="leading" secondItem="L3h-Sp-ioz" secondAttribute="leading" constant="8" id="llu-V1-Qaq"/>
+                        <constraint firstAttribute="height" constant="49" id="pnn-x5-i8S"/>
+                        <constraint firstItem="tAt-2m-H2J" firstAttribute="leading" secondItem="ro9-2J-A4r" secondAttribute="trailing" id="tO5-UO-JaM"/>
+                        <constraint firstItem="zgR-vR-1fa" firstAttribute="leading" secondItem="L3h-Sp-ioz" secondAttribute="leadingMargin" id="z5B-yl-wla"/>
+                        <constraint firstAttribute="bottom" secondItem="zgR-vR-1fa" secondAttribute="bottom" id="zFb-Cw-t2F"/>
+                        <constraint firstItem="ro9-2J-A4r" firstAttribute="centerY" secondItem="L3h-Sp-ioz" secondAttribute="centerY" id="zQb-k0-beC"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="pnn-x5-i8S"/>
+                            <exclude reference="zQb-k0-beC"/>
+                            <exclude reference="inD-X0-fx1"/>
+                            <exclude reference="tO5-UO-JaM"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bza-2c-LTJ">
+                    <rect key="frame" x="0.0" y="319" width="320" height="49"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IWM-Fa-Ed6">
+                            <rect key="frame" x="8" y="14" width="51" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="51" id="c97-UW-hiy"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="丰功硕德开了房" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wpt-Ta-hYY">
+                            <rect key="frame" x="93" y="14" width="219" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                            <size key="shadowOffset" width="0.0" height="0.0"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2Z-XB-0ZF">
+                            <rect key="frame" x="8" y="48" width="304" height="1"/>
+                            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="HAT-yK-ZlF"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="IWM-Fa-Ed6" firstAttribute="centerY" secondItem="bza-2c-LTJ" secondAttribute="centerY" id="0at-n9-AQC"/>
+                        <constraint firstItem="wpt-Ta-hYY" firstAttribute="top" secondItem="bza-2c-LTJ" secondAttribute="top" constant="14" id="DGM-qP-2Zg"/>
+                        <constraint firstItem="IWM-Fa-Ed6" firstAttribute="leading" secondItem="bza-2c-LTJ" secondAttribute="leading" constant="8" id="KEC-X4-nfY"/>
+                        <constraint firstAttribute="bottom" secondItem="g2Z-XB-0ZF" secondAttribute="bottom" id="Ps1-H9-0ow"/>
+                        <constraint firstItem="g2Z-XB-0ZF" firstAttribute="top" secondItem="wpt-Ta-hYY" secondAttribute="bottom" constant="13" id="Seg-3S-fzW"/>
+                        <constraint firstAttribute="trailing" secondItem="wpt-Ta-hYY" secondAttribute="trailing" constant="8" id="aqc-OH-c4m"/>
+                        <constraint firstItem="wpt-Ta-hYY" firstAttribute="leading" secondItem="IWM-Fa-Ed6" secondAttribute="trailing" id="bhV-vn-HEt"/>
+                        <constraint firstItem="IWM-Fa-Ed6" firstAttribute="top" secondItem="bza-2c-LTJ" secondAttribute="top" id="cD7-wr-5IV"/>
+                        <constraint firstItem="wpt-Ta-hYY" firstAttribute="centerY" secondItem="IWM-Fa-Ed6" secondAttribute="centerY" id="cMY-J5-w6r"/>
+                        <constraint firstAttribute="trailingMargin" secondItem="g2Z-XB-0ZF" secondAttribute="trailing" id="fMR-vl-mLI"/>
+                        <constraint firstAttribute="height" constant="49" id="gJW-wj-BYJ"/>
+                        <constraint firstItem="g2Z-XB-0ZF" firstAttribute="bottom" secondItem="bza-2c-LTJ" secondAttribute="bottomMargin" constant="1" id="gaG-Gb-2dg"/>
+                        <constraint firstItem="g2Z-XB-0ZF" firstAttribute="leading" secondItem="bza-2c-LTJ" secondAttribute="leadingMargin" id="hM6-Ij-73p"/>
+                        <constraint firstItem="g2Z-XB-0ZF" firstAttribute="top" secondItem="IWM-Fa-Ed6" secondAttribute="bottom" id="olK-r3-GQH"/>
+                        <constraint firstItem="wpt-Ta-hYY" firstAttribute="centerY" secondItem="IWM-Fa-Ed6" secondAttribute="centerY" id="x1A-bQ-uZu"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="gJW-wj-BYJ"/>
+                            <exclude reference="0at-n9-AQC"/>
+                            <exclude reference="cD7-wr-5IV"/>
+                            <exclude reference="gaG-Gb-2dg"/>
+                            <exclude reference="olK-r3-GQH"/>
+                            <exclude reference="bhV-vn-HEt"/>
+                            <exclude reference="x1A-bQ-uZu"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hqq-GG-0vG">
+                    <rect key="frame" x="0.0" y="368" width="320" height="37"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYi-Qy-3u1">
+                            <rect key="frame" x="8" y="8" width="68" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="21" id="3Bf-Hx-cZ0"/>
+                                <constraint firstAttribute="height" constant="21" id="7Rh-Pt-0RY"/>
+                                <constraint firstAttribute="width" constant="68" id="GBg-Pa-cx1"/>
+                                <constraint firstAttribute="height" constant="21" id="K0O-4b-Xpy"/>
+                                <constraint firstAttribute="width" constant="68" id="LnU-XO-tV4"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" red="0.60138541670000001" green="0.60138541670000001" blue="0.60138541670000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                            <variation key="default">
+                                <mask key="constraints">
+                                    <exclude reference="7Rh-Pt-0RY"/>
+                                    <exclude reference="K0O-4b-Xpy"/>
+                                    <exclude reference="LnU-XO-tV4"/>
+                                </mask>
+                            </variation>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="vYi-Qy-3u1" secondAttribute="bottom" constant="8" id="EFB-cT-KLN"/>
+                        <constraint firstItem="vYi-Qy-3u1" firstAttribute="top" secondItem="Hqq-GG-0vG" secondAttribute="top" constant="8" id="aPz-40-dCR"/>
+                        <constraint firstItem="vYi-Qy-3u1" firstAttribute="leading" secondItem="Hqq-GG-0vG" secondAttribute="leading" constant="8" id="iQy-hP-XDv"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstItem="kwe-gE-Axq" firstAttribute="top" secondItem="lZw-qi-pdT" secondAttribute="bottom" constant="8" id="1rQ-8M-KmQ"/>
+                <constraint firstItem="5It-5A-BoF" firstAttribute="top" secondItem="o64-Kj-GIA" secondAttribute="bottom" id="37n-EI-O1E"/>
+                <constraint firstItem="L3h-Sp-ioz" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="5SZ-4p-vsL"/>
+                <constraint firstItem="frY-Ni-LsQ" firstAttribute="top" secondItem="kwe-gE-Axq" secondAttribute="bottom" id="6zW-Bb-SzV"/>
+                <constraint firstAttribute="trailing" secondItem="o64-Kj-GIA" secondAttribute="trailing" id="8Z1-wA-Feu"/>
+                <constraint firstAttribute="trailing" secondItem="L3h-Sp-ioz" secondAttribute="trailing" id="9Ls-pN-YbD"/>
+                <constraint firstAttribute="trailing" secondItem="Hqq-GG-0vG" secondAttribute="trailing" id="AZk-IX-9qv"/>
+                <constraint firstAttribute="trailing" secondItem="frY-Ni-LsQ" secondAttribute="trailing" id="FKy-GF-z3v"/>
+                <constraint firstItem="o64-Kj-GIA" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Jm5-Pg-aDC"/>
+                <constraint firstItem="2rG-ti-JCC" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="Lxn-5D-jJr"/>
+                <constraint firstItem="o64-Kj-GIA" firstAttribute="top" secondItem="2rG-ti-JCC" secondAttribute="bottom" constant="8" id="Mcu-Hu-VWJ"/>
+                <constraint firstAttribute="trailing" secondItem="bza-2c-LTJ" secondAttribute="trailing" id="Mgb-q8-WOx"/>
+                <constraint firstItem="tAt-2m-H2J" firstAttribute="leading" secondItem="awy-IH-s2E" secondAttribute="leading" id="RNn-Bl-mZc"/>
+                <constraint firstItem="Hqq-GG-0vG" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="S09-mP-VfY"/>
+                <constraint firstItem="wpt-Ta-hYY" firstAttribute="leading" secondItem="awy-IH-s2E" secondAttribute="leading" id="TXF-Fl-woF"/>
+                <constraint firstAttribute="trailing" secondItem="5It-5A-BoF" secondAttribute="trailing" id="Wi3-t1-bHb"/>
+                <constraint firstItem="2rG-ti-JCC" firstAttribute="top" secondItem="frY-Ni-LsQ" secondAttribute="bottom" constant="8" id="XcT-9r-g9E"/>
+                <constraint firstItem="bza-2c-LTJ" firstAttribute="top" secondItem="L3h-Sp-ioz" secondAttribute="bottom" id="YkW-OS-YNp"/>
+                <constraint firstItem="lZw-qi-pdT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="8" id="bQ2-FC-VOb"/>
+                <constraint firstItem="bza-2c-LTJ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="hLT-MA-zej"/>
+                <constraint firstItem="Hqq-GG-0vG" firstAttribute="top" secondItem="bza-2c-LTJ" secondAttribute="bottom" id="jnQ-W9-9Vc"/>
+                <constraint firstItem="g9c-Jz-PuK" firstAttribute="leading" secondItem="awy-IH-s2E" secondAttribute="leading" id="mQL-Q3-JHp"/>
+                <constraint firstItem="awy-IH-s2E" firstAttribute="leading" secondItem="hff-wW-3rZ" secondAttribute="leading" id="meE-2G-p9E"/>
+                <constraint firstAttribute="trailing" secondItem="kwe-gE-Axq" secondAttribute="trailing" id="om7-SC-jVz"/>
+                <constraint firstItem="L3h-Sp-ioz" firstAttribute="top" secondItem="5It-5A-BoF" secondAttribute="bottom" id="q08-EE-UEC"/>
+                <constraint firstItem="frY-Ni-LsQ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="sGS-9j-fcZ"/>
+                <constraint firstItem="5It-5A-BoF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="uUC-Lu-AnR"/>
+                <constraint firstItem="lZw-qi-pdT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="viX-wK-650"/>
+                <constraint firstItem="kwe-gE-Axq" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="yBd-cf-dda"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="labelAddress" destination="tAt-2m-H2J" id="boj-po-20q"/>
+                <outlet property="labelBottom" destination="vYi-Qy-3u1" id="83x-0X-p0i"/>
+                <outlet property="labelLastView" destination="Hqq-GG-0vG" id="w6d-o7-ZFl"/>
+            </connections>
+            <point key="canvasLocation" x="293" y="462.5"/>
+        </view>
+    </objects>
+</document>
--- a/ALand/CodeClass/Home/View/Order/OrderTableViewCell.h
+++ b/ALand/CodeClass/Home/View/Order/OrderTableViewCell.h
+//
+//  OrderTableViewCell.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OrderTableViewCell : UITableViewCell
+
+
+- (void)cellWithViewNumber:(NSInteger)number;
+- (void)setState:(NSString *)orderState;
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderTableViewCell.m
+++ b/ALand/CodeClass/Home/View/Order/OrderTableViewCell.m
+//
+//  OrderTableViewCell.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderTableViewCell.h"
+#import "OrderCellView.h"
+
+@interface OrderTableViewCell ()
+@property (nonatomic, strong) NSMutableArray *arrCellView;
+@property (weak, nonatomic) IBOutlet UILabel *labelState;
+
+@end
+@implementation OrderTableViewCell
+
+- (void)awakeFromNib {
+    // Initialization code
+    self.arrCellView = [NSMutableArray array];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+}
+
+- (void)cellWithViewNumber:(NSInteger)number {
+    //[self.contentView removeAllSubViews];
+    for (OrderCellView *cellView  in self.arrCellView) {
+        [cellView removeFromSuperview];
+    }
+    
+    
+    
+//    //1.获取一个全局串行队列
+//    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+//    //2.把任务添加到队列中执行
+//    dispatch_async(queue, ^{
+//        
+//        //打印当前线程
+//        CLog(@"%@",[NSThread currentThread]);
+//        
+    
+        for (NSInteger i = 0; i < number; i++) {
+            
+            
+            
+            OrderCellView *cellView = [OrderCellView viewWithNibName:@"OrderCellView"];
+            cellView.frame = CGRectMake(0, 74 + 120 * i, self.width, 120);
+            
+//            //回到主线程，展示图片
+//            dispatch_async(dispatch_get_main_queue(), ^{
+//                //打印当前线程
+//                CLog(@"%@",[NSThread currentThread]);
+                [self.arrCellView addObject:cellView];
+                [self.contentView addSubview:cellView];
+//            });
+//            
+        }
+    
+        
+//    });
+    
+    
+}
+
+- (void)setState:(NSString *)orderState {
+    self.labelState.text = orderState;
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end
--- a/ALand/CodeClass/Home/View/Order/OrderTableViewCell.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderTableViewCell.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"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="280" id="KGk-i7-Jjw" customClass="OrderTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="333" height="276"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="333" height="275"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="买家：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RqJ-Zt-ur3">
+                        <rect key="frame" x="8" y="18" width="51" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <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="hBw-pM-xt9">
+                        <rect key="frame" x="74" y="18" width="51" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="待支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C8f-Oc-X6g">
+                        <rect key="frame" x="255" y="18" width="51" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <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="J5H-Hq-WGD">
+                        <rect key="frame" x="8" y="47" width="73" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.63360416666666675" green="0.63360416666666675" blue="0.63360416666666675" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-10-12  09:13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doj-PA-o3a">
+                        <rect key="frame" x="94" y="47" width="167" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.63360416669999997" green="0.63360416669999997" blue="0.63360416669999997" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s31-Vq-7Yk">
+                        <rect key="frame" x="8" y="74" width="298" height="1"/>
+                        <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="6at-rq-bXi"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TVn-BB-oEx">
+                        <rect key="frame" x="0.0" y="0.0" width="314" height="10"/>
+                        <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.8666666666666667" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="10" id="ODE-gK-emL"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d6S-4w-qHp">
+                        <rect key="frame" x="0.0" y="230" width="333" height="44"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="应付:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cc3-M1-4wO">
+                                <rect key="frame" x="8" y="15" width="39" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.5082395833333333" green="0.5082395833333333" blue="0.5082395833333333" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GFV-0S-gMx">
+                                <rect key="frame" x="55" y="15" width="48" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <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="IC0-sm-vao">
+                                <rect key="frame" x="129" y="15" width="39" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.50823958329999996" green="0.50823958329999996" blue="0.50823958329999996" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥83.7" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iUL-cF-E4q">
+                                <rect key="frame" x="176" y="15" width="52" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="1" green="0.3921568627" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="44" id="0Yq-KB-ELb"/>
+                            <constraint firstItem="GFV-0S-gMx" firstAttribute="leading" secondItem="cc3-M1-4wO" secondAttribute="trailing" constant="8" id="1SU-PL-DLr"/>
+                            <constraint firstItem="IC0-sm-vao" firstAttribute="leading" secondItem="GFV-0S-gMx" secondAttribute="trailing" constant="26" id="IbI-Ky-EUv"/>
+                            <constraint firstItem="IC0-sm-vao" firstAttribute="centerY" secondItem="cc3-M1-4wO" secondAttribute="centerY" id="QZP-ZG-IJp"/>
+                            <constraint firstItem="cc3-M1-4wO" firstAttribute="leading" secondItem="d6S-4w-qHp" secondAttribute="leading" constant="8" id="YFg-Tv-bGf"/>
+                            <constraint firstItem="GFV-0S-gMx" firstAttribute="centerY" secondItem="cc3-M1-4wO" secondAttribute="centerY" id="iYu-0G-Xk2"/>
+                            <constraint firstItem="iUL-cF-E4q" firstAttribute="leading" secondItem="IC0-sm-vao" secondAttribute="trailing" constant="8" id="keG-LA-Pdp"/>
+                            <constraint firstAttribute="bottom" secondItem="cc3-M1-4wO" secondAttribute="bottom" constant="8" id="rAb-U9-6js"/>
+                            <constraint firstItem="iUL-cF-E4q" firstAttribute="centerY" secondItem="cc3-M1-4wO" secondAttribute="centerY" id="tqa-Pr-PcB"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="hBw-pM-xt9" firstAttribute="leading" secondItem="RqJ-Zt-ur3" secondAttribute="trailing" constant="15" id="04Q-Dh-SUi"/>
+                    <constraint firstItem="TVn-BB-oEx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="3Fw-AQ-pQJ"/>
+                    <constraint firstItem="s31-Vq-7Yk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="8" id="57I-qo-wLN"/>
+                    <constraint firstItem="TVn-BB-oEx" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="9KK-rq-FBv"/>
+                    <constraint firstItem="s31-Vq-7Yk" firstAttribute="top" secondItem="doj-PA-o3a" secondAttribute="bottom" constant="6" id="Amp-As-fq0"/>
+                    <constraint firstItem="C8f-Oc-X6g" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="DSi-0v-5sB"/>
+                    <constraint firstAttribute="bottom" secondItem="TVn-BB-oEx" secondAttribute="bottom" id="GGv-2E-aP7"/>
+                    <constraint firstItem="doj-PA-o3a" firstAttribute="leading" secondItem="J5H-Hq-WGD" secondAttribute="trailing" constant="13" id="HKr-kd-g7y"/>
+                    <constraint firstItem="C8f-Oc-X6g" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="KT7-Nh-owC"/>
+                    <constraint firstItem="J5H-Hq-WGD" firstAttribute="leading" secondItem="RqJ-Zt-ur3" secondAttribute="leading" id="Ks9-Hp-76U"/>
+                    <constraint firstItem="hBw-pM-xt9" firstAttribute="centerY" secondItem="RqJ-Zt-ur3" secondAttribute="centerY" id="NVS-Kx-XaL"/>
+                    <constraint firstAttribute="bottom" secondItem="d6S-4w-qHp" secondAttribute="bottom" id="PJn-yd-DyD"/>
+                    <constraint firstAttribute="trailing" secondItem="d6S-4w-qHp" secondAttribute="trailing" id="Sh6-Is-qbn"/>
+                    <constraint firstItem="d6S-4w-qHp" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Vwa-Im-N8a"/>
+                    <constraint firstItem="J5H-Hq-WGD" firstAttribute="top" secondItem="hBw-pM-xt9" secondAttribute="bottom" constant="8" id="YDi-AC-sQs"/>
+                    <constraint firstAttribute="trailing" secondItem="TVn-BB-oEx" secondAttribute="trailing" id="lTp-eU-xVg"/>
+                    <constraint firstItem="RqJ-Zt-ur3" firstAttribute="top" secondItem="TVn-BB-oEx" secondAttribute="bottom" constant="8" id="mnk-wq-rZq"/>
+                    <constraint firstAttribute="trailing" secondItem="TVn-BB-oEx" secondAttribute="trailing" id="nhT-xB-2cw"/>
+                    <constraint firstItem="doj-PA-o3a" firstAttribute="centerY" secondItem="J5H-Hq-WGD" secondAttribute="centerY" id="ntF-d9-FM0"/>
+                    <constraint firstItem="C8f-Oc-X6g" firstAttribute="centerY" secondItem="hBw-pM-xt9" secondAttribute="centerY" id="rgp-iD-3ME"/>
+                    <constraint firstItem="TVn-BB-oEx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="sXB-IB-Fhj"/>
+                    <constraint firstItem="RqJ-Zt-ur3" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="viA-cz-huF"/>
+                    <constraint firstAttribute="trailing" secondItem="s31-Vq-7Yk" secondAttribute="trailing" constant="8" id="vu9-xz-P0i"/>
+                </constraints>
+                <variation key="default">
+                    <mask key="constraints">
+                        <exclude reference="3Fw-AQ-pQJ"/>
+                        <exclude reference="GGv-2E-aP7"/>
+                        <exclude reference="lTp-eU-xVg"/>
+                        <exclude reference="KT7-Nh-owC"/>
+                    </mask>
+                </variation>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="labelState" destination="C8f-Oc-X6g" id="zN3-gE-D8U"/>
+            </connections>
+            <point key="canvasLocation" x="-47.5" y="395"/>
+        </tableViewCell>
+    </objects>
+</document>
--- a/ALand/CodeClass/Home/ViewController/Commodity/AddCommodityViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Commodity/AddCommodityViewController.m
@@ -133,7 +133,7 @@
    if (section == 0) {
        return 3;
    }else{
-        return 8;
+        return 6;
    }
 }


--- a/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
+++ b/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
@@ -13,6 +13,7 @@
 #import "AddCommodityViewController.h"
 #import "SDCycleScrollView.h"
 #import "CommodityManagementViewController.h"
+#import "OrderViewController.h"

 #define kHomeCollectionViewID @"HomeCollectionViewID"
 #define kCollectionViewHeadHeight 350
@@ -115,7 +116,7 @@

 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
    switch (indexPath.row) {
-        case 0:
+        case 0://商品管理
        {
            CommodityManagementViewController *managementVC = [[CommodityManagementViewController alloc] init];
            managementVC.hidesBottomBarWhenPushed = YES;
@@ -123,7 +124,12 @@
            
        }
            break;
-        case 1:
+        case 1://订单管理
+        {
+            OrderViewController *orderVC = [[OrderViewController alloc] init];
+            orderVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:orderVC animated:YES];
+        }
            
            break;
        case 2:

--- a/ALand/CodeClass/Home/ViewController/Order/CanceledTableViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/CanceledTableViewController.h
+//
+//  CanceledTableViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CanceledTableViewController : UITableViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/CanceledTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/CanceledTableViewController.m
+//
+//  CanceledTableViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "CanceledTableViewController.h"
+#import "OrderTableViewCell.h"
+
+#define kCellId @"OrderTableViewCell.h"
+@interface CanceledTableViewController ()
+@property (nonatomic, strong) NSArray *array;
+
+@end
+
+@implementation CanceledTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.array = @[@2,@3,@5,@10];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+    
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 115 + 130 * [self.array[indexPath.row] integerValue];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.array.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    
+    // Configure the cell...
+    
+    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+    [cell setState:@"已取消"];
+    return cell;
+}
+
+/*
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+*/
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+/*
+#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
--- a/ALand/CodeClass/Home/ViewController/Order/CommpleteTableViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/CommpleteTableViewController.h
+//
+//  CommpleteTableViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CommpleteTableViewController : UITableViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/CommpleteTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/CommpleteTableViewController.m
+//
+//  CommpleteTableViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "CommpleteTableViewController.h"
+#import "OrderTableViewCell.h"
+
+#define kCellId @"OrderTableViewCell.h"
+@interface CommpleteTableViewController ()
+@property (nonatomic, strong) NSArray *array;
+
+@end
+
+@implementation CommpleteTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.array = @[@2,@3,@5,@10];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+    
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 115 + 130 * [self.array[indexPath.row] integerValue];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.array.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    
+    // Configure the cell...
+    
+    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+    [cell setState:@"已完成"];
+    return cell;
+}
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.h
+//
+//  NoPaymentTableViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface NoPaymentTableViewController : UITableViewController
+@property (nonatomic, copy) NSString *state;
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
+//
+//  NoPaymentTableViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "NoPaymentTableViewController.h"
+#import "OrderTableViewCell.h"
+#import "OrderDetailViewController.h"
+
+#define kCellId @"OrderTableViewCell.h"
+@interface NoPaymentTableViewController ()
+@property (nonatomic, strong) NSArray *array;
+@end
+
+@implementation NoPaymentTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.array = @[@2,@3,@5,@10];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
+
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 115 + 120 * [self.array[indexPath.row] integerValue];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.array.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    
+    // Configure the cell...
+   
+    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+    [cell setState:@"待支付"];
+    return cell;
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderDetailViewController *orderDetailVC = [[OrderDetailViewController alloc] init];
+    [self.navigationController pushViewController:orderDetailVC animated:YES];
+}
+
+/*
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+*/
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+/*
+#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
--- a/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.h
+//
+//  OrderDetailViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface OrderDetailViewController : IBTUIViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
+//
+//  OrderDetailViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderDetailViewController.h"
+#import "OrderDetailTopView.h"
+#import "NSString+Category.h"
+@interface OrderDetailViewController ()
+@property (nonatomic, strong) UITableView *tableView;
+@end
+
+@implementation OrderDetailViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = kCustomGreenColor;
+    self.navigationItem.title = @"订单详情";
+    
+    OrderDetailTopView *topView = [OrderDetailTopView viewWithNibName:@"OrderDetailTopView"];
+    topView.width = kWidth;
+    topView.labelAddress.text = [NSString randomTestText];
+    [self.view addSubview:topView];
+
+    CLog(@"%f",topView.viewHeight);
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        topView.labelAddress.text = [NSString randomTestText];
+        CLog(@"%f",topView.viewHeight);
+
+
+    });
+    
+    
+    
+    // Do any additional setup after loading the view.
+}
+
+- (void)setUpTableView {
+    
+}
+
+
+- (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
--- a/ALand/CodeClass/Home/ViewController/Order/OrderViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/OrderViewController.h
+//
+//  OrderViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface OrderViewController : IBTUIViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/OrderViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/OrderViewController.m
+//
+//  OrderViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderViewController.h"
+#import "JavenMultipleViewWithHeader.h"
+#import "NoPaymentTableViewController.h"
+#import "WaitForDispatchTableViewController.h"
+#import "TransportedTableViewController.h"
+#import "CommpleteTableViewController.h"
+#import "CanceledTableViewController.h"
+@interface OrderViewController ()
+@property (nonatomic, strong) JavenMultipleViewWithHeader *viewMutiple;
+@end
+
+@implementation OrderViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navigationItem.title = @"订单管理";
+    [self setUpView];
+    
+
+    // Do any additional setup after loading the view.
+}
+
+
+- (void)setUpView {
+    
+    NoPaymentTableViewController *noPayMentVC = [[NoPaymentTableViewController alloc] init];
+    
+    WaitForDispatchTableViewController *waitVC = [[WaitForDispatchTableViewController alloc] init];
+    
+    TransportedTableViewController *transportedVC = [[TransportedTableViewController alloc] init];
+    
+    CommpleteTableViewController  *completeVC = [[CommpleteTableViewController alloc] init];
+    
+    CanceledTableViewController *cancelVC = [[CanceledTableViewController alloc] init];
+    
+    
+    
+    NSArray *arrVC = @[noPayMentVC, waitVC, transportedVC, completeVC, cancelVC];
+    NSArray *arrTitle = @[@"代支付",@"待发货",@"已发货",@"已完成",@"已取消"];
+    
+    _viewMutiple = [[JavenMultipleViewWithHeader alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight)
+                                                                views:arrVC
+                                                               titles: arrTitle
+                                                               target:self
+                                                      selectTextColor:kCustomGreenColor
+                                                selectBackgroundColor:kBacroundColor
+                                                            textColor:kTextColorBlack
+                                                      backgroundColor:kBacroundColor
+                                                          titleHeight:40
+                                                        titleBtnWidth:kWidth / arrTitle.count];
+    [self.view addSubview:_viewMutiple];
+    
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO];
+}
+
+
+- (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
--- a/ALand/CodeClass/Home/ViewController/Order/TransportedTableViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/TransportedTableViewController.h
+//
+//  TransportedTableViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface TransportedTableViewController : UITableViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/TransportedTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/TransportedTableViewController.m
+//
+//  TransportedTableViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "TransportedTableViewController.h"
+#import "OrderTableViewCell.h"
+
+#define kCellId @"OrderTableViewCell.h"
+@interface TransportedTableViewController ()
+@property (nonatomic, strong) NSArray *array;
+
+@end
+
+@implementation TransportedTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.array = @[@2,@3,@5,@10];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+    
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 115 + 130 * [self.array[indexPath.row] integerValue];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.array.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    
+    // Configure the cell...
+    
+    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+    [cell setState:@"已发货"];
+    return cell;
+}
+
+/*
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+*/
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+/*
+#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
--- a/ALand/CodeClass/Home/ViewController/Order/WaitForDispatchTableViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Order/WaitForDispatchTableViewController.h
+//
+//  WaitForDispatchTableViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface WaitForDispatchTableViewController : UITableViewController
+
+@end
--- a/ALand/CodeClass/Home/ViewController/Order/WaitForDispatchTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/WaitForDispatchTableViewController.m
+//
+//  WaitForDispatchTableViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "WaitForDispatchTableViewController.h"
+#import "OrderTableViewCell.h"
+
+#define kCellId @"OrderTableViewCell.h"
+@interface WaitForDispatchTableViewController ()
+@property (nonatomic, strong) NSArray *array;
+@end
+
+@implementation WaitForDispatchTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.array = @[@2,@3,@5,@10];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+    
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 115 + 130 * [self.array[indexPath.row] integerValue];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.array.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    
+    // Configure the cell...
+    
+    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+    [cell setState:@"待发货"];
+    return cell;
+}
+
+
+/*
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+*/
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+/*
+#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
--- a/ALand/General/Categories/NSString+Category.h
+++ b/ALand/General/Categories/NSString+Category.h
+//
+//  NSString+Category.h
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (Category)
+ (NSString *)randomTestText;
+@end
--- a/ALand/General/Categories/NSString+Category.m
+++ b/ALand/General/Categories/NSString+Category.m
+//
+//  NSString+Category.m
+//  ALand
+//
+//  Created by Z on 16/3/30.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "NSString+Category.h"
+
+@implementation NSString (Category)
+ (NSString *)randomTestText {
+    //NSString *str = @"长短不一的测试数据";
+    
+    NSMutableString *result = [NSMutableString string];
+    int randomNumber = arc4random()%10 + 1;
+    for (int i = 0; i < randomNumber; i++) {
+        [result appendString:@"长短不一的测试数据"];
+    }
+    
+    return result;
+}
+@end
--- a/ALand/General/JavenMultipleViewWithHeader.h
+++ b/ALand/General/JavenMultipleViewWithHeader.h
+//
+//  JavenMultipleViewWithHeader.h
+//  multipleView
+//
+//  Created by Z on 16/3/15.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface JavenMultipleViewWithHeader : UIView<UIScrollViewDelegate>
+
+
+- (instancetype)initWithFrame:(CGRect)frame views:(NSArray *)views titles:(NSArray *)titles target:(id)target selectTextColor:(UIColor *)selectTextColor selectBackgroundColor:(UIColor *)selectBackgroundColor textColor:(UIColor *)textColor backgroundColor:(UIColor *)abackgroundColor titleHeight:(CGFloat)height titleBtnWidth:(CGFloat)width;
+@end
--- a/ALand/General/JavenMultipleViewWithHeader.m
+++ b/ALand/General/JavenMultipleViewWithHeader.m
+//
+//  JavenMultipleViewWithHeader.m
+//  multipleView
+//
+//  Created by Z on 16/3/15.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "JavenMultipleViewWithHeader.h"
+
+
+
+@interface JavenMultipleViewWithHeader ()
+
+@property (nonatomic, strong) UIScrollView *viewScrollView;
+@property (nonatomic, strong) NSArray *viewArr;
+@property (nonatomic, strong) NSArray *titleArr;
+@property (nonatomic, strong) NSMutableArray *buttonArr;
+
+@property (nonatomic, strong) UIColor *selectTextColor;
+@property (nonatomic, strong) UIColor *selectBackgroundColor;
+@property (nonatomic, strong) UIColor *textColor;
+@property (nonatomic, strong) UIColor *abackgroundColor;
+@property (nonatomic, strong) UIColor *forceColor;
+@property (nonatomic, strong) UIColor *normalColor;
+@property (nonatomic, assign) CGFloat titleButtonWith;
+@property (nonatomic, assign) CGFloat titleScrollViewHeight;
+
+@property (nonatomic, strong) UIView *bottomFlowView;
+
+
+@end
+
+
+@implementation JavenMultipleViewWithHeader
+
+
+- (instancetype)initWithFrame:(CGRect)frame views:(NSArray *)views titles:(NSArray *)titles target:(id)target selectTextColor:(UIColor *)selectTextColor selectBackgroundColor:(UIColor *)selectBackgroundColor textColor:(UIColor *)textColor backgroundColor:(UIColor *)abackgroundColor titleHeight:(CGFloat)height titleBtnWidth:(CGFloat)width{
+    self = [super initWithFrame:frame];
+    if (self) {
+        _selectTextColor = selectTextColor;
+        _selectBackgroundColor = selectBackgroundColor;
+        _textColor = textColor;
+        _abackgroundColor = abackgroundColor;
+        _titleButtonWith = width;
+        _titleScrollViewHeight = height;
+        
+        self.backgroundColor = kCutLineColorLiteGray;
+        _viewArr = views;
+        _titleArr = titles;
+        //set titleButton
+        UIScrollView *titleScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, _titleScrollViewHeight)];
+        titleScrollView.backgroundColor = kCutLineColorLiteGray;
+        titleScrollView.tag = 111000;
+        titleScrollView.delegate = self;
+        titleScrollView.contentSize = CGSizeMake(_titleButtonWith * titles.count, 0);
+        titleScrollView.showsHorizontalScrollIndicator = NO;//水平进度条
+        [self addSubview:titleScrollView];
+        
+        UIView *viewLineTop = [[UIView alloc] initWithFrame:CGRectMake(0, 0, titleScrollView.width, 1)];
+        viewLineTop.backgroundColor = kCutLineColorLiteGray;
+        [self addSubview:viewLineTop];
+        
+        UIView *viewLineBottom = [UIView new];
+        viewLineBottom.backgroundColor = kCutLineColorLiteGray;
+        [self addSubview:viewLineBottom];
+        viewLineBottom.sd_layout.leftEqualToView(self).rightEqualToView(self).bottomEqualToView(titleScrollView).heightIs(1);
+
+        
+
+        
+        
+        _buttonArr = [NSMutableArray array];
+        for (int i = 0; i < titles.count; i++) {
+            UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+            [button setTitle:titles[i] forState:UIControlStateNormal];
+            button.titleLabel.font = [UIFont systemFontOfSize:16];
+            
+            [button setTitleColor:_textColor forState:UIControlStateNormal];
+            button.backgroundColor = _abackgroundColor;
+            
+            if (i == 0) {
+                [button setTitleColor:_selectTextColor forState:UIControlStateNormal];
+                [button setBackgroundColor:_selectBackgroundColor];
+            }
+            
+            button.frame = CGRectMake(_titleButtonWith * i, 0, _titleButtonWith, _titleScrollViewHeight);
+            
+            [_buttonArr addObject:button];
+            button.tag = 11100 + i;
+            [button addTarget:self action:@selector(changeToSelectedView:) forControlEvents:UIControlEventTouchUpInside];
+            [titleScrollView addSubview:button];
+        }
+        
+        
+        UIScrollView *viewScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, _titleScrollViewHeight, frame.size.width, frame.size.height - _titleScrollViewHeight)];
+        NSLog(@"height = %f, y = %f", viewScrollView.frame.size.height, viewScrollView.frame.origin.y
+              );
+        _viewScrollView = viewScrollView;
+        viewScrollView.showsVerticalScrollIndicator = NO;
+        viewScrollView.delegate = self;
+        viewScrollView.pagingEnabled = YES;
+        viewScrollView.tag = 111001;
+        viewScrollView.contentSize = CGSizeMake(frame.size.width * titles.count, 0);
+        [self addSubview:viewScrollView];
+        for (int i = 0; i < views.count; i++) {
+            UIViewController *viewController = views[i];
+            [[self viewController] addChildViewController:viewController];
+            viewController.view.frame = CGRectMake(frame.size.width * i, 0, frame.size.width, frame.size.height - _titleScrollViewHeight);
+            [target addChildViewController:viewController];
+            [viewScrollView addSubview:viewController.view];
+        }
+        
+        _bottomFlowView = [[UIView alloc] initWithFrame:CGRectMake(0, _titleScrollViewHeight - 3, _titleButtonWith, 3)];
+        _bottomFlowView.backgroundColor = _selectTextColor;
+        [titleScrollView addSubview:_bottomFlowView];
+        
+        
+    }
+    return self;
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
+    if (scrollView.tag == 111001) {
+        NSLog(@"%f",scrollView.contentOffset.y);
+        
+        for (UIButton *btn in _buttonArr) {
+            if (btn.tag == scrollView.contentOffset.x / self.frame.size.width + 11100) {
+                [btn setTitleColor:_selectTextColor forState:UIControlStateNormal];
+                btn.backgroundColor = _selectBackgroundColor;
+                WS(weakSelf)
+                [UIView animateWithDuration:0.3 animations:^{
+                    weakSelf.bottomFlowView.centerX = btn.centerX;
+                }];
+
+            }else{
+                 [btn setTitleColor:_textColor forState:UIControlStateNormal];
+                btn.backgroundColor = _abackgroundColor;
+            }
+        }
+    }
+}
+
+- (void)changeToSelectedView:(UIButton *)btn {
+    for (UIButton *button in _buttonArr) {
+        button.backgroundColor = _abackgroundColor;
+        [button setTitleColor:_textColor forState:UIControlStateNormal];
+
+    }
+    
+    WS(weakSelf)
+    [UIView animateWithDuration:0.3 animations:^{
+        weakSelf.bottomFlowView.centerX = btn.centerX;
+    }];
+    
+    [btn setBackgroundColor:_selectBackgroundColor];
+    [btn setTitleColor:_selectTextColor forState:UIControlStateNormal];
+    
+    
+    NSInteger currentIndex = btn.tag - 11100;
+    //_viewScrollView.contentOffset = CGPointMake(currentIndex * self.frame.size.width, 0);
+    [_viewScrollView setContentOffset:CGPointMake(currentIndex * self.frame.size.width, 0) animated:YES];
+}
+
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
--- a/ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m
+++ b/ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m
@@ -23,7 +23,7 @@
    UIBarButtonItem *leftBtn = [[UIBarButtonItem alloc]  initWithImage:[UIImage imageNamed:@"bac"] style:UIBarButtonItemStyleDone target:self action:@selector(popAction)];
   leftBtn.tintColor = kTextColorDarkGray;
    self.navigationItem.leftBarButtonItem = leftBtn;
-    [self.navigationController.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:24],NSFontAttributeName, [UIColor colorWithHexString:@"333333"], NSForegroundColorAttributeName,nil]];
+    [self.navigationController.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:21],NSFontAttributeName, [UIColor colorWithHexString:@"333333"], NSForegroundColorAttributeName,nil]];
    self.automaticallyAdjustsScrollViewInsets = NO;
    // Do any additional setup after loading the view.
 }