1.1版本，登录界面，出入库列表界面

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
 		E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; };
 		E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; };
+		E00CBA0124820CF000701D9D /* CRKSumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CB9FF24820CF000701D9D /* CRKSumCell.swift */; };
+		E00CBA0224820CF000701D9D /* CRKSumCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00CBA0024820CF000701D9D /* CRKSumCell.xib */; };
 		E00CDE732474BBB60018AEF8 /* EPViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CDE712474BBB60018AEF8 /* EPViewController.swift */; };
 		E00CDE742474BBB60018AEF8 /* EPViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00CDE722474BBB60018AEF8 /* EPViewController.xib */; };
 		E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00D85DE244561FD00F5F816 /* AppDelegate.swift */; };
@@ -25,8 +27,6 @@
 		E00E48C32457C0D600F16545 /* XuanZeShangPinViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C12457C0D600F16545 /* XuanZeShangPinViewController.xib */; };
 		E00E48C62457C99900F16545 /* KuCunShangPinXQViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00E48C42457C99900F16545 /* KuCunShangPinXQViewController.swift */; };
 		E00E48C72457C99900F16545 /* KuCunShangPinXQViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C52457C99900F16545 /* KuCunShangPinXQViewController.xib */; };
-		E00E48CA2457D96100F16545 /* ChuRuKuJiLuXQViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */; };
-		E00E48CB2457D96100F16545 /* ChuRuKuJiLuXQViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */; };
 		E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B02446989700ADCC70 /* Interface_Z.plist */; };
 		E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01C26B42446AF3100ADCC70 /* DemoViewController.swift */; };
 		E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B52446AF3100ADCC70 /* DemoViewController.xib */; };
@@ -66,8 +66,6 @@
 		E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02DDD9824501A5B00ABB707 /* DelGuiGeCell.xib */; };
 		E02FD9EC2455627300E10E27 /* ChuKuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9EA2455627300E10E27 /* ChuKuViewController.swift */; };
 		E02FD9ED2455627300E10E27 /* ChuKuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02FD9EB2455627300E10E27 /* ChuKuViewController.xib */; };
-		E02FD9F12455705F00E10E27 /* ChuRuKuJiLuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9EF2455705F00E10E27 /* ChuRuKuJiLuCell.swift */; };
-		E02FD9F22455705F00E10E27 /* ChuRuKuJiLuCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02FD9F02455705F00E10E27 /* ChuRuKuJiLuCell.xib */; };
 		E02FD9F62455790800E10E27 /* DiZhiGuanLiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9F42455790800E10E27 /* DiZhiGuanLiCell.swift */; };
 		E02FD9F72455790800E10E27 /* DiZhiGuanLiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02FD9F52455790800E10E27 /* DiZhiGuanLiCell.xib */; };
 		E02FD9FA24557E8600E10E27 /* XinZengDiZhiViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9F824557E8600E10E27 /* XinZengDiZhiViewController.swift */; };
@@ -237,6 +235,18 @@
 		E0C4F4B6244EE9EE00CC7E2F /* YuShouCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4B4244EE9EE00CC7E2F /* YuShouCell.xib */; };
 		E0C4F4BD244EF53D00CC7E2F /* BindStepTwoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C4F4BB244EF53D00CC7E2F /* BindStepTwoViewController.swift */; };
 		E0C4F4BE244EF53D00CC7E2F /* BindStepTwoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4BC244EF53D00CC7E2F /* BindStepTwoViewController.xib */; };
+		E0CC8476248227F5009B1FE9 /* InputInitInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC8475248227F5009B1FE9 /* InputInitInfoModel.swift */; };
+		E0CC847C24823087009B1FE9 /* GetGoodBatchModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC847B24823087009B1FE9 /* GetGoodBatchModel.swift */; };
+		E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC847D24823602009B1FE9 /* WarehouseIoListModel.swift */; };
+		E0CC84802482378D009B1FE9 /* IoGoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC847F2482378D009B1FE9 /* IoGoodsDetailModel.swift */; };
+		E0CC8482248239F6009B1FE9 /* OutGoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC8481248239F6009B1FE9 /* OutGoodsDetailModel.swift */; };
+		E0CC848424823B72009B1FE9 /* InGoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC848324823B72009B1FE9 /* InGoodsDetailModel.swift */; };
+		E0CC848724823EC1009B1FE9 /* CRKCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC848524823EC1009B1FE9 /* CRKCell.swift */; };
+		E0CC848824823EC1009B1FE9 /* CRKCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0CC848624823EC1009B1FE9 /* CRKCell.xib */; };
+		E0CC848B24824291009B1FE9 /* CRKListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC848924824291009B1FE9 /* CRKListVC.swift */; };
+		E0CC848C24824291009B1FE9 /* CRKListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0CC848A24824291009B1FE9 /* CRKListVC.xib */; };
+		E0CC848F248251F6009B1FE9 /* CRKXQVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC848D248251F6009B1FE9 /* CRKXQVC.swift */; };
+		E0CC8490248251F6009B1FE9 /* CRKXQVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0CC848E248251F6009B1FE9 /* CRKXQVC.xib */; };
 		E0D197BA2448431C002B080C /* BabyDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197A92448431B002B080C /* BabyDefine.m */; };
 		E0D197BB2448431C002B080C /* BabyCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AB2448431B002B080C /* BabyCallback.m */; };
 		E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AD2448431B002B080C /* BabyPeripheralManager.m */; };
@@ -486,6 +496,8 @@
 		6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; };
 		E00B0B1924629E99006DC846 /* SJMapCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SJMapCell.swift; sourceTree = "<group>"; };
 		E00B0B1A24629E99006DC846 /* SJMapCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SJMapCell.xib; sourceTree = "<group>"; };
+		E00CB9FF24820CF000701D9D /* CRKSumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKSumCell.swift; sourceTree = "<group>"; };
+		E00CBA0024820CF000701D9D /* CRKSumCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKSumCell.xib; sourceTree = "<group>"; };
 		E00CDE712474BBB60018AEF8 /* EPViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPViewController.swift; sourceTree = "<group>"; };
 		E00CDE722474BBB60018AEF8 /* EPViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EPViewController.xib; sourceTree = "<group>"; };
 		E00D85DB244561FD00F5F816 /* 格利商户端.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "格利商户端.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -507,8 +519,6 @@
 		E00E48C12457C0D600F16545 /* XuanZeShangPinViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XuanZeShangPinViewController.xib; sourceTree = "<group>"; };
 		E00E48C42457C99900F16545 /* KuCunShangPinXQViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuCunShangPinXQViewController.swift; sourceTree = "<group>"; };
 		E00E48C52457C99900F16545 /* KuCunShangPinXQViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuCunShangPinXQViewController.xib; sourceTree = "<group>"; };
-		E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChuRuKuJiLuXQViewController.swift; sourceTree = "<group>"; };
-		E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChuRuKuJiLuXQViewController.xib; sourceTree = "<group>"; };
 		E01C26B02446989700ADCC70 /* Interface_Z.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Interface_Z.plist; sourceTree = "<group>"; };
 		E01C26B42446AF3100ADCC70 /* DemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = "<group>"; };
 		E01C26B52446AF3100ADCC70 /* DemoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DemoViewController.xib; sourceTree = "<group>"; };
@@ -550,8 +560,6 @@
 		E02F43C1246A91C1000ECFB1 /* GeliBusinessPlatform.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = GeliBusinessPlatform.entitlements; sourceTree = "<group>"; };
 		E02FD9EA2455627300E10E27 /* ChuKuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChuKuViewController.swift; sourceTree = "<group>"; };
 		E02FD9EB2455627300E10E27 /* ChuKuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChuKuViewController.xib; sourceTree = "<group>"; };
-		E02FD9EF2455705F00E10E27 /* ChuRuKuJiLuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChuRuKuJiLuCell.swift; sourceTree = "<group>"; };
-		E02FD9F02455705F00E10E27 /* ChuRuKuJiLuCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChuRuKuJiLuCell.xib; sourceTree = "<group>"; };
 		E02FD9F42455790800E10E27 /* DiZhiGuanLiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiZhiGuanLiCell.swift; sourceTree = "<group>"; };
 		E02FD9F52455790800E10E27 /* DiZhiGuanLiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiZhiGuanLiCell.xib; sourceTree = "<group>"; };
 		E02FD9F824557E8600E10E27 /* XinZengDiZhiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinZengDiZhiViewController.swift; sourceTree = "<group>"; };
@@ -719,6 +727,18 @@
 		E0C4F4B4244EE9EE00CC7E2F /* YuShouCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YuShouCell.xib; sourceTree = "<group>"; };
 		E0C4F4BB244EF53D00CC7E2F /* BindStepTwoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindStepTwoViewController.swift; sourceTree = "<group>"; };
 		E0C4F4BC244EF53D00CC7E2F /* BindStepTwoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindStepTwoViewController.xib; sourceTree = "<group>"; };
+		E0CC8475248227F5009B1FE9 /* InputInitInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputInitInfoModel.swift; sourceTree = "<group>"; };
+		E0CC847B24823087009B1FE9 /* GetGoodBatchModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGoodBatchModel.swift; sourceTree = "<group>"; };
+		E0CC847D24823602009B1FE9 /* WarehouseIoListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarehouseIoListModel.swift; sourceTree = "<group>"; };
+		E0CC847F2482378D009B1FE9 /* IoGoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IoGoodsDetailModel.swift; sourceTree = "<group>"; };
+		E0CC8481248239F6009B1FE9 /* OutGoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutGoodsDetailModel.swift; sourceTree = "<group>"; };
+		E0CC848324823B72009B1FE9 /* InGoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InGoodsDetailModel.swift; sourceTree = "<group>"; };
+		E0CC848524823EC1009B1FE9 /* CRKCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKCell.swift; sourceTree = "<group>"; };
+		E0CC848624823EC1009B1FE9 /* CRKCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKCell.xib; sourceTree = "<group>"; };
+		E0CC848924824291009B1FE9 /* CRKListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKListVC.swift; sourceTree = "<group>"; };
+		E0CC848A24824291009B1FE9 /* CRKListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKListVC.xib; sourceTree = "<group>"; };
+		E0CC848D248251F6009B1FE9 /* CRKXQVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKXQVC.swift; sourceTree = "<group>"; };
+		E0CC848E248251F6009B1FE9 /* CRKXQVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKXQVC.xib; sourceTree = "<group>"; };
 		E0D197A82448431B002B080C /* BabyCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyCentralManager.h; sourceTree = "<group>"; };
 		E0D197A92448431B002B080C /* BabyDefine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BabyDefine.m; sourceTree = "<group>"; };
 		E0D197AA2448431B002B080C /* BabyOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyOptions.h; sourceTree = "<group>"; };
@@ -1253,10 +1273,10 @@
 		E02FD9EE2455704600E10E27 /* 出入库记录 */ = {
 			isa = PBXGroup;
 			children = (
-				E02FD9EF2455705F00E10E27 /* ChuRuKuJiLuCell.swift */,
-				E02FD9F02455705F00E10E27 /* ChuRuKuJiLuCell.xib */,
-				E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */,
-				E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */,
+				E0CC848924824291009B1FE9 /* CRKListVC.swift */,
+				E0CC848A24824291009B1FE9 /* CRKListVC.xib */,
+				E0CC848D248251F6009B1FE9 /* CRKXQVC.swift */,
+				E0CC848E248251F6009B1FE9 /* CRKXQVC.xib */,
 			);
 			path = "出入库记录";
 			sourceTree = "<group>";
@@ -1367,6 +1387,8 @@
 				E06524FC24581BD900CA22E2 /* PiCiXuanZeViewController.xib */,
 				E03549A6245820C2008BD021 /* PiCiXuanZeCell.swift */,
 				E03549A7245820C2008BD021 /* PiCiXuanZeCell.xib */,
+				E00CB9FF24820CF000701D9D /* CRKSumCell.swift */,
+				E00CBA0024820CF000701D9D /* CRKSumCell.xib */,
 			);
 			path = "入库";
 			sourceTree = "<group>";
@@ -1530,8 +1552,8 @@
 				E03549AA24582806008BD021 /* 客户管理 */,
 				E06524EA2458006600CA22E2 /* 入库 */,
 				E02C88232456B23400925766 /* 物流跟踪 */,
-				E02FD9F3245578D800E10E27 /* 地址管理 */,
 				E02FD9EE2455704600E10E27 /* 出入库记录 */,
+				E02FD9F3245578D800E10E27 /* 地址管理 */,
 				E0A2E82024553EC500D6DB34 /* 库存商品（库存商品的出库） */,
 				E0A2E81724552E1900D6DB34 /* 新增、编辑品牌 */,
 				E09F4C9F2452D13F00BE033D /* 增值服务 */,
@@ -1693,6 +1715,12 @@
 			children = (
 				E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */,
 				E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */,
+				E0CC8475248227F5009B1FE9 /* InputInitInfoModel.swift */,
+				E0CC847B24823087009B1FE9 /* GetGoodBatchModel.swift */,
+				E0CC847D24823602009B1FE9 /* WarehouseIoListModel.swift */,
+				E0CC847F2482378D009B1FE9 /* IoGoodsDetailModel.swift */,
+				E0CC8481248239F6009B1FE9 /* OutGoodsDetailModel.swift */,
+				E0CC848324823B72009B1FE9 /* InGoodsDetailModel.swift */,
 			);
 			path = WarehouseManageModel;
 			sourceTree = "<group>";
@@ -1891,6 +1919,8 @@
 				E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */,
 				E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */,
 				E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */,
+				E0CC848524823EC1009B1FE9 /* CRKCell.swift */,
+				E0CC848624823EC1009B1FE9 /* CRKCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -2510,7 +2540,6 @@
 				E07B1E5F24591AA50055BA3C /* KeHuXQViewController.xib in Resources */,
 				E0707DD624624B5200E039A8 /* AMap.bundle in Resources */,
 				E02DDD83244FD15B00ABB707 /* TitleAndSwitchHeaderView.xib in Resources */,
-				E00E48CB2457D96100F16545 /* ChuRuKuJiLuXQViewController.xib in Resources */,
 				E03549AE24582828008BD021 /* KeHuGuanLiCell.xib in Resources */,
 				F950FDB12451811A00C40530 /* TitleAndSelCalendarView.xib in Resources */,
 				E0B946282456775000FBEC9A /* DaiKeXiaDanGouWuCell.xib in Resources */,
@@ -2522,6 +2551,7 @@
 				F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */,
 				E0F97B0424512299001BD600 /* GLAlertSelectView.xib in Resources */,
 				F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
+				E0CC8490248251F6009B1FE9 /* CRKXQVC.xib in Resources */,
 				F94A315424626D7800FEC38E /* WorkCViewController.xib in Resources */,
 				E042F7392452766100CDFA12 /* AdressSelectCell.xib in Resources */,
 				E0A409C92464010D00CFF109 /* FirstCell.xib in Resources */,
@@ -2535,7 +2565,6 @@
 				F94A316024629DDD00FEC38E /* WorkBannerTableViewCell.xib in Resources */,
 				F95567AC2453E40B009674AB /* OrderListViewController.xib in Resources */,
 				E00E48C72457C99900F16545 /* KuCunShangPinXQViewController.xib in Resources */,
-				E02FD9F22455705F00E10E27 /* ChuRuKuJiLuCell.xib in Resources */,
 				F961D26924500550007FBE70 /* HeaderSelectView.xib in Resources */,
 				E06524F224580AAC00CA22E2 /* RuKuJiaGeCell.xib in Resources */,
 				E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
@@ -2543,6 +2572,7 @@
 				E0F97B092451620B001BD600 /* ProductDetailViewController.xib in Resources */,
 				F9956B23246408A6001A617D /* GoodsClassViewController.xib in Resources */,
 				E06524FA24581A7900CA22E2 /* ChuKuCell.xib in Resources */,
+				E0CC848824823EC1009B1FE9 /* CRKCell.xib in Resources */,
 				E0337EF62464FCFC00952EF4 /* GYSListViewController.xib in Resources */,
 				E0337EF22464F69000952EF4 /* YingFuZKListViewController.xib in Resources */,
 				E0B9462C2456AABE00FBEC9A /* YuShouWeiKuanFaHuoCell.xib in Resources */,
@@ -2550,6 +2580,7 @@
 				E0F97B0D24516B1F001BD600 /* AddImgCell.xib in Resources */,
 				E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
 				E08A7AE124652E2C00F934F2 /* BingDingKeHuViewController.xib in Resources */,
+				E00CBA0224820CF000701D9D /* CRKSumCell.xib in Resources */,
 				E0206335246CE45A007A40C4 /* HeaderOnlyTitleView.xib in Resources */,
 				E0A409D524640B8300CFF109 /* DZGLViewController.xib in Resources */,
 				F95567A82453DA86009674AB /* WarehoseMangementListVC.xib in Resources */,
@@ -2565,6 +2596,7 @@
 				E0B94624245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.xib in Resources */,
 				F9023F722449ACA800DD5A63 /* TitleAndSwitchCell.xib in Resources */,
 				E08B0675244A98B2001D2E01 /* WareHouseSpCell.xib in Resources */,
+				E0CC848C24824291009B1FE9 /* CRKListVC.xib in Resources */,
 				E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
 				E02DDD8B244FE17400ABB707 /* NewCreateFooter.xib in Resources */,
 				F95A9EEE24558E3D00867849 /* ChangeGoodsPriceVC.xib in Resources */,
@@ -2696,6 +2728,7 @@
 				F950FDE624518B9500C40530 /* FSCalendarAppearance.m in Sources */,
 				F9531F392465108800724BEE /* JXPhotoBrowserPageIndicator.swift in Sources */,
 				F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
+				E0CC8482248239F6009B1FE9 /* OutGoodsDetailModel.swift in Sources */,
 				F933F6D22452DAE100189561 /* TabBarContentClassView.swift in Sources */,
 				F933F6C82452C68B00189561 /* PKHUDTextView.swift in Sources */,
 				F956D5AF246A2D9C003FF510 /* LMNCheckboxLine.m in Sources */,
@@ -2745,6 +2778,7 @@
 				E06524F124580AAC00CA22E2 /* RuKuJiaGeCell.swift in Sources */,
 				E042F7382452766100CDFA12 /* AdressSelectCell.swift in Sources */,
 				F956D5A6246A2D9C003FF510 /* LMNoteViewController.m in Sources */,
+				E0CC848B24824291009B1FE9 /* CRKListVC.swift in Sources */,
 				E03549AD24582828008BD021 /* KeHuGuanLiCell.swift in Sources */,
 				F95567A72453DA86009674AB /* WarehoseMangementListVC.swift in Sources */,
 				F933F6CF2452C68B00189561 /* PKHUDErrorView.swift in Sources */,
@@ -2755,6 +2789,7 @@
 				E02FD9F62455790800E10E27 /* DiZhiGuanLiCell.swift in Sources */,
 				E0B946272456775000FBEC9A /* DaiKeXiaDanGouWuCell.swift in Sources */,
 				E0206333246CE450007A40C4 /* HeaderOnlyTitleView.swift in Sources */,
+				E0CC8476248227F5009B1FE9 /* InputInitInfoModel.swift in Sources */,
 				F950FDDB24518B9500C40530 /* FSCalendarStickyHeader.m in Sources */,
 				E02D586D2477A2D90065A9EB /* EditFtNumberModel.swift in Sources */,
 				F95A9EE924558B8800867849 /* ShowAlGoodsViewController.swift in Sources */,
@@ -2851,6 +2886,7 @@
 				E08B0674244A98B2001D2E01 /* WareHouseSpCell.swift in Sources */,
 				E0A2E81E24552F0A00D6DB34 /* TilteAndTextViewCell.swift in Sources */,
 				F9531F3D2465108800724BEE /* JXPhotoBrowserAnimatedTransitioning.swift in Sources */,
+				E00CBA0124820CF000701D9D /* CRKSumCell.swift in Sources */,
 				E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */,
 				E0337EF52464FCFC00952EF4 /* GYSListViewController.swift in Sources */,
 				E0C4F4B5244EE9EE00CC7E2F /* YuShouCell.swift in Sources */,
@@ -2861,7 +2897,6 @@
 				E0DDCB0F244AD8C500DF54C7 /* DaiQueRenCell.swift in Sources */,
 				E042F74024528CD500CDFA12 /* TitleAndOnlyBtnCell.swift in Sources */,
 				F969BF07244EC38000C79953 /* GoodsCollectionViewCell.swift in Sources */,
-				E02FD9F12455705F00E10E27 /* ChuRuKuJiLuCell.swift in Sources */,
 				F9531F462465108800724BEE /* JXPhotoBrowser.swift in Sources */,
 				E08A7ADC246505F000F934F2 /* KeHuListViewController.swift in Sources */,
 				E0A2E82724555B4400D6DB34 /* KuCunShangPinCell.swift in Sources */,
@@ -2872,6 +2907,7 @@
 				F956D5AC246A2D9C003FF510 /* LMNImageLine.m in Sources */,
 				E09B03C02445B96500211A51 /* FgPassViewController.swift in Sources */,
 				F950FDAB2451634B00C40530 /* LocationGeliPayModel.swift in Sources */,
+				E0CC84802482378D009B1FE9 /* IoGoodsDetailModel.swift in Sources */,
 				E0D197C6244845FD002B080C /* PersonCenterViewController.swift in Sources */,
 				E0F1BE4824692379003015B2 /* ItemCell.swift in Sources */,
 				E09B03AB2445B0A300211A51 /* LoginModel.swift in Sources */,
@@ -2901,6 +2937,7 @@
 				F94A315324626D7800FEC38E /* WorkCViewController.swift in Sources */,
 				F9531F3A2465108800724BEE /* JXPhotoBrowserNoneAnimator.swift in Sources */,
 				E07B1E62245921A60055BA3C /* KeHuXQCell.swift in Sources */,
+				E0CC847C24823087009B1FE9 /* GetGoodBatchModel.swift in Sources */,
 				F956D5C0246A3789003FF510 /* OrderDetailModel.swift in Sources */,
 				E0DDCB1D244AE81800DF54C7 /* GuanLianKeHuCell.swift in Sources */,
 				E0D197BF2448431C002B080C /* BabyBluetooth.m in Sources */,
@@ -2909,7 +2946,6 @@
 				F95A9EED24558E3D00867849 /* ChangeGoodsPriceVC.swift in Sources */,
 				E00E48BE2457BAC700F16545 /* XuanZeShangPinCell.swift in Sources */,
 				E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */,
-				E00E48CA2457D96100F16545 /* ChuRuKuJiLuXQViewController.swift in Sources */,
 				E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */,
 				F94A314F24625AFA00FEC38E /* GoodsUpDataModel.swift in Sources */,
 				F933F6C32452C68B00189561 /* FrameView.swift in Sources */,
@@ -2920,12 +2956,14 @@
 				F956D5B5246A2D9C003FF510 /* LMNStore.m in Sources */,
 				F956D5A7246A2D9C003FF510 /* LMNLineChain+Numbering.m in Sources */,
 				E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */,
+				E0CC848F248251F6009B1FE9 /* CRKXQVC.swift in Sources */,
 				F9023F62244999F500DD5A63 /* WarehoseMangementCell.swift in Sources */,
 				F956D5B1246A2D9C003FF510 /* LMNFolder.m in Sources */,
 				E0A409D424640B8300CFF109 /* DZGLViewController.swift in Sources */,
 				E0516F772448003D00E373CE /* PayViewController.swift in Sources */,
 				E02DDD952450106C00ABB707 /* PuTongJieTiCell.swift in Sources */,
 				E0BE8A8B245A7D3300E80134 /* BtmBtnCell.swift in Sources */,
+				E0CC848424823B72009B1FE9 /* InGoodsDetailModel.swift in Sources */,
 				F9531F452465108800724BEE /* JXPhotoBrowserLog.swift in Sources */,
 				F956D5A3246A2D9C003FF510 /* LMNImageInputViewController.m in Sources */,
 				F9956B1E2463D94E001A617D /* WorkSelectTimeView.swift in Sources */,
@@ -2943,6 +2981,7 @@
 				E042F730245272FF00CDFA12 /* XiaYunDanViewController.swift in Sources */,
 				E09B03A72445B04E00211A51 /* BaseViewController.swift in Sources */,
 				E02DDD9924501A5B00ABB707 /* DelGuiGeCell.swift in Sources */,
+				E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */,
 				E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
 				E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */,
 				E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */,
@@ -2950,6 +2989,7 @@
 				F956D5AE246A2D9C003FF510 /* LMNTextLine.m in Sources */,
 				F9531F442465108800724BEE /* JXPhotoBrowserFadeAnimator.swift in Sources */,
 				F956D5AD246A2D9C003FF510 /* LMNLine.m in Sources */,
+				E0CC848724823EC1009B1FE9 /* CRKCell.swift in Sources */,
 				E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */,
 				E01EA1A4245A60E000F019D5 /* XiaDanChengGongViewController.swift in Sources */,
 				F94A314D2462582F00FEC38E /* GeneralInfoModel.swift in Sources */,

GeliBusinessPlatform/AppDelegate.swift

@@ -74,6 +74,7 @@ class AppDelegate: UIResponder,UIApplicationDelegate,UNUserNotificationCenterDel
         completionHandler(Int(UNAuthorizationOptions.alert.rawValue))// 需要执行这个方法，选择是否提醒用户，有Badge、Sound、Alert三种类型可以选择设置
     }
     
+    
     //ios 10 以上接受数据
     func jpushNotificationCenter(_ center: UNUserNotificationCenter!, didReceive response: UNNotificationResponse!, withCompletionHandler completionHandler: (() -> Void)!) {
         let userInfo = response.notification.request.content.userInfo

GeliBusinessPlatform/Assets.xcassets/分类CELL图/dotLine.imageset/Contents.json

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

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -96,5 +96,31 @@
 	<string>Workcenter/auths</string>
 	<key>填写/修改订单物流单号</key>
 	<string>Order/editLwbno</string>
+	<key>获取入库的基本信息</key>
+	<string>Warehouse/inputInitInfo</string>
+	<key>获取出库的基本信息</key>
+	<string>Warehouse/OutputInitInfo</string>
+	<key>商品入库审核</key>
+	<string>Warehouse/goodsInputAudit</string>
+	<key>商品入库</key>
+	<string>Warehouse/goodsInput</string>
+	<key>商品入库申请</key>
+	<string>Warehouse/goodsInputApply</string>
+	<key>添加检测报告</key>
+	<string>Warehouse/goodsReportAdd</string>
+	<key>获取商品批次</key>
+	<string>Warehouse/getGoodBatch</string>
+	<key>商品出库</key>
+	<string>Warehouse/goodsOutput</string>
+	<key>商品申请出库</key>
+	<string>Warehouse/goodsOutputApply</string>
+	<key>商品审核出库</key>
+	<string>Warehouse/goodsOutputAudit</string>
+	<key>出入库记录</key>
+	<string>Warehouse/warehouseIoList</string>
+	<key>查看出入库单详情(已审核)</key>
+	<string>Warehouse/IoGoodsDetail</string>
+	<key>商品出库审核详情(未审核状态)</key>
+	<string>Warehouse/OutGoodsDetail</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库
 
 class UpDataModel: Mappable {
     var code:Int?

GeliBusinessPlatform/Model/WarehouseInterface.swift

@@ -12,26 +12,26 @@ import SwiftyJSON
 import ObjectMapper
 //MARK: --商家仓库列表
 /**
-params-key:
-
-user_token(验证token)
-keyword（关键字）
-page(第几页)
-
-*/
+ params-key:
+ 
+ user_token(验证token)
+ keyword（关键字）
+ page(第几页)
+ 
+ */
 func warehouseList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) { NetworkRequest.sharedInstance.postRequest("商家仓库列表", params, { (rep:DataResponse<ShopWarehouseListModel>) in
-    }, success: { (data) in
-        success(data)
-    }) { (error) in
+}, success: { (data) in
+    success(data)
+}) { (error) in
     }
 }
 
 //MARK: -- 商家详情
 /**
-params-key:
-user_token(验证token)
-w_id(仓库id)
-*/
+ params-key:
+ user_token(验证token)
+ w_id(仓库id)
+ */
 func WarehouseDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
     NetworkRequest.sharedInstance.postRequest("商家仓库详情", params, { (rep:DataResponse<ShopWarehouseDetailModel>) in
     }, success: { (data) in
@@ -44,18 +44,18 @@ func WarehouseDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),fai
 //MRAK: - 商家仓库添加
 //params-key
 /*
-user_token
-w_name  仓库名称
-w_type  仓库类型，1常温、2冷藏、3冷冻
-position_str  库位名，多库位用逗号拼接
-w_address  仓库地址
-volume  仓库容积
-area  仓库面积
-contact  联系人
-contact_number      联系电话
-mail 邮箱
-is_default  是否默认，1是0非
-*/
+ user_token
+ w_name  仓库名称
+ w_type  仓库类型，1常温、2冷藏、3冷冻
+ position_str  库位名，多库位用逗号拼接
+ w_address  仓库地址
+ volume  仓库容积
+ area  仓库面积
+ contact  联系人
+ contact_number      联系电话
+ mail 邮箱
+ is_default  是否默认，1是0非
+ */
 func ShopWarehouseAdd(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
     NetworkRequest.sharedInstance.postRequest("商家仓库添加", params, { (rep:DataResponse<UpDataModel>) in
     }, success: { (data) in
@@ -68,20 +68,20 @@ func ShopWarehouseAdd(_ params:[String:Any],success:@escaping (_ res:Any)->(),fa
 //MRAK: - 商家仓库修改
 //params-key
 /*
-user_token
-w_name  仓库名称
-w_id 仓库id
-w_type  仓库类型，1常温、2冷藏、3冷冻
-position_str  库位名，多库位用逗号拼接
-w_address  仓库地址
-volume  仓库容积
-area  仓库面积
-contact  联系人
-contact_number      联系电话
-mail 邮箱
-is_default  是否默认，1是0非
+ user_token
+ w_name  仓库名称
+ w_id 仓库id
+ w_type  仓库类型，1常温、2冷藏、3冷冻
+ position_str  库位名，多库位用逗号拼接
+ w_address  仓库地址
+ volume  仓库容积
+ area  仓库面积
+ contact  联系人
+ contact_number      联系电话
+ mail 邮箱
+ is_default  是否默认，1是0非
  warehouse_position 仓库库位信息，必须要有一个库位json字符串，字段见下表
-*/
+ */
 func ShopWarehouseEdit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
     NetworkRequest.sharedInstance.postRequest("商家仓库修改", params, { (rep:DataResponse<UpDataModel>) in
     }, success: { (data) in
@@ -94,9 +94,9 @@ func ShopWarehouseEdit(_ params:[String:Any],success:@escaping (_ res:Any)->(),f
 //MRAK: - 商家仓库删除
 //params-key
 /*
-user_token
-w_id  仓库id，仓库中有库存则不可删除
-*/
+ user_token
+ w_id  仓库id，仓库中有库存则不可删除
+ */
 func ShopWarehouseDel(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
     NetworkRequest.sharedInstance.postRequest("商家仓库删除", params, { (rep:DataResponse<UpDataModel>) in
     }, success: { (data) in
@@ -105,3 +105,324 @@ func ShopWarehouseDel(_ params:[String:Any],success:@escaping (_ res:Any)->(),fa
         failture(error)
     }
 }
+
+//MARK: -- 获取入库的基本信息
+/**
+ params-key:
+ user_token(验证token)
+ goods_id(仓库id)
+ */
+func InputInitInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取入库的基本信息", params, { (rep:DataResponse<InputInitInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 获取出库的基本信息
+/**
+ params-key:
+ user_token(验证token)
+ p_id(库位id，直接出库时需要根据库位获取对应的商品数据)
+ 出库与入库内容一致。共用InputInitInfoModel 
+ */
+func OutputInitInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取出库的基本信息", params, { (rep:DataResponse<InputInitInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品入库审核
+/**
+ params-key:
+ user_token(验证token)
+ io_id(出/入库单号)
+ goods_info(商品数据，json字符串，字段见下表)
+ w_id（入库的仓库id    ）
+ p_id（入库的库位id       ）
+ iog_id（出/入库商品id        ）
+ */
+func GoodsInputAudit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品入库审核", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+
+//MARK: -- 商品入库
+/**
+ params-key:
+ user_token(验证token)
+ w_id    (仓库id)
+ p_id(库位id    )
+ i_type（入库类型 ）
+ 入库类型,1采购，2调入，3退货，4生产，5调出被拒绝，6外采，7其他，8固定采购，9临时采购
+ 
+ apply_remark（入库备注        ）
+ goods_info（入库商品信息，二维数组转json格式，字段见下表        ）
+ goods_id 商品id
+ sku_id 商品sku_id
+ goods_name 商品名
+ goods_spec 商品规格
+ number 入库数量
+ price 商品价格
+ amount 采购价格
+ production_data 生产日期，时间戳格式
+ shelf_life 保质期，单位：天
+ report_id 检测报告id，未选择填0
+ pog_id 固定值：1
+ */
+func GoodsInput(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品入库", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品入库申请
+/**
+ params-key:
+ user_token(验证token)
+ w_id    (仓库id)
+ p_id(库位id    )
+ i_type（入库类型 ）
+ 入库类型,1采购，2调入，3退货，4生产，5调出被拒绝，6外采，7其他，8固定采购，9临时采购
+ 
+ apply_remark（入库备注        ）
+ 
+ goods_info（入库商品信息，二维数组转json格式，字段见下表        ）
+ goods_id 商品id
+ sku_id 商品sku_id
+ goods_name 商品名
+ goods_spec 商品规格
+ number 入库数量
+ price 商品价格
+ amount 采购价格
+ production_data 生产日期，时间戳格式
+ shelf_life 保质期，单位：天
+ report_id 检测报告id，未选择填0
+ pog_id 固定值：1
+ */
+func GoodsInputApply(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品入库申请", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 添加检测报告
+
+/**
+ params-key:
+ user_token(验证token)
+ report_sn    (报告编码    )
+ report_type 报告类型,1检验检测报告，2关检报告，3检验检疫合格证
+goods_id
+ sku_id
+ file_url
+ */
+func GoodsReportAdd(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("添加检测报告", params, { (rep:DataResponse<GoodsReportAddModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 获取商品批次
+
+/**
+ params-key:
+ user_token(验证token)
+ sku_id    (商品sku_id     )
+ p_id 库位id
+
+ */
+func GetGoodBatch(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取商品批次", params, { (rep:DataResponse<GetGoodBatchModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品出库
+
+/**
+ params-key:
+ user_token(验证token)
+ o_type    (出库类型，值见下文   )
+ 出库类型 值：
+ 1销售，2调出，3报损，4赠品，5自用，6生产使用，7过期处理，8用户试用，9采购退货，10其他
+ audit_remark 出库备注
+goods_info 入库商品,二维数组json字符串，字段见下表
+ goods_id 商品id
+ goods_name 商品名
+ goods_spec 商品规格
+ sku_id
+ number 出库数量
+ batch_info 批次信息,二维数组(此处不用转json),用户不填传没有key的空数组,后端根据算法自动分配批次，字段见下表
+ [
+ w_id 仓库id
+ p_id 库位id
+ number 批次数量
+ production_data   生产日期
+ shelf_life 保质期
+ valid_date 过期时间
+ batch_id 批次id
+ report_id 商品报告id
+ ]
+ */
+func GoodsOutput(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品出库", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品申请出库
+
+/**
+ params-key:
+ user_token(验证token)
+ o_type    (出库类型，值见下文   )
+ 出库类型 值：
+ 1销售，2调出，3报损，4赠品，5自用，6生产使用，7过期处理，8用户试用，9采购退货，10其他
+ audit_remark 出库备注
+goods_info 入库商品,二维数组json字符串，字段见下表
+ goods_id 商品id
+ goods_name 商品名
+ goods_spec 商品规格
+ sku_id
+ number 出库数量
+ 
+ */
+func GoodsOutputApply(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品申请出库", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+
+//MARK: -- 商品审核出库
+
+/**
+ params-key:
+ user_token(验证token)
+ io_id    (出/入库单id     )
+
+ audit_remark 审核出库备注
+goods_info 入库商品,二维数组json字符串，字段见下表
+ goods_id 商品id
+ goods_name 商品名
+ goods_spec 商品规格
+ sku_id
+ number 出库数量
+ batch_info 批次信息,二维数组(此处不用转json),用户不填传没有key的空数组,后端根据算法自动分配批次，字段见下表
+ [
+ w_id 仓库id
+ p_id 库位id
+ number 批次数量
+ production_data   生产日期
+ shelf_life 保质期
+ valid_date 过期时间
+ batch_id 批次id
+ report_id 商品报告id
+ ]
+ */
+func GoodsOutputAudit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品审核出库", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 出入库记录
+
+/**
+ params-key:
+ user_token(验证token)
+ status    出入库(审核)状态，1审核中，2通过，3不通过；0全部
+ page 页数
+ 
+ */
+func WarehouseIoList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("出入库记录", params, { (rep:DataResponse<WarehouseIoListModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 查看出入库单详情(已审核)
+
+/**
+ params-key:
+ user_token(验证token)
+ io_id    出入库单id
+ 
+ */
+func IoGoodsDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("查看出入库单详情(已审核)", params, { (rep:DataResponse<IoGoodsDetailModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品出库审核详情(未审核状态)
+
+/**
+ params-key:
+ user_token(验证token)
+ io_id    出入库单id
+ 
+ */
+func OutGoodsDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品出库审核详情(未审核状态)", params, { (rep:DataResponse<OutGoodsDetailModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK: -- 商品入库审核详情(未审核状态)
+
+/**
+ params-key:
+ user_token(验证token)
+ 
+ */
+func InGoodsDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品入库审核详情(未审核状态)", params, { (rep:DataResponse<InGoodsDetailModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+

GeliBusinessPlatform/Model/WarehouseManageModel/GetGoodBatchModel.swift

+//
+//  GetGoodBatchModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+class GetGoodBatchModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<GetGoodBatchDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GetGoodBatchDataModel: Mappable {
+    var batch_id:Int?//批次id
+    var batch_sn : Int?  //批次号
+    var w_id : Int? //仓储id
+    
+    var p_id:Int?  //库位id
+    var inventory : String? //现有库存
+    var production_data : Double?//生产日期
+    
+    var valid_date:Double?  //过期时间
+    var shelf_life : Int?        //保质期
+    var status : Int?//状态：1正常，2临期，3过期
+    var report_id : Int?//批次报告
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        batch_id <- map["batch_id"]
+        batch_sn <- map["batch_sn"]
+        w_id <- map["w_id"]
+        
+        p_id <- map["p_id"]
+        inventory <- map["inventory"]
+        production_data <- map["production_data"]
+        valid_date <- map["valid_date"]
+        shelf_life <- map["shelf_life"]
+        status <- map["status"]
+        report_id <- map["report_id"]
+    }
+}
+

GeliBusinessPlatform/Model/WarehouseManageModel/InGoodsDetailModel.swift

+//
+//  OutGoodsDetailModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+class InGoodsDetailModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<InGoodsDetailDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class InGoodsDetailDataModel: Mappable {
+  
+    var io_res : InGoodsDetailDataIoResModel?
+    var goods_res : Array<InGoodsDetailDataGoodsResModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        io_res <- map["io_res"]
+        goods_res <- map["goods_res"]
+    }
+}
+class InGoodsDetailDataIoResModel: Mappable {
+  
+    var apply_remark : String?//申请备注
+    var audit_remark : String?//  审核备注
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        apply_remark <- map["apply_remark"]
+        audit_remark <- map["audit_remark"]
+    }
+}
+
+class InGoodsDetailDataGoodsResModel: Mappable {
+  
+    var iog_id : Int?
+    var sku_id : Int? //商品sku_id
+    var goods_name : String?  //商品名
+    
+    var goods_spec : String?//商品规格
+    var number : Int?  //数量
+    var production_data : Double?
+    var valid_date : Double?
+    
+    var shelf_life : Int?
+    var report_id : Int?
+    var amount:String?
+    var subtotal:String?
+    var inventory : Int?
+    var report_sn : String?
+    var file_url : String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        iog_id <- map["iog_id"]
+        sku_id <- map["sku_id"]
+        goods_name <- map["goods_name"]
+        
+        goods_spec <- map["goods_spec"]
+        number <- map["number"]
+        production_data <- map["production_data"]
+        valid_date <- map["valid_date"]
+        
+        shelf_life <- map["shelf_life"]
+        report_id <- map["report_id"]
+        amount <- map["amount"]
+        subtotal <- map["subtotal"]
+        inventory <- map["inventory"]
+        report_sn <- map["report_sn"]
+        file_url <- map["file_url"]
+    }
+}
+

GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift

+//
+//  inputInitInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//仓库列表
+class InputInitInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<InputInitInfoDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class InputInitInfoDataModel: Mappable {
+    var warehouse_res : Array<InputInitInfoWareHouseResModel>?
+    var goods_info : Array<InputInitInfoGoodsInfoModel>?
+    var auth : Array<String>?
+    /*
+     "auth": [ //出库、入库权限，值固定为以下4个，缺少哪个值则说明无对应权限
+                "63",        //入库
+                "64",        //出库
+                "65",        //申请入库
+                "66"        //申请出库
+            ]
+     */
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        warehouse_res <- map["warehouse_res"]
+        goods_info <- map["goods_info"]
+        auth <- map["auth"]
+    }
+}
+
+class InputInitInfoWareHouseResModel: Mappable {//仓库数据
+    var w_id:Int?   //仓库id
+    var shop_id : Int?
+    var w_name : String?  //仓库名
+    var w_type : Int?   //仓库类型，1常温、2冷藏、3冷冻
+    
+    var w_address:String?  //仓库地址
+    var volume : Int?   //容积，单位立方米
+    var area : Int?//面积，单位平方米
+    var contact : String? //联系人
+    
+    var contact_number:String? //联系电话
+    var mail : String?    //电子邮箱
+    var position_count : Int?//库位数量(统计用)
+    var is_default : Int? //是否为默认
+    var inventory_count : Int? //库存总数
+    var warehouse_position : Array<InputInitInfoWareHouseResPositionModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        w_id <- map["w_id"]
+        shop_id <- map["shop_id"]
+        w_name <- map["w_name"]
+        w_type <- map["w_type"]
+        w_address <- map["w_address"]
+        volume <- map["volume"]
+        area <- map["area"]
+        contact <- map["contact"]
+        contact_number <- map["contact_number"]
+        mail <- map["mail"]
+        position_count <- map["position_count"]
+        is_default <- map["is_default"]
+        inventory_count <- map["inventory_count"]
+        warehouse_position <- map["warehouse_position"]
+        
+    }
+}
+
+class InputInitInfoWareHouseResPositionModel: Mappable {
+    var p_id :Int? //库位id
+    var w_id : Int?//仓库id
+    var p_name : String?//库位名
+    var is_default :Int?//是否为默认
+    var inventory_count : Int?   //库存总数
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        p_id <- map["p_id"]
+        w_id <- map["w_id"]
+        p_name <- map["p_name"]
+        is_default <- map["is_default"]
+        inventory_count <- map["inventory_count"]
+    }
+}
+
+class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
+    var sku_id : Int?//sku_id
+    var goods_id :Int?//商品id
+    var goods_name : String?//商品名
+    
+    var goods_thumb : String?//商品缩略图
+    var spec_str :String?  //商品规格
+    var price : String?  //商品价格
+    
+    var inventory : Int?//可售库存
+    var warehouse_inventory :Int?//仓储库存
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sku_id <- map["sku_id"]
+        goods_id <- map["goods_id"]
+        goods_name <- map["goods_name"]
+        goods_thumb <- map["goods_thumb"]
+        spec_str <- map["spec_str"]
+        price <- map["price"]
+        inventory <- map["inventory"]
+        warehouse_inventory <- map["warehouse_inventory"]
+    }
+}
+
+class GoodsReportAddModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GoodsReportAddDataModel?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GoodsReportAddDataModel: Mappable { 
+    var report_id:Int?
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        report_id <- map["report_id"]
+    }
+}
+

GeliBusinessPlatform/Model/WarehouseManageModel/IoGoodsDetailModel.swift

+//
+//  IoGoodsDetailModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+class IoGoodsDetailModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<IoGoodsDetailDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class IoGoodsDetailDataModel: Mappable {
+    var io_res:IoGoodsDetailDataIoResModel?
+    var goods_res : Array<IoGoodsDetailDataGoodsResModel>?
+   
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        io_res <- map["io_res"]
+        goods_res <- map["goods_res"]
+    }
+}
+
+class IoGoodsDetailDataIoResModel: Mappable {
+    //申请备注
+    var apply_remark:String?
+    //审核备注
+    var audit_remark : String?
+   
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        apply_remark <- map["apply_remark"]
+        audit_remark <- map["audit_remark"]
+    }
+}
+
+class IoGoodsDetailDataGoodsResModel: Mappable {
+    var iog_id:Int?
+    var sku_id : String?//商品sku_id
+    var goods_name:Int?  //商品名
+    var goods_spec : String?//商品规格
+    
+    var number:Int?//数量
+    var production_data : String?  //生产日期
+    var valid_date:Int?  //过期时间
+    var shelf_life : String? //保质期(单位：天)
+    
+    var report_id:Int? //商品报告id
+    var amount : String?
+    var subtotal:Int?
+    var report_sn : String? //商品报告sn
+    
+    var file_url:String?//商品报告文件
+    var w_name : String?//仓库
+    var p_name:Int?//仓库
+
+   
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        iog_id <- map["iog_id"]
+        sku_id <- map["sku_id"]
+        goods_name <- map["goods_name"]
+        goods_spec <- map["goods_spec"]
+        
+        number <- map["number"]
+        production_data <- map["production_data"]
+        valid_date <- map["valid_date"]
+        shelf_life <- map["shelf_life"]
+        
+        report_id <- map["report_id"]
+        amount <- map["amount"]
+        subtotal <- map["subtotal"]
+        report_sn <- map["report_sn"]
+        
+        file_url <- map["file_url"]
+        w_name <- map["w_name"]
+        p_name <- map["p_name"]
+    }
+}

GeliBusinessPlatform/Model/WarehouseManageModel/OutGoodsDetailModel.swift

+//
+//  OutGoodsDetailModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+class OutGoodsDetailModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<OutGoodsDetailDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class OutGoodsDetailDataModel: Mappable {
+  
+    var io_res : OutGoodsDetailDataIoResModel?
+    var goods_res : Array<OutGoodsDetailDataGoodsResModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        io_res <- map["io_res"]
+        goods_res <- map["goods_res"]
+    }
+}
+class OutGoodsDetailDataIoResModel: Mappable {
+  
+    var apply_remark : String?//申请备注
+    var audit_remark : String?//  审核备注
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        apply_remark <- map["apply_remark"]
+        audit_remark <- map["audit_remark"]
+    }
+}
+
+class OutGoodsDetailDataGoodsResModel: Mappable {
+  
+    var iog_id : Int?
+    var goods_id : Int? //商品id
+    var sku_id : Int? //商品sku_id
+    var goods_name : String?  //商品名
+    
+    var goods_spec : String?//商品规格
+    var number : Int?  //数量
+    var production_data : Double?
+    var valid_date : Double?
+    
+    var shelf_life : Int?
+    var report_id : Int?
+    var batch_id : Int?
+    var inventory : Int?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        iog_id <- map["iog_id"]
+        goods_id <- map["goods_id"]
+        sku_id <- map["sku_id"]
+        goods_name <- map["goods_name"]
+        
+        goods_spec <- map["goods_spec"]
+        number <- map["number"]
+        production_data <- map["production_data"]
+        valid_date <- map["valid_date"]
+        
+        shelf_life <- map["shelf_life"]
+        report_id <- map["report_id"]
+        batch_id <- map["batch_id"]
+        inventory <- map["inventory"]
+    }
+}
+

GeliBusinessPlatform/Model/WarehouseManageModel/WarehouseIoListModel.swift

+//
+//  WarehouseIoListModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+class WarehouseIoListModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : Array<WarehouseIoListDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class WarehouseIoListDataModel: Mappable {
+    var io_id:Int?//出入库id
+    var oi_sn : String?//出入库sn
+    var applicant : String? //申请人
+    
+    var io_type:Int?    //类型(出/入库)，1入库，2出库，3撤销入库
+    var status : Int?//出入库(审核)状态，1审核中，2通过，3不通过
+    var auditor : String?//审核人
+
+    var add_time:Double?//下单时间
+    var audit_time : Double?//审核时间
+    var i_type : Int?
+    
+    var o_type:Int?
+    var goods_res : WarehouseIoListDataResModel? //商品信息
+    var io_type_cn : String?     //出/入库详细类型(已中文处理
+    
+   
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        io_id <- map["io_id"]
+        oi_sn <- map["oi_sn"]
+        applicant <- map["applicant"]
+        
+        io_type <- map["io_type"]
+        status <- map["status"]
+        auditor <- map["auditor"]
+        
+        add_time <- map["add_time"]
+        audit_time <- map["audit_time"]
+        i_type <- map["i_type"]
+        
+        o_type <- map["o_type"]
+        goods_res <- map["goods_res"]
+        io_type_cn <- map["io_type_cn"]
+    }
+}
+
+class WarehouseIoListDataResModel: Mappable {
+    //商品名
+    var goods_name:String?
+    //规格
+    var goods_spec : String?
+    //数量
+    var number : Int?
+    //缩略图
+    var goods_thumb : String?
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_name <- map["goods_name"]
+        goods_spec <- map["goods_spec"]
+        number <- map["number"]
+        goods_thumb <- map["goods_thumb"]
+    }
+}

GeliBusinessPlatform/SceneDelegate.swift

@@ -47,7 +47,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         vc.delegate = self
         let contentView = vc
 //
-//        let vc = PersonCenterViewController()
+//        let vc = CRKListVC()
 //        let contentView = vc
         
         if let windowScene = sceneC as? UIWindowScene {
@@ -80,7 +80,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         
         
         let v1 = OrderListViewController()
-        let v2 = GoodsManageListVC()
+        let v2 = CRKListVC()
 //        let v3 = WorkCViewController()
         let v4 = WarehoseMangementListVC()
         let v5 = PersonCenterViewController()

GeliBusinessPlatform/View/Cell/CRKCell.swift

+//
+//  CRKCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+protocol CRKCellDelegate {
+    func CRKCellBtnClick(sender:UIButton,cell:CRKCell)
+}
+class CRKCell: UITableViewCell {
+    var delegate:CRKCellDelegate?
+    @IBOutlet weak var detialView: UIView!//详情底图
+    @IBAction func btnClick(_ sender: UIButton) {
+        delegate?.CRKCellBtnClick(sender: sender,cell:self)
+    }
+    @IBOutlet weak var countLbl: UILabel!
+    @IBOutlet weak var statusNameLbl: UILabel!
+    @IBOutlet weak var statusLbl: UILabel!
+    @IBOutlet weak var nameLbl: UILabel!
+    
+    var dataArr:Array<Any>? = []
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        
+        // Initialization code
+    }
+    override func layoutIfNeeded() {
+        super.layoutIfNeeded()
+        
+        var num = 0
+        if dataArr!.count > 4 {
+            num = 4
+        }else{
+            num = dataArr!.count
+        }
+        for i in 0 ..< num {
+            let view = UIView()
+            detialView.addSubview(view)
+            view.backgroundColor = UIColor.white
+            view.snp.makeConstraints { (make) in
+                make.top.equalTo(i * 49)
+                make.left.right.equalTo(0)
+                make.height.equalTo(49)
+            }
+            if i != num - 1 {
+                let dotLine = UIImageView()
+                view.addSubview(dotLine)
+                dotLine.image = UIImage(named: "dotLine")
+                dotLine.snp.makeConstraints { (make) in
+                    make.left.equalTo(15)
+                    make.bottom.right.equalTo(0)
+                    make.height.equalTo(1)
+                }
+            }
+            let lbl = UILabel()
+            lbl.font = UIFont.systemFont(ofSize: 13)
+            lbl.textColor = UIColor(named: "灰色字体颜色")
+            lbl.text = "\(dataArr![i])"
+            view.addSubview(lbl)
+            lbl.snp.makeConstraints { (make) in
+                make.left.equalTo(15)
+                make.bottom.top.right.equalTo(0)
+            }
+            
+            let lbl2 = UILabel()
+            lbl2.font = UIFont.systemFont(ofSize: 13)
+            lbl2.textColor = UIColor(named: "灰色字体颜色")
+            lbl2.textAlignment = .right
+            view.addSubview(lbl2)
+            lbl2.snp.makeConstraints { (make) in
+                make.right.equalTo(-15)
+                make.bottom.left.top.equalTo(0)
+            }
+        }
+    }
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuCell.xib → GeliBusinessPlatform/View/Cell/CRKCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -10,171 +10,150 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ChuRuKuJiLuCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="240"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="113" id="KGk-i7-Jjw" customClass="CRKCell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="367" height="174.5"/>
             <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="375" height="240"/>
+                <rect key="frame" x="0.0" y="0.0" width="367" height="174.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2020.04.22  13:52:16" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CV9-0u-7pG">
-                        <rect key="frame" x="0.0" y="225" width="375" height="15"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="65j-rW-XU4">
+                        <rect key="frame" x="0.0" y="159.5" width="367" height="15"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="15" id="Xbc-Tk-urr"/>
+                            <constraint firstAttribute="height" constant="15" id="2wh-5Z-UUk"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                         <color key="textColor" name="灰色字体颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Axz-Xh-txq">
-                        <rect key="frame" x="15" y="15" width="345" height="205"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RWk-dO-ESH">
+                        <rect key="frame" x="15" y="15" width="337" height="139.5"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kehu" translatesAutoresizingMaskIntoConstraints="NO" id="ub1-x2-7f6">
-                                <rect key="frame" x="15" y="15" width="17" height="18.5"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kehu" translatesAutoresizingMaskIntoConstraints="NO" id="FEl-Gz-NfW">
+                                <rect key="frame" x="15" y="15" width="15" height="17"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="18.5" id="5Uc-EZ-TW5"/>
-                                    <constraint firstAttribute="width" constant="17" id="FW7-ey-2fK"/>
+                                    <constraint firstAttribute="width" constant="15" id="Mfw-rj-5cc"/>
+                                    <constraint firstAttribute="height" constant="17" id="caL-YF-7iE"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="梁小锋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fSV-4I-E01">
-                                <rect key="frame" x="37" y="15" width="293" height="18.5"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="18.5" id="7jW-OM-6RH"/>
-                                </constraints>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C1r-Lj-aue">
+                                <rect key="frame" x="35" y="15.5" width="27" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="标题字颜色"/>
                                 <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="43w-vd-i1c">
-                                <rect key="frame" x="303" y="15" width="27" height="18.5"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="27" id="L62-Mt-xWb"/>
-                                    <constraint firstAttribute="height" constant="18.5" id="zVQ-Hc-jGk"/>
-                                </constraints>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="状态名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xmr-eU-LIr">
+                                <rect key="frame" x="282" y="15.5" width="40" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="蓝色字体颜色"/>
                                 <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="mLZ-TN-1Mq">
-                                <rect key="frame" x="265" y="14" width="38" height="21"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="21" id="cyb-zo-fBf"/>
-                                    <constraint firstAttribute="width" constant="38" id="hfL-5r-OdY"/>
-                                </constraints>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="状态：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="93P-aM-ST1">
+                                <rect key="frame" x="242" y="15.5" width="40" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="标题字颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tsb-XF-Uoe">
-                                <rect key="frame" x="15" y="50.5" width="330" height="1"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AWh-Nq-y1a">
+                                <rect key="frame" x="0.0" y="49" width="337" height="1"/>
                                 <color key="backgroundColor" name="灰色分界线"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="xuy-zw-clC"/>
+                                    <constraint firstAttribute="height" constant="1" id="kKu-5u-VMd"/>
                                 </constraints>
                             </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="i2K-6L-OwM">
-                                <rect key="frame" x="15" y="66.5" width="80" height="80"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="80" id="93c-CD-nsb"/>
-                                    <constraint firstAttribute="width" constant="80" id="ji6-tX-CYr"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="六和川香鸡柳2.5kg/新疆和田大红枣" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y7f-Sg-T4f">
-                                <rect key="frame" x="105" y="66.5" width="225" height="18.5"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="18.5" id="T7v-b9-9P1"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                <color key="textColor" name="标题字颜色"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5kg/箱/袋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UBm-Dn-IJh">
-                                <rect key="frame" x="105" y="100" width="225" height="15"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oLa-7N-YOz">
+                                <rect key="frame" x="0.0" y="50" width="337" height="1"/>
+                                <color key="backgroundColor" name="灰色分界线"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="15" id="Ovq-Ay-I5f"/>
+                                    <constraint firstAttribute="height" constant="1" id="yy3-dd-tT0"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                <color key="textColor" name="灰色字体颜色"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="入库数量：x10000" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NhP-2z-wjS">
-                                <rect key="frame" x="105" y="128" width="225" height="18.5"/>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uLZ-ZH-Ei8">
+                                <rect key="frame" x="0.0" y="50" width="337" height="0.0"/>
+                                <color key="backgroundColor" name="白色背景色"/>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b9u-3C-XDx">
+                                <rect key="frame" x="15" y="61" width="307" height="18.5"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="18.5" id="l2O-w7-XnU"/>
+                                    <constraint firstAttribute="height" constant="18.5" id="0IJ-F8-53V"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="标题字颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8SK-JH-pcY">
-                                <rect key="frame" x="250" y="161.5" width="80" height="30"/>
-                                <color key="backgroundColor" name="按钮渐变色下,字体颜色"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jiv-tY-lF3">
+                                <rect key="frame" x="242" y="94.5" width="80" height="30"/>
+                                <color key="backgroundColor" name="蓝色字体颜色"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="W2L-Zv-CGQ"/>
-                                    <constraint firstAttribute="height" constant="30" id="cxq-K5-MwK"/>
+                                    <constraint firstAttribute="width" constant="80" id="1ja-OA-RIR"/>
+                                    <constraint firstAttribute="height" constant="30" id="vHs-ST-V41"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <state key="normal" title="通过">
-                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleColor" name="白色背景色"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                         <real key="value" value="3"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="btnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="ler-i4-ual"/>
+                                </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qXl-LW-1SK">
-                                <rect key="frame" x="155" y="161.5" width="80" height="30"/>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7d3-0e-5Mj">
+                                <rect key="frame" x="147" y="94.5" width="80" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="IqA-ha-CoS"/>
-                                    <constraint firstAttribute="height" constant="30" id="ohX-Gd-T76"/>
+                                    <constraint firstAttribute="width" constant="80" id="BVs-aO-isk"/>
+                                    <constraint firstAttribute="height" constant="30" id="lfo-IL-Mr2"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <state key="normal" title="不通过">
-                                    <color key="titleColor" name="蓝色字体颜色"/>
+                                    <color key="titleColor" name="灰色字体颜色"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                         <real key="value" value="3"/>
                                     </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" name="灰色字体颜色"/>
+                                    </userDefinedRuntimeAttribute>
                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                         <real key="value" value="1"/>
                                     </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                        <color key="value" name="蓝色字体颜色"/>
-                                    </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="btnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="NKy-e0-zNt"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="UBm-Dn-IJh" secondAttribute="trailing" constant="15" id="6Th-An-cCj"/>
-                            <constraint firstItem="NhP-2z-wjS" firstAttribute="leading" secondItem="i2K-6L-OwM" secondAttribute="trailing" constant="10" id="7yU-wk-1V5"/>
-                            <constraint firstItem="Tsb-XF-Uoe" firstAttribute="leading" secondItem="Axz-Xh-txq" secondAttribute="leading" constant="15" id="IoA-jl-xyS"/>
-                            <constraint firstItem="UBm-Dn-IJh" firstAttribute="leading" secondItem="i2K-6L-OwM" secondAttribute="trailing" constant="10" id="LLP-xZ-ycm"/>
-                            <constraint firstItem="8SK-JH-pcY" firstAttribute="top" secondItem="NhP-2z-wjS" secondAttribute="bottom" constant="15" id="LP2-ob-Kbl"/>
-                            <constraint firstItem="ub1-x2-7f6" firstAttribute="top" secondItem="Axz-Xh-txq" secondAttribute="top" constant="15" id="MYf-hd-asv"/>
-                            <constraint firstItem="ub1-x2-7f6" firstAttribute="leading" secondItem="Axz-Xh-txq" secondAttribute="leading" constant="15" id="P9Q-uR-hJt"/>
-                            <constraint firstItem="NhP-2z-wjS" firstAttribute="bottom" secondItem="i2K-6L-OwM" secondAttribute="bottom" id="PlM-iT-xm6"/>
-                            <constraint firstAttribute="trailing" secondItem="43w-vd-i1c" secondAttribute="trailing" constant="15" id="RX6-mK-3Sd"/>
-                            <constraint firstAttribute="trailing" secondItem="fSV-4I-E01" secondAttribute="trailing" constant="15" id="Rb9-1h-gDB"/>
-                            <constraint firstItem="43w-vd-i1c" firstAttribute="leading" secondItem="mLZ-TN-1Mq" secondAttribute="trailing" id="S95-Ll-E5N"/>
-                            <constraint firstItem="UBm-Dn-IJh" firstAttribute="top" secondItem="Y7f-Sg-T4f" secondAttribute="bottom" constant="15" id="ZHr-hk-wyV"/>
-                            <constraint firstItem="qXl-LW-1SK" firstAttribute="centerY" secondItem="8SK-JH-pcY" secondAttribute="centerY" id="a3a-xY-nz7"/>
-                            <constraint firstItem="i2K-6L-OwM" firstAttribute="top" secondItem="Tsb-XF-Uoe" secondAttribute="bottom" constant="15" id="byT-V1-v0y"/>
-                            <constraint firstItem="Y7f-Sg-T4f" firstAttribute="leading" secondItem="i2K-6L-OwM" secondAttribute="trailing" constant="10" id="csS-an-uYr"/>
-                            <constraint firstItem="fSV-4I-E01" firstAttribute="leading" secondItem="ub1-x2-7f6" secondAttribute="trailing" constant="5" id="cyz-WP-9Yt"/>
-                            <constraint firstItem="43w-vd-i1c" firstAttribute="top" secondItem="Axz-Xh-txq" secondAttribute="top" constant="15" id="eGN-zL-e07"/>
-                            <constraint firstItem="mLZ-TN-1Mq" firstAttribute="centerY" secondItem="43w-vd-i1c" secondAttribute="centerY" id="fgX-CM-vMy"/>
-                            <constraint firstItem="fSV-4I-E01" firstAttribute="centerY" secondItem="ub1-x2-7f6" secondAttribute="centerY" id="hSJ-dM-5v1"/>
-                            <constraint firstAttribute="trailing" secondItem="Tsb-XF-Uoe" secondAttribute="trailing" id="ia3-yp-CQF"/>
-                            <constraint firstAttribute="trailing" secondItem="NhP-2z-wjS" secondAttribute="trailing" constant="15" id="idL-ly-6Q2"/>
-                            <constraint firstItem="Tsb-XF-Uoe" firstAttribute="top" secondItem="mLZ-TN-1Mq" secondAttribute="bottom" constant="15.5" id="nSX-E0-LvD"/>
-                            <constraint firstAttribute="trailing" secondItem="Y7f-Sg-T4f" secondAttribute="trailing" constant="15" id="ouf-e8-YM3"/>
-                            <constraint firstItem="Y7f-Sg-T4f" firstAttribute="top" secondItem="Tsb-XF-Uoe" secondAttribute="bottom" constant="15" id="p38-j6-7rL"/>
-                            <constraint firstItem="i2K-6L-OwM" firstAttribute="leading" secondItem="Axz-Xh-txq" secondAttribute="leading" constant="15" id="rqV-BI-o1Y"/>
-                            <constraint firstItem="8SK-JH-pcY" firstAttribute="leading" secondItem="qXl-LW-1SK" secondAttribute="trailing" constant="15" id="smC-yH-GHG"/>
-                            <constraint firstAttribute="trailing" secondItem="8SK-JH-pcY" secondAttribute="trailing" constant="15" id="xl8-JN-tP9"/>
+                            <constraint firstItem="FEl-Gz-NfW" firstAttribute="top" secondItem="RWk-dO-ESH" secondAttribute="top" constant="15" id="1pe-bO-neq"/>
+                            <constraint firstItem="oLa-7N-YOz" firstAttribute="top" secondItem="uLZ-ZH-Ei8" secondAttribute="bottom" id="98X-pk-dIJ"/>
+                            <constraint firstItem="Xmr-eU-LIr" firstAttribute="centerY" secondItem="C1r-Lj-aue" secondAttribute="centerY" id="ACb-Mm-FbD"/>
+                            <constraint firstAttribute="bottom" secondItem="oLa-7N-YOz" secondAttribute="bottom" constant="88.5" id="BYB-fc-ezY"/>
+                            <constraint firstAttribute="trailing" secondItem="Jiv-tY-lF3" secondAttribute="trailing" constant="15" id="H1o-wf-8S7"/>
+                            <constraint firstAttribute="trailing" secondItem="uLZ-ZH-Ei8" secondAttribute="trailing" id="IsJ-kc-4gZ"/>
+                            <constraint firstAttribute="trailing" secondItem="oLa-7N-YOz" secondAttribute="trailing" id="Jhq-n0-Wgl"/>
+                            <constraint firstItem="C1r-Lj-aue" firstAttribute="leading" secondItem="FEl-Gz-NfW" secondAttribute="trailing" constant="5" id="LfO-Es-RWl"/>
+                            <constraint firstItem="93P-aM-ST1" firstAttribute="centerY" secondItem="Xmr-eU-LIr" secondAttribute="centerY" id="QFY-ae-VVs"/>
+                            <constraint firstAttribute="trailing" secondItem="AWh-Nq-y1a" secondAttribute="trailing" id="SOr-Ut-4la"/>
+                            <constraint firstAttribute="trailing" secondItem="b9u-3C-XDx" secondAttribute="trailing" constant="15" id="SYT-LR-Wyq"/>
+                            <constraint firstItem="b9u-3C-XDx" firstAttribute="top" secondItem="oLa-7N-YOz" secondAttribute="bottom" constant="10" id="YGs-AG-KQt"/>
+                            <constraint firstItem="AWh-Nq-y1a" firstAttribute="top" secondItem="RWk-dO-ESH" secondAttribute="top" constant="49" id="ad7-x5-ous"/>
+                            <constraint firstItem="uLZ-ZH-Ei8" firstAttribute="leading" secondItem="RWk-dO-ESH" secondAttribute="leading" id="aiT-ou-y2v"/>
+                            <constraint firstItem="b9u-3C-XDx" firstAttribute="leading" secondItem="RWk-dO-ESH" secondAttribute="leading" constant="15" id="c0K-jq-RWX"/>
+                            <constraint firstItem="uLZ-ZH-Ei8" firstAttribute="top" secondItem="AWh-Nq-y1a" secondAttribute="bottom" id="hLi-SP-4ql"/>
+                            <constraint firstItem="C1r-Lj-aue" firstAttribute="centerY" secondItem="FEl-Gz-NfW" secondAttribute="centerY" id="j6j-fc-xBS"/>
+                            <constraint firstItem="Xmr-eU-LIr" firstAttribute="leading" secondItem="93P-aM-ST1" secondAttribute="trailing" id="jNe-Sq-T4m"/>
+                            <constraint firstItem="oLa-7N-YOz" firstAttribute="leading" secondItem="RWk-dO-ESH" secondAttribute="leading" id="kbo-hc-ZsZ"/>
+                            <constraint firstAttribute="trailing" secondItem="Xmr-eU-LIr" secondAttribute="trailing" constant="15" id="qHF-F1-vUo"/>
+                            <constraint firstItem="7d3-0e-5Mj" firstAttribute="centerY" secondItem="Jiv-tY-lF3" secondAttribute="centerY" id="tCs-aE-jke"/>
+                            <constraint firstItem="Jiv-tY-lF3" firstAttribute="leading" secondItem="7d3-0e-5Mj" secondAttribute="trailing" constant="15" id="vch-1j-SJU"/>
+                            <constraint firstItem="FEl-Gz-NfW" firstAttribute="leading" secondItem="RWk-dO-ESH" secondAttribute="leading" constant="15" id="xaL-VQ-RYH"/>
+                            <constraint firstAttribute="bottom" secondItem="Jiv-tY-lF3" secondAttribute="bottom" constant="15" id="yPn-fX-Pvk"/>
+                            <constraint firstItem="AWh-Nq-y1a" firstAttribute="leading" secondItem="RWk-dO-ESH" secondAttribute="leading" id="zL6-r2-EIl"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -184,18 +163,25 @@
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="trailing" secondItem="Axz-Xh-txq" secondAttribute="trailing" constant="15" id="1wF-if-Dw6"/>
-                    <constraint firstItem="Axz-Xh-txq" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="43Q-l7-BIn"/>
-                    <constraint firstAttribute="bottom" secondItem="CV9-0u-7pG" secondAttribute="bottom" id="DLQ-Ab-pJm"/>
-                    <constraint firstItem="CV9-0u-7pG" firstAttribute="top" secondItem="Axz-Xh-txq" secondAttribute="bottom" constant="5" id="Ex2-Bt-6en"/>
-                    <constraint firstAttribute="trailing" secondItem="CV9-0u-7pG" secondAttribute="trailing" id="ZfQ-zH-glI"/>
-                    <constraint firstItem="CV9-0u-7pG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="eHa-w4-ULf"/>
-                    <constraint firstItem="Axz-Xh-txq" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="oEd-66-yhz"/>
+                    <constraint firstItem="RWk-dO-ESH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="3bt-Wf-hFS"/>
+                    <constraint firstAttribute="trailing" secondItem="65j-rW-XU4" secondAttribute="trailing" id="DtY-X4-Pxo"/>
+                    <constraint firstItem="65j-rW-XU4" firstAttribute="top" secondItem="RWk-dO-ESH" secondAttribute="bottom" constant="5" id="FJy-28-9Q0"/>
+                    <constraint firstAttribute="bottom" secondItem="65j-rW-XU4" secondAttribute="bottom" id="GnV-3M-5yi"/>
+                    <constraint firstItem="RWk-dO-ESH" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="KFF-MH-PSZ"/>
+                    <constraint firstItem="65j-rW-XU4" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Pht-EI-Ot4"/>
+                    <constraint firstAttribute="trailing" secondItem="RWk-dO-ESH" secondAttribute="trailing" constant="15" id="vaI-Ss-Zs8"/>
                 </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" name="app底色"/>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
-            <point key="canvasLocation" x="131.15942028985509" y="121.875"/>
+            <connections>
+                <outlet property="countLbl" destination="b9u-3C-XDx" id="yT9-z9-cgA"/>
+                <outlet property="detialView" destination="uLZ-ZH-Ei8" id="EGh-uQ-tHf"/>
+                <outlet property="nameLbl" destination="C1r-Lj-aue" id="LhE-FE-60d"/>
+                <outlet property="statusLbl" destination="93P-aM-ST1" id="ch8-CG-bZc"/>
+                <outlet property="statusNameLbl" destination="Xmr-eU-LIr" id="xLJ-gj-9Ck"/>
+            </connections>
+            <point key="canvasLocation" x="116.66666666666667" y="175.11160714285714"/>
         </tableViewCell>
     </objects>
     <resources>
@@ -203,9 +189,6 @@
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="按钮渐变色下,字体颜色">
-            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -213,10 +196,13 @@
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色字体颜色">
-            <color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="白色背景色">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/View/Cell/ChangePriceNormalCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ChangePriceNormalCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ChangePriceNormalCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
             <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">

GeliBusinessPlatform/View/Cell/DKXDAdrCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -134,7 +134,7 @@
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/View/Cell/TitleAndLblCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

GeliBusinessPlatform/View/Cell/WenDuCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WenDuCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WenDuCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
             <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">

GeliBusinessPlatform/View/Cell/YunDanLieBiaoCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="YunDanLieBiaoCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="YunDanLieBiaoCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="212"/>
             <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">
@@ -215,7 +215,7 @@
             <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/BtmBtnCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BtmBtnCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BtmBtnCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="108.5"/>
             <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">
@@ -97,7 +97,7 @@
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/修改密码/ChangePassViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChangePassViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChangePassViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="fisrtView" destination="6Yq-Qa-XRQ" id="zKW-xf-qqn"/>
                 <outlet property="newPBtn" destination="006-9S-e0S" id="FuL-Gr-SJo"/>
@@ -50,7 +50,7 @@
                                 <constraint firstAttribute="height" constant="10" id="vZV-bu-e5U"/>
                             </constraints>
                             <state key="normal" image="guanbi"/>
-                            <state key="selected" image="xianshi "/>
+                            <state key="selected" image="xianshi"/>
                             <connections>
                                 <action selector="oldPassAction:" destination="-1" eventType="touchUpInside" id="Mzs-XF-S1i"/>
                             </connections>
@@ -119,7 +119,7 @@
                                 <constraint firstAttribute="width" constant="17" id="y1f-4z-IQI"/>
                             </constraints>
                             <state key="normal" image="guanbi"/>
-                            <state key="selected" image="xianshi "/>
+                            <state key="selected" image="xianshi"/>
                             <connections>
                                 <action selector="newPassAction:" destination="-1" eventType="touchUpInside" id="bfg-kt-Abu"/>
                             </connections>
@@ -207,12 +207,12 @@
     </objects>
     <resources>
         <image name="guanbi" width="37" height="18"/>
-        <image name="xianshi " width="37" height="24"/>
+        <image name="xianshi" width="37" height="24"/>
         <namedColor name="按钮渐变色上">
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="按钮渐变色下,字体颜色">
-            <color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuCell.swift → GeliBusinessPlatform/ViewController/入库/CRKSumCell.swift

 //
-//  ChuRuKuJiLuCell.swift
+//  CRKSumCell.swift
 //  GeliBusinessPlatform
 //
-//  Created by junye lu on 2020/4/26.
+//  Created by junye lu on 2020/5/30.
 //  Copyright © 2020 junye lu. All rights reserved.
 //
 
 import UIKit
 
-class ChuRuKuJiLuCell: UITableViewCell {
-    
+class CRKSumCell: UITableViewCell {
+
+    @IBOutlet weak var countLbl: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none
+        
         // Initialization code
     }
 

GeliBusinessPlatform/ViewController/入库/CRKSumCell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.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" id="KGk-i7-Jjw" customClass="CRKSumCell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+            <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="320" height="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="15g-hc-bWH">
+                        <rect key="frame" x="278" y="14" width="27" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="#F57575"/>
+                        <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="G3w-rZ-aM6">
+                        <rect key="frame" x="185" y="14" width="93" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="标题字颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="15g-hc-bWH" firstAttribute="leading" secondItem="G3w-rZ-aM6" secondAttribute="trailing" id="4va-tQ-Wgj"/>
+                    <constraint firstAttribute="trailing" secondItem="15g-hc-bWH" secondAttribute="trailing" constant="15" id="h13-mK-9qm"/>
+                    <constraint firstItem="15g-hc-bWH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="l43-P3-bIr"/>
+                    <constraint firstItem="G3w-rZ-aM6" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="n02-Ab-vPc"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="countLbl" destination="15g-hc-bWH" id="f2b-W0-6LU"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="129"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <namedColor name="#F57575">
+            <color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift

@@ -7,12 +7,18 @@
 //
 
 import UIKit
-
+protocol PiCiXuanZeCellDelegate {
+    func PiCiXuanZeCellBtnSelect(sender:String,cell:PiCiXuanZeCell)
+}
 class PiCiXuanZeCell: UITableViewCell {
-
+    
+    var delegate:PiCiXuanZeCellDelegate?
  
     @IBAction func btnClickAction(_ sender: UIButton) {
         iconBtn.isSelected = !iconBtn.isSelected
+        if isPurnInt(string: textTF.text!){
+            delegate?.PiCiXuanZeCellBtnSelect(sender: textTF.text!, cell: self)
+        }
     }
     @IBOutlet weak var iconBtn: UIButton!
     @IBOutlet weak var dateLbl: UILabel!

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift

@@ -8,12 +8,17 @@
 
 import UIKit
 
-class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
-  
-
+class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,PiCiXuanZeCellDelegate{
+    
+    
+    
+    var countArr:Array<String> = []
+    var dataArray:Array<Any> = []
     @IBOutlet weak var topView: UIView!
     @IBOutlet weak var btmLbl: UILabel!
+    
     @IBAction func submitAction(_ sender: Any) {
+        
     }
     @IBOutlet weak var listView: UITableView!
     override func viewDidLoad() {
@@ -28,22 +33,47 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
         listView.separatorStyle = .none
         
         listView.register(UINib(nibName: "PiCiXuanZeCell", bundle: nil), forCellReuseIdentifier: "PiCiXuanZeCell")
+        listView.register(UINib(nibName: "CRKSumCell", bundle: nil), forCellReuseIdentifier: "CRKSumCell")
         // Do any additional setup after loading the view.
     }
-
-//MARK: - CELL DELEGATE
+    func PiCiXuanZeCellBtnSelect(sender: String, cell: PiCiXuanZeCell) {
+        countArr.insert(sender, at: cell.tag)
+        countArr.remove(at: cell.tag+1)
+        let idx = IndexPath(row: 0, section: 1)
+        listView.reloadRows(at: [idx], with: .none)
+    }
+    
+    //MARK: - CELL DELEGATE
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 49
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-          return 3
-      }
-      
-      func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-          let cell = tableView.dequeueReusableCell(withIdentifier: "PiCiXuanZeCell") as! PiCiXuanZeCell
-          return cell
-      }
-      
+        if section == 1 {
+            return 1
+        }
+        return dataArray.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 1 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "CRKSumCell") as! CRKSumCell
+            return cell
+        }
+        let cell = tableView.dequeueReusableCell(withIdentifier: "PiCiXuanZeCell") as! PiCiXuanZeCell
+        cell.tag = indexPath.row
+        cell.delegate = self
+        return cell
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 10
+    }
     
-
 }

GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift

+//
+//  CRKListVC.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+import ViewAnimator //cell动效
+
+class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate {
+    var page = 0
+
+   
+    private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
+    
+    @IBOutlet weak var topBtn: UIButton!
+    
+    @IBAction func openViewAction(_ sender: Any) {
+        
+    }
+    
+    @IBOutlet weak var searchBG: UIView!
+    
+    var datas:Array<WarehouseIoListDataModel>? = []
+    
+    @IBOutlet weak var listView: UITableView!
+    @IBOutlet weak var searchBgView: UIView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navbar.title = "出入库记录"
+        self.view.addSubview(navbar)
+        
+        //searchbar
+        let searchBr = SearchBarView.init()
+        self.searchBgView.addSubview(searchBr)
+        searchBr.snp.makeConstraints { (make) in
+            make.left.equalTo(0)
+            make.right.equalTo(topBtn.snp_left)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(35)
+        }
+        searchBG = searchBr
+        searchBr.placeholderStr = "请输入单号"
+        searchBr.cornerRadius = 35/2.0
+        searchBr.delegate = self
+        searchBr.delegateL = self
+        
+        
+        SetTopFrame(view: searchBgView, height: 44)
+        
+        listView.separatorStyle = .none
+        listView.register(UINib(nibName: "CRKCell", bundle: nil), forCellReuseIdentifier: "CRKCell")
+        
+        //下拉刷新相关设置
+           headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
+           self.listView!.mj_header = headerMJ
+           //上拉加载相关设置
+           footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
+           self.listView!.mj_footer = footerMJ
+           self.listView?.mj_header?.beginRefreshing()
+        
+    }
+    @objc func loadData(){
+        page = 1
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any]
+      
+        WarehouseIoList(dic , success: { (data) in
+            self.datas?.removeAll()
+            let model = data as! WarehouseIoListModel
+            model.data?.forEach({ (item) in
+                self.datas?.append(item)
+            })
+            
+            self.listView.reloadData()
+            self.listView.mj_header?.endRefreshing()
+            self.page = 2
+            self.listView.performBatchUpdates({
+                UIView.animate(views: self.listView!.visibleCells,
+                               animations: self.animations, completion: {
+                                
+                })
+            }, completion: nil)
+            if model.data?.count == 0 {
+                self.listView?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.listView?.mj_footer?.endRefreshing()
+            }
+        }) { (error) in
+             self.listView?.mj_header?.endRefreshing()
+        }
+    }
+    
+    //MARK:--加载更多数据
+    @objc func loadMoreData(){
+        print("加载更多数据")
+        print("page = ",page)
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        let dic = ["user_token":UserToken as Any,"status":"0" as Any,"page":page as Any]
+       
+        WarehouseIoList(dic, success: { (data) in
+            let dataM = data as! WarehouseIoListModel
+            if dataM.data?.count == 0 {
+                self.listView?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.page += 1
+                dataM.data?.forEach({ (model) in
+                    self.datas?.append(model)
+                })
+                self.listView.reloadData()
+                self.listView?.mj_footer?.endRefreshing()
+            }
+            
+        }) { (error) in
+            self.listView?.mj_footer?.endRefreshing()
+            
+        }
+        
+    }
+    
+    
+    //MARK: - 通过，不通过方法
+    func CRKCellBtnClick(sender: UIButton, cell: CRKCell) {
+        if sender.tag == 0 {//通过
+            print("1",cell.tag)
+        }else{//不通过
+             print("2",cell.tag)
+        }
+    }
+
+   //MARK: - CELL DELEGATE
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        print(indexPath.row)
+        //跳转详情
+        let model = datas![indexPath.row]
+        
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return datas!.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "CRKCell") as! CRKCell
+//        cell.dataArr = arr[indexPath.row]
+        cell.delegate = self
+        cell.tag = indexPath.row
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+//        let ar = datas![indexPath.row]
+        
+        var num = 0
+//        num = ar.count
+//        if ar.count > 4 {
+//            num = 4
+//        }
+        return 174.5 + CGFloat(num * 49)
+    }
+    //MARK: - searchView delegate
+    func clearSearchAction() {
+         print("取消搜索代理了--")
+    }
+    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
+        print("编辑即将结束了--")
+       
+    }
+}

GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CRKListVC" customModule="TestClass" customModuleProvider="target">
+            <connections>
+                <outlet property="listView" destination="BU7-XP-2pP" id="DMx-fN-6Bz"/>
+                <outlet property="searchBG" destination="LxK-xK-rbt" id="rWi-aQ-iPm"/>
+                <outlet property="searchBgView" destination="av5-5Z-klb" id="As9-zW-xIX"/>
+                <outlet property="topBtn" destination="ilf-N2-kXi" id="IVi-ni-5F9"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="av5-5Z-klb">
+                    <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ilf-N2-kXi">
+                            <rect key="frame" x="374" y="11" width="40" height="22"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="22" id="ORo-4p-fw8"/>
+                                <constraint firstAttribute="width" constant="40" id="bPo-Gp-HQN"/>
+                            </constraints>
+                            <state key="normal" image="shaixuan"/>
+                            <connections>
+                                <action selector="openViewAction:" destination="-1" eventType="touchUpInside" id="HKh-NI-ztm"/>
+                            </connections>
+                        </button>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LxK-xK-rbt">
+                            <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstItem="LxK-xK-rbt" firstAttribute="leading" secondItem="av5-5Z-klb" secondAttribute="leading" id="GpW-SI-hii"/>
+                        <constraint firstItem="LxK-xK-rbt" firstAttribute="top" secondItem="av5-5Z-klb" secondAttribute="top" id="HSt-0S-KSA"/>
+                        <constraint firstItem="ilf-N2-kXi" firstAttribute="leading" secondItem="LxK-xK-rbt" secondAttribute="trailing" id="d32-gk-lFU"/>
+                        <constraint firstAttribute="trailing" secondItem="ilf-N2-kXi" secondAttribute="trailing" id="gGz-tl-fbP"/>
+                        <constraint firstAttribute="bottom" secondItem="LxK-xK-rbt" secondAttribute="bottom" id="hDc-p2-IvT"/>
+                        <constraint firstAttribute="height" constant="44" id="pTS-wJ-mwq"/>
+                        <constraint firstItem="ilf-N2-kXi" firstAttribute="centerY" secondItem="av5-5Z-klb" secondAttribute="centerY" id="ytM-gD-3ic"/>
+                    </constraints>
+                </view>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="BU7-XP-2pP">
+                    <rect key="frame" x="0.0" y="88" width="414" height="774"/>
+                    <color key="backgroundColor" name="app底色"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="0wO-3Z-G1E"/>
+                        <outlet property="delegate" destination="-1" id="B0a-Uo-fWl"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <constraints>
+                <constraint firstItem="BU7-XP-2pP" firstAttribute="top" secondItem="av5-5Z-klb" secondAttribute="bottom" id="1wU-EB-aTe"/>
+                <constraint firstItem="BU7-XP-2pP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="7YS-Hb-OyJ"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="av5-5Z-klb" secondAttribute="trailing" id="A7i-GN-17Z"/>
+                <constraint firstItem="av5-5Z-klb" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="CrV-3n-qwc"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="BU7-XP-2pP" secondAttribute="bottom" id="VVk-uE-m7R"/>
+                <constraint firstItem="av5-5Z-klb" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="XVM-dV-raw"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="BU7-XP-2pP" secondAttribute="trailing" id="nuT-Ha-cUn"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="132" y="129"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="shaixuan" width="17" height="15"/>
+        <namedColor name="app底色">
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/出入库记录/CRKXQVC.swift

+//
+//  CRKXQVC.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/30.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class CRKXQVC: BaseViewController {
+    
+    var model:WarehouseIoListDataModel?
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        if model?.io_type == 1 {
+            navbar.title = "商品入库详情"
+        }else{
+            navbar.title = "商品出库详情"
+        }
+        self.view.addSubview(navbar)
+        
+        
+    }
+
+
+}

GeliBusinessPlatform/ViewController/出入库记录/CRKXQVC.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CRKXQVC" customModule="TestClass" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nlM-gF-F9f">
+                    <rect key="frame" x="0.0" y="813" width="414" height="49"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S9g-Qd-TxR">
+                            <rect key="frame" x="0.0" y="0.0" width="207" height="49"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <state key="normal" title="不通过">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fxi-7K-5uG">
+                            <rect key="frame" x="207" y="0.0" width="207" height="49"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <state key="normal" title="通过">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                        </button>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pEh-pB-SCR">
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="1"/>
+                            <color key="backgroundColor" name="灰色分界线"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="dLA-9h-RHR"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstItem="Fxi-7K-5uG" firstAttribute="width" secondItem="S9g-Qd-TxR" secondAttribute="width" id="DQy-9n-Zv9"/>
+                        <constraint firstItem="S9g-Qd-TxR" firstAttribute="top" secondItem="nlM-gF-F9f" secondAttribute="top" id="GTH-4b-MgP"/>
+                        <constraint firstAttribute="height" constant="49" id="ITf-Au-lz5"/>
+                        <constraint firstAttribute="trailing" secondItem="Fxi-7K-5uG" secondAttribute="trailing" id="LPl-iz-9xD"/>
+                        <constraint firstAttribute="trailing" secondItem="pEh-pB-SCR" secondAttribute="trailing" id="TNP-7W-qdy"/>
+                        <constraint firstItem="S9g-Qd-TxR" firstAttribute="leading" secondItem="nlM-gF-F9f" secondAttribute="leading" id="WMM-RS-uxh"/>
+                        <constraint firstItem="pEh-pB-SCR" firstAttribute="top" secondItem="nlM-gF-F9f" secondAttribute="top" id="Y60-0h-F2c"/>
+                        <constraint firstItem="pEh-pB-SCR" firstAttribute="leading" secondItem="nlM-gF-F9f" secondAttribute="leading" id="f5C-sw-HZi"/>
+                        <constraint firstItem="Fxi-7K-5uG" firstAttribute="leading" secondItem="S9g-Qd-TxR" secondAttribute="trailing" id="j44-hu-J7q"/>
+                        <constraint firstItem="Fxi-7K-5uG" firstAttribute="top" secondItem="nlM-gF-F9f" secondAttribute="top" id="jm7-d9-SXH"/>
+                        <constraint firstAttribute="bottom" secondItem="Fxi-7K-5uG" secondAttribute="bottom" id="vbY-8K-HWp"/>
+                        <constraint firstAttribute="bottom" secondItem="S9g-Qd-TxR" secondAttribute="bottom" id="xkZ-cz-bL6"/>
+                    </constraints>
+                </view>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="MJ8-d0-vWl">
+                    <rect key="frame" x="0.0" y="44" width="414" height="769"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                </tableView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sGM-fP-c5C">
+                    <rect key="frame" x="0.0" y="813" width="414" height="83"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                </view>
+            </subviews>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="sGM-fP-c5C" secondAttribute="trailing" id="GhF-g4-MPW"/>
+                <constraint firstAttribute="bottom" secondItem="sGM-fP-c5C" secondAttribute="bottom" id="IT9-6a-Mvq"/>
+                <constraint firstItem="MJ8-d0-vWl" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="NMU-nl-n70"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="nlM-gF-F9f" secondAttribute="trailing" id="Rzc-Ii-3pH"/>
+                <constraint firstItem="sGM-fP-c5C" firstAttribute="top" secondItem="MJ8-d0-vWl" secondAttribute="bottom" id="aB8-Dh-7Gs"/>
+                <constraint firstItem="nlM-gF-F9f" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="dMo-B8-IqG"/>
+                <constraint firstItem="sGM-fP-c5C" firstAttribute="top" secondItem="nlM-gF-F9f" secondAttribute="top" id="dVe-32-F8A"/>
+                <constraint firstItem="MJ8-d0-vWl" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="lhj-cC-XQn"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="nlM-gF-F9f" secondAttribute="bottom" id="ssT-ie-g3f"/>
+                <constraint firstItem="sGM-fP-c5C" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ueo-YA-TVM"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="MJ8-d0-vWl" secondAttribute="trailing" id="wY6-vG-vDH"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="131.8840579710145" y="128.57142857142856"/>
+        </view>
+    </objects>
+    <resources>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="蓝色字体颜色">
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuXQViewController.swift

-//
-//  ChuRuKuJiLuXQViewController.swift
-//  GeliBusinessPlatform
-//
-//  Created by junye lu on 2020/4/28.
-//  Copyright © 2020 junye lu. All rights reserved.
-//
-
-import UIKit
-
-class ChuRuKuJiLuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
-    
-    
-    
- 
-    @IBAction func btmAction(_ sender: UIButton) {
-        print(sender.titleLabel?.text)
-    }
-    
-    var barTitle:String? = ""
-    let wsh  = "完成"//未审核
-    let wtgReson = ""//未通过原因
-    
-    @IBOutlet weak var bottomH: NSLayoutConstraint!
-    @IBOutlet weak var btmView: UIView!
-    var firstArr = ["0","审核人","申请时间","入库价格","入库总价","入库数量"]
-    
-    let firstArrChu = ["0","审核人","审核时间","申请时间","出库数量"]
-    
-    var lastArr = ["生产日期","有效日期","保质期","检测报告","商品库存","仓库","库位","备注","不通过原因"]
-    //    let lastArrChu = ["生产日期","有效日期","保质期","检测报告","商品库存","仓库","库位","批次","备注","不通过原因"]
-    @IBOutlet weak var listView: UITableView!
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        navbar.title = barTitle
-        self.view.addSubview(navbar)
-        
-        //MARK: - 根据状态显示或者隐藏
-        //        if 通过/未通过 {
-        //            bottomH.constant = 0
-        //            btmView.isHidden = true
-        //        }
-        
-        if wsh == "完成"{
-            firstArr.insert("审核时间", at: 2)
-            firstArr.remove(at: 3)
-        }
-        if (barTitle?.contains("出库"))!{
-            lastArr.insert("批次", at: 7)
-        }
-        
-        listView.separatorStyle = .none
-        listView.snp.makeConstraints { (make) in
-            make.top.equalTo(NavCGRect.height)
-            make.left.right.equalTo(0)
-            make.bottom.equalTo(btmView.snp_top)
-        }
-        listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
-        listView.register(UINib(nibName: "DaiKeXiaDanGouWuCell", bundle: nil), forCellReuseIdentifier: "DaiKeXiaDanGouWuCell")
-        listView.register(UINib(nibName: "TitleAndOnlyBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndOnlyBtnCell")
-        // Do any additional setup after loading the view.
-    }
-    //MARK: - cell delegate
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if indexPath.section == 1 {
-            if indexPath.row == 3 {
-                print("查看")
-            }
-        }
-    }
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.section == 0 {
-            if indexPath.row == 0 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
-                cell.delImg.isHidden = true
-                cell.delBtn.isHidden = true
-                cell.detailLbl2.isHidden = true
-                cell.btmLIneWidth.constant = 0
-                return cell
-            }
-        }
-        let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
-        
-        if indexPath.section == 0 {
-            switch indexPath.row {
-            case 1:
-                cell.contentLbl.text = "审核人"
-                break
-            case 2:
-                cell.contentLbl.text = "审核时间"
-                break
-            case 3:
-                if (barTitle?.contains("出库"))! {
-                    cell.contentLbl.text = "申请时间"
-                }else{
-                    cell.contentLbl.text = "入库价格"
-                }
-                break
-            case 4:
-                if (barTitle?.contains("出库"))! {
-                    cell.contentLbl.text = "出库数量"
-                }else{
-                    cell.contentLbl.text = "入库总价"
-                }
-                break
-            case 5:
-                cell.contentLbl.text = "入库数量"
-                break
-            default:
-                break
-            }
-            if (barTitle?.contains("入库"))!{
-                cell.nameLbl.text = firstArr[indexPath.row]
-            }else{
-                cell.nameLbl.text = firstArrChu[indexPath.row]
-            }
-        }else{
-            switch indexPath.row {
-            case 0:
-                cell.contentLbl.text = "生产日期"
-                break
-            case 1:
-                cell.contentLbl.text = "生产日期"
-                break
-            case 2:
-                cell.contentLbl.text = "保质期"
-                break
-            case 4:
-                cell.contentLbl.text = "商品库存"
-                break
-            case 5:
-                cell.contentLbl.text = "仓库"
-                break
-            case 6:
-                cell.contentLbl.text = "库位"
-                break
-            case 7:
-                if (barTitle?.contains("出库"))! {
-                    cell.contentLbl.text = "批次"
-                }else{
-                    cell.contentLbl.text = "备注"
-                }
-                break
-            case 8:
-                if (barTitle?.contains("出库"))! {
-                    cell.contentLbl.text = "备注"
-                }else{
-                    cell.contentLbl.text = "不通过原因"
-                }
-                break
-            case 9:
-                cell.contentLbl.text = "不通过原因"
-                break
-            default:
-                break
-            }
-            if indexPath.row == 3 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndOnlyBtnCell")
-                    as! TitleAndOnlyBtnCell
-                cell.button.setTitle("查看", for: .normal)
-                cell.button.isUserInteractionEnabled = false
-                cell.titleLbl.text = lastArr[indexPath.row]
-                return cell
-            }
-            
-            cell.nameLbl.text = lastArr[indexPath.row]
-            
-        }
-        return cell
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        //MARK: - 没有未通过原因
-        if wtgReson.count == 0 {//没有未通过原因
-            if indexPath.section == 1{
-                if indexPath.row == lastArr.count-1 {
-                    return 0.001
-                }
-            }
-        }
-        //***************************
-        if indexPath.section == 0 {
-            if indexPath.row == 0 {
-                return 120
-            }
-            if (barTitle?.contains("入库"))!{//入库未审核
-                if wsh == "未审核" {
-                    if indexPath.row == 1 || indexPath.row == 2{
-                        return 0.001
-                    }
-                }
-                if wsh  == "已审核"{
-                    if indexPath.row == 1  {
-                        return 0.001
-                    }
-                }
-            }else{//出库未审核
-                if wsh  == "未审核"{
-                    if indexPath.row == 1  || indexPath.row == 2 || indexPath.row == 3{
-                        return 0.001
-                    }
-                }
-                if wsh  == "已审核"{
-                    if indexPath.row == 1  || indexPath.row == 2{
-                        return 0.001
-                    }
-                }
-            }
-            return 49
-        }
-        return 49
-    }
-    //MARK: - footer
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
-        return view
-    }
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 10
-    }
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 2
-    }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        if section == 0 {
-            if (barTitle?.contains("入库"))!{
-                return firstArr.count
-            }else{
-                return firstArrChu.count
-            }
-        }
-        return lastArr.count
-    }
-    func TitleAndOnlyBtnCellEditBtnClick(cell: TitleAndOnlyBtnCell) {
-        
-    }
-}

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuXQViewController.xib

-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
-        <capability name="Named colors" minToolsVersion="9.0"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChuRuKuJiLuXQViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
-            <connections>
-                <outlet property="bottomH" destination="XYf-tB-H0h" id="pwu-fg-yBF"/>
-                <outlet property="btmView" destination="4oh-GD-AgV" id="JqF-7U-i8c"/>
-                <outlet property="listView" destination="6n5-Zr-Oki" id="jts-69-guJ"/>
-                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="6n5-Zr-Oki">
-                    <rect key="frame" x="0.0" y="44" width="414" height="768"/>
-                    <color key="backgroundColor" name="app底色"/>
-                    <connections>
-                        <outlet property="dataSource" destination="-1" id="bUI-N1-4qA"/>
-                        <outlet property="delegate" destination="-1" id="eWU-ea-os2"/>
-                    </connections>
-                </tableView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aHo-KE-Nmo">
-                    <rect key="frame" x="0.0" y="812" width="414" height="1"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="MGt-O1-6uK"/>
-                    </constraints>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4oh-GD-AgV">
-                    <rect key="frame" x="0.0" y="812" width="414" height="84"/>
-                    <subviews>
-                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YNi-0A-SMC">
-                            <rect key="frame" x="0.0" y="0.0" width="207" height="84"/>
-                            <color key="backgroundColor" name="白色背景色"/>
-                            <state key="normal" title="不通过">
-                                <color key="titleColor" name="白色背景色"/>
-                            </state>
-                            <connections>
-                                <action selector="btmAction:" destination="-1" eventType="touchUpInside" id="u7b-Y4-9RN"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S9j-Jx-rWY">
-                            <rect key="frame" x="207" y="0.0" width="207" height="84"/>
-                            <color key="backgroundColor" name="白色背景色"/>
-                            <state key="normal" title="通过">
-                                <color key="titleColor" name="白色背景色"/>
-                            </state>
-                            <connections>
-                                <action selector="btmAction:" destination="-1" eventType="touchUpInside" id="ITK-p8-DfZ"/>
-                            </connections>
-                        </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B8a-Zb-9Wa">
-                            <rect key="frame" x="0.0" y="0.0" width="207" height="49"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="49" id="sM5-J7-RrG"/>
-                            </constraints>
-                            <attributedString key="attributedText">
-                                <fragment content="不通过">
-                                    <attributes>
-                                        <color key="NSColor" name="蓝色字体颜色"/>
-                                        <font key="NSFont" size="13" name="PingFangSC-Medium"/>
-                                        <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
-                                    </attributes>
-                                </fragment>
-                            </attributedString>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lq2-sN-d0U">
-                            <rect key="frame" x="207" y="0.0" width="207" height="49"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="49" id="Qvd-a9-3K1"/>
-                            </constraints>
-                            <attributedString key="attributedText">
-                                <fragment content="通过">
-                                    <attributes>
-                                        <color key="NSColor" name="蓝色字体颜色"/>
-                                        <font key="NSFont" size="13" name="PingFangSC-Medium"/>
-                                        <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
-                                    </attributes>
-                                </fragment>
-                            </attributedString>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                    <constraints>
-                        <constraint firstItem="lq2-sN-d0U" firstAttribute="trailing" secondItem="S9j-Jx-rWY" secondAttribute="trailing" id="6RY-EK-rCY"/>
-                        <constraint firstItem="YNi-0A-SMC" firstAttribute="leading" secondItem="4oh-GD-AgV" secondAttribute="leading" id="BwU-Ew-Dsx"/>
-                        <constraint firstItem="S9j-Jx-rWY" firstAttribute="leading" secondItem="YNi-0A-SMC" secondAttribute="trailing" id="Esf-WR-RqV"/>
-                        <constraint firstAttribute="bottom" secondItem="S9j-Jx-rWY" secondAttribute="bottom" id="Fw8-Yd-I3S"/>
-                        <constraint firstItem="B8a-Zb-9Wa" firstAttribute="trailing" secondItem="YNi-0A-SMC" secondAttribute="trailing" id="JWS-m0-vlp"/>
-                        <constraint firstItem="S9j-Jx-rWY" firstAttribute="height" secondItem="YNi-0A-SMC" secondAttribute="height" id="QIg-i2-YpX"/>
-                        <constraint firstAttribute="trailing" secondItem="S9j-Jx-rWY" secondAttribute="trailing" id="Tb8-5h-uyY"/>
-                        <constraint firstItem="YNi-0A-SMC" firstAttribute="top" secondItem="4oh-GD-AgV" secondAttribute="top" id="U1q-Bd-fKA"/>
-                        <constraint firstItem="S9j-Jx-rWY" firstAttribute="width" secondItem="YNi-0A-SMC" secondAttribute="width" id="UGH-Dm-g6Z"/>
-                        <constraint firstItem="lq2-sN-d0U" firstAttribute="leading" secondItem="S9j-Jx-rWY" secondAttribute="leading" id="ZGh-3z-lRl"/>
-                        <constraint firstItem="S9j-Jx-rWY" firstAttribute="top" secondItem="4oh-GD-AgV" secondAttribute="top" id="Ztq-y7-xV1"/>
-                        <constraint firstAttribute="bottom" secondItem="YNi-0A-SMC" secondAttribute="bottom" id="bZe-r5-UbT"/>
-                        <constraint firstItem="lq2-sN-d0U" firstAttribute="top" secondItem="S9j-Jx-rWY" secondAttribute="top" id="fFW-qm-Rqx"/>
-                        <constraint firstItem="B8a-Zb-9Wa" firstAttribute="top" secondItem="YNi-0A-SMC" secondAttribute="top" id="k1J-19-MoF"/>
-                        <constraint firstItem="B8a-Zb-9Wa" firstAttribute="leading" secondItem="YNi-0A-SMC" secondAttribute="leading" id="pD0-Wv-c6a"/>
-                    </constraints>
-                </view>
-            </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstItem="aHo-KE-Nmo" firstAttribute="top" secondItem="6n5-Zr-Oki" secondAttribute="bottom" id="0dd-K2-Igk"/>
-                <constraint firstItem="aHo-KE-Nmo" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="7Nw-RR-Ytb"/>
-                <constraint firstAttribute="bottom" secondItem="4oh-GD-AgV" secondAttribute="bottom" id="92h-4l-rx4"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="4oh-GD-AgV" secondAttribute="trailing" id="BH4-iJ-m5s"/>
-                <constraint firstItem="4oh-GD-AgV" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="EYF-61-QMy"/>
-                <constraint firstItem="6n5-Zr-Oki" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="KS2-7c-WeW"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="aHo-KE-Nmo" secondAttribute="bottom" constant="49" id="XYf-tB-H0h"/>
-                <constraint firstItem="4oh-GD-AgV" firstAttribute="top" secondItem="aHo-KE-Nmo" secondAttribute="top" id="YZi-Vo-CuT"/>
-                <constraint firstItem="6n5-Zr-Oki" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="gqv-cs-MlA"/>
-                <constraint firstItem="6n5-Zr-Oki" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="wTM-a2-JLI"/>
-                <constraint firstItem="aHo-KE-Nmo" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="xBR-6n-I9Q"/>
-            </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="131.8840579710145" y="121.875"/>
-        </view>
-    </objects>
-    <resources>
-        <namedColor name="app底色">
-            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="白色背景色">
-            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-    </resources>
-</document>

GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.xib

@@ -51,7 +51,7 @@
                                                 <constraint firstAttribute="height" constant="1" id="1X3-y7-EtA"/>
                                             </constraints>
                                         </view>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="xianshi " translatesAutoresizingMaskIntoConstraints="NO" id="7hF-Wd-wdk" userLabel="shopICON">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="xianshi" translatesAutoresizingMaskIntoConstraints="NO" id="7hF-Wd-wdk" userLabel="shopICON">
                                             <rect key="frame" x="15" y="19" width="65" height="62"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="65" id="q5g-vG-u3t">
@@ -980,7 +980,7 @@
     <resources>
         <image name="idCard1" width="14" height="26"/>
         <image name="idCard2" width="14" height="26"/>
-        <image name="xianshi " width="37" height="24"/>
+        <image name="xianshi" width="37" height="24"/>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/登录/LoginViewController.swift

@@ -15,17 +15,33 @@ protocol loginDelegate {
     func successLogin()
 }
 class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDelegate {
-    
+    @IBOutlet weak var phoneLoginBG: UIView!
+    @IBOutlet weak var passLoginBg: UIView!
     var delegate :loginDelegate?
+    @IBOutlet weak var bannerImg: UIImageView!
+    @IBOutlet weak var topImg: UIImageView!
     //MARK: - 输入账号、密码、验证码
+    
     @IBOutlet weak var loginBtn: LGButton!
-    @IBOutlet weak var codeView: UIView!
+    @IBOutlet weak var forgetPassBtn: UIButton!
+    
+    
     @IBOutlet weak var phoneTF: UITextField!
     @IBOutlet weak var passTF: UITextField!
+    @IBOutlet weak var codeView: UIView!
     @IBOutlet weak var codeTF: UITextField!
-    @IBOutlet weak var bannerImg: UIImageView!
-    @IBOutlet weak var topImg: UIImageView!
-    @IBOutlet weak var shBtn: UIButton!
+    
+    
+    @IBOutlet weak var rightBtn: UIButton!
+    @IBOutlet weak var leftBtn: UIButton!
+    @IBOutlet weak var selectLineView: UIView!
+    
+    @IBOutlet weak var btnLayoutConstraint: NSLayoutConstraint!
+    @IBOutlet weak var shImg: UIImageView!
+    //MARK: - 验证码登录
+    @IBOutlet weak var phoneLogInputTF: UITextField!
+    @IBOutlet weak var phoneLogCodeTF: UITextField!
+    @IBOutlet weak var lineView: UIView!
     var codeNum: String = ""
     //MARK: - viewWillAppear
     override func viewWillAppear(_ animated: Bool) {
@@ -34,11 +50,40 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
         
     }
     
+    @IBAction func selectLoginAction(_ sender: UIButton) {
+        if sender.tag == 0 {//验证码登录
+            leftBtn.isSelected = true
+            rightBtn.isSelected = false
+            selectLineView.snp.updateConstraints { (make) in
+                make.left.equalTo(0)
+                make.bottom.equalTo(lineView.snp_bottom)
+                make.width.equalTo(fullScreenWidth*0.5)
+                make.height.equalTo(3)
+            }
+            phoneLoginBG.isHidden = false
+            passLoginBg.isHidden = true
+            forgetPassBtn.isHidden = true
+            btnLayoutConstraint.constant = 8
+        }else{//密码登录
+            leftBtn.isSelected = false
+            rightBtn.isSelected = true
+            selectLineView.snp.updateConstraints { (make) in
+                make.left.equalTo(fullScreenWidth*0.5)
+                make.bottom.equalTo(lineView.snp_bottom)
+                make.width.equalTo(fullScreenWidth*0.5)
+                make.height.equalTo(3)
+            }
+            phoneLoginBG.isHidden = true
+            passLoginBg.isHidden = false
+            forgetPassBtn.isHidden = false
+            btnLayoutConstraint.constant = 54.5
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         
         passTF.isSecureTextEntry = true
-        shBtn.isSelected = false
+        
         
         bannerImg.snp.makeConstraints { (make) in
             make.top.left.right.equalTo(0)
@@ -53,6 +98,7 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
         codeV.delegate = self
         codeView.addSubview(codeV);
         codeV.changeCaptcha()
+        leftBtn.isSelected = true
         
         passTF.keyboardType = .default
         codeTF.keyboardType = .default
@@ -65,9 +111,12 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
         phoneTF.autocapitalizationType = .none
         
         passTF.isSecureTextEntry = true
-        shBtn.isSelected = false
+        
+    }
+    //MARK: - 手机登录，获取验证码方法
+    @IBAction func getLoginCodeAction(_ sender: Any) {
+        print("get phone login Code")
     }
-    
     //MARK: -跳转忘记密码,登录
     @IBAction func forgetPasswordAction(_ sender: Any) {
         let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -78,14 +127,15 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
     }
     func sureGeliAlertViewAction(sender: UIButton) {
         UIApplication.shared.openURL(NSURL.init(string: "tel://020-81338860")! as URL)
-        
     }
     
     @IBAction func shPassAction(_ sender: UIButton) {
-        shBtn.isSelected = !shBtn.isSelected
-        if shBtn.isSelected {
+        sender.isSelected = !sender.isSelected
+        if sender.isSelected {
             passTF.isSecureTextEntry = false
+            shImg.image = UIImage(named: "xianshi")
         }else{
+            shImg.image = UIImage(named: "guanbi")
             passTF.isSecureTextEntry = true
         }
     }
@@ -93,40 +143,51 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
         codeNum = num
     }
     @IBAction func loginAction(_ sender: Any) {
-        //MARK:--登录接口样式
-        print("\(codeNum) == \(codeTF.text)")
-        //    zxpf
-        //    123456
-        if phoneTF.text?.count == 0 {
-            HUD.flash(.label("请填写用户名"), delay: 1.2)
-            return
-        }
-        if passTF.text?.count == 0 {
-            HUD.flash(.label("请填写密码"), delay: 1.2)
-            return
-        }
-        if codeTF.text?.count == 0 {
-            HUD.flash(.label("请填写验证码"), delay: 1.2)
-            return
-        }
-        if codeNum == codeTF.text {
-            //登录中状态
-            loginBtn.isLoading = true
-            login(["user_name":phoneTF.text as Any,"pwd":passTF.text as Any], success: { (data) in
-                let dataM = data as! LoginModel
-                UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
-                UserDefaults.standard.synchronize()
-                self.loginBtn.isLoading = false
-                self.delegate?.successLogin()
-                
-//                JPUSHService.setAlias(self.phoneTF.text, completion: { (resCode, alias, num) in
-//                    
-//                }, seq: 1433223)
-            }) { (error) in
-                self.loginBtn.isLoading = false
+        
+        if rightBtn.isSelected {//MARK:- 密码登录
+            
+            //MARK:--登录接口样式
+            print("\(codeNum) == \(codeTF.text)")
+            //    zxpf
+            //    123456
+            if phoneTF.text?.count == 0 {
+                HUD.flash(.label("请填写用户名"), delay: 1.2)
+                return
+            }
+            if passTF.text?.count == 0 {
+                HUD.flash(.label("请填写密码"), delay: 1.2)
+                return
+            }
+            if codeTF.text?.count == 0 {
+                HUD.flash(.label("请填写验证码"), delay: 1.2)
+                return
+            }
+            if codeNum == codeTF.text {
+                //登录中状态
+                loginBtn.isLoading = true
+                login(["user_name":phoneTF.text as Any,"pwd":passTF.text as Any], success: { (data) in
+                    let dataM = data as! LoginModel
+                    UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
+                    UserDefaults.standard.synchronize()
+                    self.loginBtn.isLoading = false
+                    self.delegate?.successLogin()
+                    
+                    //                JPUSHService.setAlias(self.phoneTF.text, completion: { (resCode, alias, num) in
+                    //
+                    //                }, seq: 1433223)
+                }) { (error) in
+                    self.loginBtn.isLoading = false
+                }
+            }else{
+                HUD.flash(.label("请填写正确的验证码"), delay: 1.2)
             }
         }else{
-            HUD.flash(.label("请填写正确的验证码"), delay: 1.2)
+            //MARK:- 手机验证码登录
+            
+            
+            
+            
+            
         }
         
     }

GeliBusinessPlatform/ViewController/登录/LoginViewController.xib

@@ -11,12 +11,22 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LoginViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="bannerImg" destination="AdE-4p-9iF" id="Eub-F8-pfv"/>
-                <outlet property="codeTF" destination="qfV-go-Nf1" id="dsy-cS-dte"/>
-                <outlet property="codeView" destination="dgy-iq-Edz" id="6HM-ez-mXt"/>
+                <outlet property="btnLayoutConstraint" destination="yO3-cZ-tUg" id="9ho-ca-7mS"/>
+                <outlet property="codeTF" destination="Mez-3V-TcH" id="DQR-fj-O94"/>
+                <outlet property="codeView" destination="Tfm-yd-zJn" id="A2A-Ad-YbM"/>
+                <outlet property="forgetPassBtn" destination="MQe-6S-qXS" id="W7V-8c-FPb"/>
+                <outlet property="leftBtn" destination="Nig-Dz-4dg" id="LAa-aH-S9q"/>
+                <outlet property="lineView" destination="8TK-uX-oiI" id="ddU-dR-Uap"/>
                 <outlet property="loginBtn" destination="I08-S6-beg" id="bDZ-w8-CrS"/>
-                <outlet property="passTF" destination="ipW-Al-eG6" id="P2q-AH-6SO"/>
-                <outlet property="phoneTF" destination="xEL-ml-rz8" id="wzo-Rz-RWS"/>
-                <outlet property="shBtn" destination="xgv-CB-GLZ" id="3XV-lQ-3ja"/>
+                <outlet property="passLoginBg" destination="iYx-nR-RL7" id="EoY-gn-H5i"/>
+                <outlet property="passTF" destination="hBD-M4-Ne6" id="Ej7-K3-hF0"/>
+                <outlet property="phoneLogCodeTF" destination="AYx-AF-7cc" id="Zyy-sv-lbI"/>
+                <outlet property="phoneLogInputTF" destination="lQM-jb-VSM" id="HZz-Gp-xzs"/>
+                <outlet property="phoneLoginBG" destination="Wdn-1F-VeB" id="AkQ-Hp-pVQ"/>
+                <outlet property="phoneTF" destination="RTz-Vt-gg4" id="3Yv-L7-Zy8"/>
+                <outlet property="rightBtn" destination="LJI-iY-pgq" id="Mz1-gn-S4U"/>
+                <outlet property="selectLineView" destination="0Ja-vk-vOz" id="Uc9-fQ-l7X"/>
+                <outlet property="shImg" destination="e9X-bV-2Ij" id="YAk-Iq-ShN"/>
                 <outlet property="topImg" destination="5Z0-Os-dI3" id="FoU-Ay-ylS"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
@@ -29,7 +39,7 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="banner" translatesAutoresizingMaskIntoConstraints="NO" id="AdE-4p-9iF">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="234"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="234" id="tCW-CX-6JG">
+                        <constraint firstAttribute="height" constant="234" id="BiZ-4n-7jA">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
                             </userDefinedRuntimeAttributes>
@@ -39,40 +49,170 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sekuai" translatesAutoresizingMaskIntoConstraints="NO" id="5Z0-Os-dI3">
                     <rect key="frame" x="0.0" y="-60" width="375" height="60"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="60" id="obx-Tw-2U9"/>
+                        <constraint firstAttribute="height" constant="60" id="meM-dW-Jb2"/>
                     </constraints>
                 </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X0U-me-oUu">
-                    <rect key="frame" x="0.0" y="234" width="375" height="56.5"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I08-S6-beg" customClass="LGButton" customModule="LGButton">
+                    <rect key="frame" x="42.5" y="465.5" width="290" height="44"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="06u-Eb-SGy"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
+                            <color key="value" name="按钮渐变色上"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
+                            <color key="value" name="按钮渐变色下"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="string" keyPath="titleString" value="登录"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="5"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
+                            <real key="value" value="17"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFang SC Medium"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="loadingString" value="登录中"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="loadingFontSize">
+                            <real key="value" value="17"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="loginAction:" destination="-1" eventType="touchUpInside" id="jlC-gq-qwQ"/>
+                    </connections>
+                </view>
+                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MQe-6S-qXS">
+                    <rect key="frame" x="0.0" y="534.5" width="375" height="25"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="25" id="tSC-jj-QcR"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                    <state key="normal" title="忘记密码？"/>
+                    <connections>
+                        <action selector="forgetPasswordAction:" destination="-1" eventType="touchUpInside" id="aEs-Yr-lkP"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D5t-7a-0cK">
+                    <rect key="frame" x="0.0" y="234" width="375" height="37"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nig-Dz-4dg">
+                            <rect key="frame" x="0.0" y="0.0" width="187.5" height="37"/>
+                            <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <state key="normal" title="验证码登录">
+                                <color key="titleColor" name="标题字颜色"/>
+                            </state>
+                            <state key="selected" title="验证码登录">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                            <connections>
+                                <action selector="selectLoginAction:" destination="-1" eventType="touchUpInside" id="TxO-fp-RcY"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LJI-iY-pgq">
+                            <rect key="frame" x="187.5" y="0.0" width="187.5" height="37"/>
+                            <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <state key="normal" title="密码登录">
+                                <color key="titleColor" name="标题字颜色"/>
+                            </state>
+                            <state key="selected" title="密码登录">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                            <connections>
+                                <action selector="selectLoginAction:" destination="-1" eventType="touchUpInside" id="hSx-Ta-DY2"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="Nig-Dz-4dg" secondAttribute="bottom" id="00W-zQ-8ew"/>
+                        <constraint firstItem="Nig-Dz-4dg" firstAttribute="leading" secondItem="D5t-7a-0cK" secondAttribute="leading" id="Fj5-J6-GBu"/>
+                        <constraint firstItem="LJI-iY-pgq" firstAttribute="top" secondItem="D5t-7a-0cK" secondAttribute="top" id="JbA-sO-vOH"/>
+                        <constraint firstItem="Nig-Dz-4dg" firstAttribute="top" secondItem="D5t-7a-0cK" secondAttribute="top" id="PyG-Eo-ZSz"/>
+                        <constraint firstAttribute="bottom" secondItem="LJI-iY-pgq" secondAttribute="bottom" id="Sdi-nt-a7j"/>
+                        <constraint firstItem="LJI-iY-pgq" firstAttribute="width" secondItem="Nig-Dz-4dg" secondAttribute="width" id="TVS-Gs-iAX"/>
+                        <constraint firstAttribute="trailing" secondItem="LJI-iY-pgq" secondAttribute="trailing" id="eTG-C7-xg1"/>
+                        <constraint firstAttribute="height" constant="37" id="l3x-Jj-SpB"/>
+                        <constraint firstItem="LJI-iY-pgq" firstAttribute="leading" secondItem="Nig-Dz-4dg" secondAttribute="trailing" id="yVv-eA-pUb"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8TK-uX-oiI">
+                    <rect key="frame" x="0.0" y="271" width="375" height="2"/>
+                    <color key="backgroundColor" name="灰色分界线"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="2" id="QwU-VS-S73"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wdn-1F-VeB">
+                    <rect key="frame" x="0.0" y="273" width="375" height="141"/>
                     <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Md-od-XM2">
-                            <rect key="frame" x="42.5" y="55.5" width="290" height="1"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wm2-cS-LIu">
+                            <rect key="frame" x="42.5" y="140" width="290" height="1"/>
                             <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="1" id="tFe-1w-tMo"/>
+                                <constraint firstAttribute="height" constant="1" id="Dbr-TW-aNx"/>
                             </constraints>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hp1-jH-R5E">
-                            <rect key="frame" x="52.5" y="0.0" width="40" height="56.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wpe-bO-6yD">
+                            <rect key="frame" x="52.5" y="112" width="40" height="16"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cE8-lb-UOE">
+                            <rect key="frame" x="107.5" y="109" width="1" height="22"/>
+                            <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="40" id="93O-K8-kOL"/>
+                                <constraint firstAttribute="height" constant="22" id="02Y-Ap-hRt"/>
+                                <constraint firstAttribute="width" constant="1" id="7Nu-te-zs2"/>
                             </constraints>
+                        </view>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入短信验证码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="AYx-AF-7cc">
+                            <rect key="frame" x="123.5" y="110.5" width="209" height="19"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Hc-Y9-jjS">
+                            <rect key="frame" x="42.5" y="78" width="290" height="1"/>
+                            <color key="backgroundColor" name="分界线颜色"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="Je0-zX-JWS"/>
+                            </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ROu-IB-PTL">
+                            <rect key="frame" x="52.5" y="50" width="40" height="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" name="标题字颜色"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lvr-md-YWQ">
-                            <rect key="frame" x="107.5" y="17.5" width="1" height="22"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="elY-09-Rcb">
+                            <rect key="frame" x="107.5" y="47" width="1" height="22"/>
                             <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="22" id="5kq-dE-yTB"/>
-                                <constraint firstAttribute="width" constant="1" id="U0P-VY-p7C"/>
+                                <constraint firstAttribute="width" constant="1" id="ZM4-Tu-2Di"/>
+                                <constraint firstAttribute="height" constant="22" id="uOW-Yg-DZs"/>
                             </constraints>
                         </view>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的用户名" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="xEL-ml-rz8">
-                            <rect key="frame" x="123.5" y="11.5" width="209" height="34"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dAd-O1-Cr9">
+                            <rect key="frame" x="252.5" y="48" width="80" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="E0l-iP-T0j"/>
+                                <constraint firstAttribute="width" constant="80" id="H0j-Bi-lWg"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <state key="normal" title="获取验证码">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                            <connections>
+                                <action selector="getLoginCodeAction:" destination="-1" eventType="touchUpInside" id="QFf-Hw-aQZ"/>
+                            </connections>
+                        </button>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的手机号" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="lQM-jb-VSM">
+                            <rect key="frame" x="123.5" y="41" width="124" height="34"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="34" id="w0K-cg-k4c"/>
+                                <constraint firstAttribute="height" constant="34" id="J0e-fs-aSf"/>
                             </constraints>
                             <color key="textColor" name="标题字颜色"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -81,136 +221,150 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <constraints>
-                        <constraint firstItem="3Md-od-XM2" firstAttribute="leading" secondItem="X0U-me-oUu" secondAttribute="leading" constant="42.5" id="39T-8c-oDl"/>
-                        <constraint firstAttribute="bottom" secondItem="hp1-jH-R5E" secondAttribute="bottom" id="87w-bU-Hdq"/>
-                        <constraint firstItem="lvr-md-YWQ" firstAttribute="leading" secondItem="hp1-jH-R5E" secondAttribute="trailing" constant="15" id="LXg-Ua-VQU"/>
-                        <constraint firstItem="xEL-ml-rz8" firstAttribute="centerY" secondItem="hp1-jH-R5E" secondAttribute="centerY" id="O4G-dx-xB4"/>
-                        <constraint firstItem="lvr-md-YWQ" firstAttribute="centerY" secondItem="hp1-jH-R5E" secondAttribute="centerY" id="OY4-sJ-JZ2"/>
-                        <constraint firstItem="hp1-jH-R5E" firstAttribute="top" secondItem="X0U-me-oUu" secondAttribute="top" id="Y1k-Ev-xhn"/>
-                        <constraint firstItem="hp1-jH-R5E" firstAttribute="leading" secondItem="X0U-me-oUu" secondAttribute="leading" constant="52.5" id="d06-q7-qi4"/>
-                        <constraint firstAttribute="bottom" secondItem="3Md-od-XM2" secondAttribute="bottom" id="gBW-qk-If8"/>
-                        <constraint firstAttribute="trailing" secondItem="3Md-od-XM2" secondAttribute="trailing" constant="42.5" id="iR6-Ap-qCC"/>
-                        <constraint firstAttribute="trailing" secondItem="xEL-ml-rz8" secondAttribute="trailing" constant="42.5" id="kdt-yT-I1M"/>
-                        <constraint firstItem="xEL-ml-rz8" firstAttribute="leading" secondItem="lvr-md-YWQ" secondAttribute="trailing" constant="15" id="mFL-oM-Xja"/>
-                        <constraint firstAttribute="height" constant="56.5" id="ncR-WR-Vbo"/>
+                        <constraint firstItem="elY-09-Rcb" firstAttribute="centerY" secondItem="ROu-IB-PTL" secondAttribute="centerY" id="6LG-Ou-zGI"/>
+                        <constraint firstItem="6Hc-Y9-jjS" firstAttribute="leading" secondItem="Wdn-1F-VeB" secondAttribute="leading" constant="42.5" id="86b-KP-4Q6"/>
+                        <constraint firstAttribute="height" constant="141" id="9KV-PF-Skj"/>
+                        <constraint firstItem="6Hc-Y9-jjS" firstAttribute="top" secondItem="dAd-O1-Cr9" secondAttribute="bottom" id="Bzz-8o-C6d"/>
+                        <constraint firstItem="dAd-O1-Cr9" firstAttribute="leading" secondItem="lQM-jb-VSM" secondAttribute="trailing" constant="5" id="ORc-Xj-2Bt"/>
+                        <constraint firstItem="dAd-O1-Cr9" firstAttribute="trailing" secondItem="6Hc-Y9-jjS" secondAttribute="trailing" id="Ocr-bg-9Rf"/>
+                        <constraint firstAttribute="bottom" secondItem="wm2-cS-LIu" secondAttribute="bottom" id="QCl-Ok-UM4"/>
+                        <constraint firstItem="elY-09-Rcb" firstAttribute="leading" secondItem="ROu-IB-PTL" secondAttribute="trailing" constant="15" id="QhR-f3-sYz"/>
+                        <constraint firstItem="cE8-lb-UOE" firstAttribute="leading" secondItem="Wpe-bO-6yD" secondAttribute="trailing" constant="15" id="RR4-h0-TuE"/>
+                        <constraint firstItem="AYx-AF-7cc" firstAttribute="centerY" secondItem="cE8-lb-UOE" secondAttribute="centerY" id="TiM-JO-toA"/>
+                        <constraint firstItem="wm2-cS-LIu" firstAttribute="top" secondItem="Wpe-bO-6yD" secondAttribute="bottom" constant="12" id="VOY-9W-Wxe"/>
+                        <constraint firstItem="ROu-IB-PTL" firstAttribute="leading" secondItem="6Hc-Y9-jjS" secondAttribute="leading" constant="10" id="WOP-eL-qIc"/>
+                        <constraint firstItem="lQM-jb-VSM" firstAttribute="leading" secondItem="elY-09-Rcb" secondAttribute="trailing" constant="15" id="XL2-ze-Ftt"/>
+                        <constraint firstItem="AYx-AF-7cc" firstAttribute="leading" secondItem="cE8-lb-UOE" secondAttribute="trailing" constant="15" id="YjW-ND-IJd"/>
+                        <constraint firstItem="Wpe-bO-6yD" firstAttribute="leading" secondItem="wm2-cS-LIu" secondAttribute="leading" constant="10" id="Zlx-Ee-dPa"/>
+                        <constraint firstAttribute="trailing" secondItem="AYx-AF-7cc" secondAttribute="trailing" constant="42.5" id="bEQ-Ed-HOq"/>
+                        <constraint firstItem="wm2-cS-LIu" firstAttribute="leading" secondItem="Wdn-1F-VeB" secondAttribute="leading" constant="42.5" id="bYr-IQ-9aj"/>
+                        <constraint firstItem="cE8-lb-UOE" firstAttribute="centerY" secondItem="Wpe-bO-6yD" secondAttribute="centerY" id="cQC-Pj-ODh"/>
+                        <constraint firstItem="lQM-jb-VSM" firstAttribute="centerY" secondItem="ROu-IB-PTL" secondAttribute="centerY" id="cfr-ci-0dr"/>
+                        <constraint firstItem="6Hc-Y9-jjS" firstAttribute="top" secondItem="ROu-IB-PTL" secondAttribute="bottom" constant="12" id="lm1-7W-9gA"/>
+                        <constraint firstItem="6Hc-Y9-jjS" firstAttribute="top" secondItem="cE8-lb-UOE" secondAttribute="top" constant="-31" id="qOk-m5-B0M"/>
+                        <constraint firstAttribute="trailing" secondItem="wm2-cS-LIu" secondAttribute="trailing" constant="42.5" id="w0E-g0-bo9"/>
+                        <constraint firstAttribute="trailing" secondItem="6Hc-Y9-jjS" secondAttribute="trailing" constant="42.5" id="zdl-PM-MSG"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OaN-ws-ype">
-                    <rect key="frame" x="0.0" y="297.5" width="375" height="56.5"/>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iYx-nR-RL7">
+                    <rect key="frame" x="0.0" y="273" width="375" height="184.5"/>
                     <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mlw-Ng-8f9">
-                            <rect key="frame" x="42.5" y="55.5" width="290" height="1"/>
-                            <color key="backgroundColor" name="分界线颜色"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tfm-yd-zJn">
+                            <rect key="frame" x="247.5" y="140.5" width="90" height="44"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="1" id="0ps-Ra-rOi"/>
+                                <constraint firstAttribute="width" constant="90" id="NzI-Io-fd1"/>
+                                <constraint firstAttribute="height" constant="44" id="bBq-qG-7aY"/>
                             </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="3"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" name="分界线颜色"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密   码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAO-bO-280">
-                            <rect key="frame" x="52.5" y="0.0" width="40" height="55.5"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hIq-Mc-4Wl">
+                            <rect key="frame" x="42.5" y="183.5" width="190" height="1"/>
+                            <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="40" id="hGs-rr-3X9"/>
+                                <constraint firstAttribute="height" constant="1" id="Gv0-lh-1yl"/>
                             </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xgr-aD-uh9">
+                            <rect key="frame" x="52.5" y="155.5" width="40" height="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <nil key="textColor"/>
+                            <color key="textColor" name="标题字颜色"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZCK-xJ-hVg">
-                            <rect key="frame" x="107.5" y="17" width="1" height="22"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="efe-KM-u3D">
+                            <rect key="frame" x="107.5" y="152.5" width="1" height="22"/>
                             <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="22" id="6Rw-WH-JBn"/>
-                                <constraint firstAttribute="width" constant="1" id="Vpp-aL-eh1"/>
+                                <constraint firstAttribute="width" constant="1" id="6C2-tu-fc9"/>
+                                <constraint firstAttribute="height" constant="22" id="MsV-RK-KiT"/>
                             </constraints>
                         </view>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ipW-Al-eG6">
-                            <rect key="frame" x="123.5" y="11" width="167" height="34"/>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Mez-3V-TcH">
+                            <rect key="frame" x="123.5" y="146.5" width="109" height="34"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="34" id="RUR-1C-sOu"/>
+                                <constraint firstAttribute="height" constant="34" id="4Ds-nn-pMM"/>
                             </constraints>
                             <color key="textColor" name="标题字颜色"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xgv-CB-GLZ">
-                            <rect key="frame" x="305.5" y="23" width="17" height="10"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OSG-Ct-txr">
+                            <rect key="frame" x="42.5" y="121.5" width="290" height="1"/>
+                            <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="17" id="bkq-Z2-j5i"/>
-                                <constraint firstAttribute="height" constant="10" id="uqn-6t-zd3"/>
+                                <constraint firstAttribute="height" constant="1" id="xf4-hx-uDv"/>
                             </constraints>
-                            <state key="normal" image="guanbi"/>
-                            <state key="selected" image="xianshi "/>
-                        </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="49B-fO-IDj">
-                            <rect key="frame" x="291" y="5" width="46" height="46"/>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密   码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZH-XU-xMu">
+                            <rect key="frame" x="52.5" y="93.5" width="38" height="16"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XFx-HW-Jtr">
+                            <rect key="frame" x="108.5" y="90.5" width="1" height="22"/>
+                            <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="46" id="4ox-Gd-KdC"/>
-                                <constraint firstAttribute="width" constant="46" id="wMa-BI-uDu"/>
+                                <constraint firstAttribute="width" constant="1" id="1Sr-i0-zlP"/>
+                                <constraint firstAttribute="height" constant="22" id="u0H-OZ-15Z"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X3J-oK-DVJ">
+                            <rect key="frame" x="292.5" y="81.5" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="40" id="6UC-s7-cBe"/>
+                                <constraint firstAttribute="height" constant="40" id="iSE-kR-PaN"/>
                             </constraints>
                             <connections>
-                                <action selector="shPassAction:" destination="-1" eventType="touchUpInside" id="a1q-uC-b3Y"/>
+                                <action selector="shPassAction:" destination="-1" eventType="touchUpInside" id="yOg-qP-iIW"/>
                             </connections>
                         </button>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                    <constraints>
-                        <constraint firstItem="ipW-Al-eG6" firstAttribute="leading" secondItem="ZCK-xJ-hVg" secondAttribute="trailing" constant="15" id="0LF-J3-nbW"/>
-                        <constraint firstAttribute="trailing" secondItem="Mlw-Ng-8f9" secondAttribute="trailing" constant="42.5" id="94n-o3-G0v"/>
-                        <constraint firstItem="hAO-bO-280" firstAttribute="top" secondItem="OaN-ws-ype" secondAttribute="top" id="Dqz-X5-I9k"/>
-                        <constraint firstItem="ZCK-xJ-hVg" firstAttribute="leading" secondItem="hAO-bO-280" secondAttribute="trailing" constant="15" id="EA3-5Y-w5F"/>
-                        <constraint firstAttribute="height" constant="56.5" id="KkC-6K-McV"/>
-                        <constraint firstAttribute="bottom" secondItem="Mlw-Ng-8f9" secondAttribute="bottom" id="Kws-hY-wOc"/>
-                        <constraint firstItem="ZCK-xJ-hVg" firstAttribute="centerY" secondItem="hAO-bO-280" secondAttribute="centerY" id="QWP-1w-Lxq"/>
-                        <constraint firstItem="ipW-Al-eG6" firstAttribute="centerY" secondItem="hAO-bO-280" secondAttribute="centerY" id="Vdt-SI-cLw"/>
-                        <constraint firstItem="xgv-CB-GLZ" firstAttribute="leading" secondItem="ipW-Al-eG6" secondAttribute="trailing" constant="15" id="W8f-1r-MAj"/>
-                        <constraint firstAttribute="trailing" secondItem="xgv-CB-GLZ" secondAttribute="trailing" constant="52.5" id="crQ-SX-Q2S"/>
-                        <constraint firstItem="Mlw-Ng-8f9" firstAttribute="top" secondItem="hAO-bO-280" secondAttribute="bottom" id="qTb-8R-WjZ"/>
-                        <constraint firstItem="49B-fO-IDj" firstAttribute="centerY" secondItem="xgv-CB-GLZ" secondAttribute="centerY" id="rbj-OE-Nwl"/>
-                        <constraint firstItem="hAO-bO-280" firstAttribute="leading" secondItem="OaN-ws-ype" secondAttribute="leading" constant="52.5" id="uHI-YO-GLX"/>
-                        <constraint firstItem="Mlw-Ng-8f9" firstAttribute="leading" secondItem="OaN-ws-ype" secondAttribute="leading" constant="42.5" id="vaj-M3-2ae"/>
-                        <constraint firstItem="xgv-CB-GLZ" firstAttribute="centerY" secondItem="hAO-bO-280" secondAttribute="centerY" id="xYu-7C-4aY"/>
-                        <constraint firstItem="49B-fO-IDj" firstAttribute="centerX" secondItem="xgv-CB-GLZ" secondAttribute="centerX" id="ymi-Tz-Knr"/>
-                    </constraints>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZRL-RS-ju7">
-                    <rect key="frame" x="0.0" y="361" width="375" height="56.5"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dgy-iq-Edz">
-                            <rect key="frame" x="247.5" y="12.5" width="90" height="44"/>
-                            <color key="backgroundColor" name="分界线颜色"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guanbi" translatesAutoresizingMaskIntoConstraints="NO" id="e9X-bV-2Ij">
+                            <rect key="frame" x="304" y="96.5" width="17" height="10"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="90" id="RJb-5N-cFF"/>
-                                <constraint firstAttribute="height" constant="44" id="sme-bF-fER"/>
+                                <constraint firstAttribute="width" constant="17" id="FRl-XX-B9J"/>
+                                <constraint firstAttribute="height" constant="10" id="ZuL-SI-oU5"/>
                             </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YB0-b5-FLp">
-                            <rect key="frame" x="42.5" y="55.5" width="190" height="1"/>
+                        </imageView>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="hBD-M4-Ne6">
+                            <rect key="frame" x="124.5" y="92" width="153" height="19"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="205-gm-xCU">
+                            <rect key="frame" x="42.5" y="59.5" width="290" height="1"/>
                             <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="1" id="UNO-RN-wCn"/>
+                                <constraint firstAttribute="height" constant="1" id="r2q-RI-s2h"/>
                             </constraints>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M0Y-PG-E7s">
-                            <rect key="frame" x="52.5" y="0.0" width="40" height="55.5"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="40" id="XOi-7O-1Ia"/>
-                            </constraints>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QOt-q8-bGq">
+                            <rect key="frame" x="52.5" y="31.5" width="40" height="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" name="标题字颜色"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dhS-2E-Yfo">
-                            <rect key="frame" x="107.5" y="17" width="1" height="22"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kvl-vj-1FR">
+                            <rect key="frame" x="107.5" y="28.5" width="1" height="22"/>
                             <color key="backgroundColor" name="分界线颜色"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="1" id="STV-we-O6c"/>
-                                <constraint firstAttribute="height" constant="22" id="TBL-ev-Ois"/>
+                                <constraint firstAttribute="height" constant="22" id="Efe-XA-Lzm"/>
+                                <constraint firstAttribute="width" constant="1" id="RrK-EY-us0"/>
                             </constraints>
                         </view>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="qfV-go-Nf1">
-                            <rect key="frame" x="123.5" y="11" width="109" height="34"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="34" id="g6O-S7-x6a"/>
-                            </constraints>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的用户名" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="RTz-Vt-gg4">
+                            <rect key="frame" x="123.5" y="30" width="209" height="19"/>
                             <color key="textColor" name="标题字颜色"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <textInputTraits key="textInputTraits"/>
@@ -218,88 +372,89 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <constraints>
-                        <constraint firstItem="M0Y-PG-E7s" firstAttribute="leading" secondItem="ZRL-RS-ju7" secondAttribute="leading" constant="52.5" id="78a-HE-0GL"/>
-                        <constraint firstItem="YB0-b5-FLp" firstAttribute="top" secondItem="M0Y-PG-E7s" secondAttribute="bottom" id="82F-Vw-FBu"/>
-                        <constraint firstAttribute="bottom" secondItem="YB0-b5-FLp" secondAttribute="bottom" id="JY2-5e-szD"/>
-                        <constraint firstItem="dhS-2E-Yfo" firstAttribute="leading" secondItem="M0Y-PG-E7s" secondAttribute="trailing" constant="15" id="K6q-nJ-gnG"/>
-                        <constraint firstItem="M0Y-PG-E7s" firstAttribute="top" secondItem="ZRL-RS-ju7" secondAttribute="top" id="QEN-3N-8eu"/>
-                        <constraint firstAttribute="height" constant="56.5" id="XiS-zb-Gia"/>
-                        <constraint firstAttribute="trailing" secondItem="YB0-b5-FLp" secondAttribute="trailing" constant="142.5" id="cZQ-q0-Fi8"/>
-                        <constraint firstItem="dhS-2E-Yfo" firstAttribute="centerY" secondItem="M0Y-PG-E7s" secondAttribute="centerY" id="ezR-Po-sq5"/>
-                        <constraint firstAttribute="bottom" secondItem="dgy-iq-Edz" secondAttribute="bottom" id="jho-ut-jDw"/>
-                        <constraint firstAttribute="trailing" secondItem="dgy-iq-Edz" secondAttribute="trailing" constant="37.5" id="m3i-L8-e0x"/>
-                        <constraint firstItem="qfV-go-Nf1" firstAttribute="centerY" secondItem="M0Y-PG-E7s" secondAttribute="centerY" id="rsw-ak-Ra5"/>
-                        <constraint firstItem="YB0-b5-FLp" firstAttribute="leading" secondItem="ZRL-RS-ju7" secondAttribute="leading" constant="42.5" id="tBb-gy-ZxA"/>
-                        <constraint firstItem="qfV-go-Nf1" firstAttribute="trailing" secondItem="YB0-b5-FLp" secondAttribute="trailing" id="vIf-5c-bel"/>
-                        <constraint firstItem="qfV-go-Nf1" firstAttribute="leading" secondItem="dhS-2E-Yfo" secondAttribute="trailing" constant="15" id="vjw-Zy-0ew"/>
+                        <constraint firstItem="lZH-XU-xMu" firstAttribute="leading" secondItem="OSG-Ct-txr" secondAttribute="leading" constant="10" id="1ag-Sd-rqz"/>
+                        <constraint firstItem="xgr-aD-uh9" firstAttribute="leading" secondItem="hIq-Mc-4Wl" secondAttribute="leading" constant="10" id="2AH-SD-y7F"/>
+                        <constraint firstItem="Mez-3V-TcH" firstAttribute="centerY" secondItem="xgr-aD-uh9" secondAttribute="centerY" id="2bp-E8-7dk"/>
+                        <constraint firstItem="OSG-Ct-txr" firstAttribute="top" secondItem="efe-KM-u3D" secondAttribute="top" constant="-31" id="4IT-nt-98q"/>
+                        <constraint firstItem="205-gm-xCU" firstAttribute="top" secondItem="XFx-HW-Jtr" secondAttribute="top" constant="-31" id="52B-wa-flx"/>
+                        <constraint firstItem="hIq-Mc-4Wl" firstAttribute="leading" secondItem="iYx-nR-RL7" secondAttribute="leading" constant="42.5" id="5J5-wl-5KG"/>
+                        <constraint firstItem="hIq-Mc-4Wl" firstAttribute="top" secondItem="xgr-aD-uh9" secondAttribute="bottom" constant="12" id="6QE-gM-qZf"/>
+                        <constraint firstItem="205-gm-xCU" firstAttribute="top" secondItem="QOt-q8-bGq" secondAttribute="bottom" constant="12" id="7Pz-TU-Otx"/>
+                        <constraint firstItem="hBD-M4-Ne6" firstAttribute="leading" secondItem="XFx-HW-Jtr" secondAttribute="trailing" constant="15" id="82o-wt-aWe"/>
+                        <constraint firstItem="205-gm-xCU" firstAttribute="leading" secondItem="iYx-nR-RL7" secondAttribute="leading" constant="42.5" id="9jH-WB-3Ig"/>
+                        <constraint firstItem="kvl-vj-1FR" firstAttribute="centerY" secondItem="QOt-q8-bGq" secondAttribute="centerY" id="C4i-T6-6yA"/>
+                        <constraint firstItem="RTz-Vt-gg4" firstAttribute="leading" secondItem="kvl-vj-1FR" secondAttribute="trailing" constant="15" id="DmJ-qV-HdZ"/>
+                        <constraint firstItem="hBD-M4-Ne6" firstAttribute="centerY" secondItem="lZH-XU-xMu" secondAttribute="centerY" id="Dnt-r0-kyP"/>
+                        <constraint firstItem="Tfm-yd-zJn" firstAttribute="leading" secondItem="hIq-Mc-4Wl" secondAttribute="trailing" constant="15" id="Fqy-qb-Q6A"/>
+                        <constraint firstAttribute="bottom" secondItem="hIq-Mc-4Wl" secondAttribute="bottom" id="GAW-pc-IXX"/>
+                        <constraint firstItem="OSG-Ct-txr" firstAttribute="top" secondItem="lZH-XU-xMu" secondAttribute="bottom" constant="12" id="Gs9-cy-oDT"/>
+                        <constraint firstAttribute="trailing" secondItem="205-gm-xCU" secondAttribute="trailing" constant="42.5" id="MKQ-ie-OZj"/>
+                        <constraint firstAttribute="trailing" secondItem="OSG-Ct-txr" secondAttribute="trailing" constant="42.5" id="QvF-BS-JL1"/>
+                        <constraint firstItem="efe-KM-u3D" firstAttribute="leading" secondItem="xgr-aD-uh9" secondAttribute="trailing" constant="15" id="SWk-hp-ldG"/>
+                        <constraint firstAttribute="trailing" secondItem="RTz-Vt-gg4" secondAttribute="trailing" constant="42.5" id="Sq7-cv-z52"/>
+                        <constraint firstItem="efe-KM-u3D" firstAttribute="centerY" secondItem="xgr-aD-uh9" secondAttribute="centerY" id="VCd-bk-0RE"/>
+                        <constraint firstItem="X3J-oK-DVJ" firstAttribute="centerY" secondItem="lZH-XU-xMu" secondAttribute="centerY" id="WfB-K6-2IR"/>
+                        <constraint firstItem="e9X-bV-2Ij" firstAttribute="centerX" secondItem="X3J-oK-DVJ" secondAttribute="centerX" id="XBz-tI-7FA"/>
+                        <constraint firstItem="QOt-q8-bGq" firstAttribute="leading" secondItem="205-gm-xCU" secondAttribute="leading" constant="10" id="YSN-oJ-f4O"/>
+                        <constraint firstItem="X3J-oK-DVJ" firstAttribute="leading" secondItem="hBD-M4-Ne6" secondAttribute="trailing" constant="15" id="gOs-MC-gHu"/>
+                        <constraint firstAttribute="height" constant="184.5" id="gtG-dv-OiH"/>
+                        <constraint firstItem="Mez-3V-TcH" firstAttribute="leading" secondItem="efe-KM-u3D" secondAttribute="trailing" constant="15" id="kJ1-fH-stA"/>
+                        <constraint firstItem="OSG-Ct-txr" firstAttribute="leading" secondItem="iYx-nR-RL7" secondAttribute="leading" constant="42.5" id="l5J-wS-XnK"/>
+                        <constraint firstItem="RTz-Vt-gg4" firstAttribute="centerY" secondItem="QOt-q8-bGq" secondAttribute="centerY" id="oa4-cl-Yhq"/>
+                        <constraint firstItem="kvl-vj-1FR" firstAttribute="leading" secondItem="QOt-q8-bGq" secondAttribute="trailing" constant="15" id="p5p-a4-9yU"/>
+                        <constraint firstItem="XFx-HW-Jtr" firstAttribute="centerY" secondItem="lZH-XU-xMu" secondAttribute="centerY" id="qSN-Nv-9PG"/>
+                        <constraint firstItem="Mez-3V-TcH" firstAttribute="trailing" secondItem="hIq-Mc-4Wl" secondAttribute="trailing" id="saD-se-YUY"/>
+                        <constraint firstAttribute="trailing" secondItem="X3J-oK-DVJ" secondAttribute="trailing" constant="42.5" id="shx-DS-0vm"/>
+                        <constraint firstAttribute="trailing" secondItem="Tfm-yd-zJn" secondAttribute="trailing" constant="37.5" id="spk-AR-7MV"/>
+                        <constraint firstItem="XFx-HW-Jtr" firstAttribute="leading" secondItem="lZH-XU-xMu" secondAttribute="trailing" constant="18" id="tgG-RT-ycg"/>
+                        <constraint firstItem="e9X-bV-2Ij" firstAttribute="centerY" secondItem="X3J-oK-DVJ" secondAttribute="centerY" id="wI2-nO-tCb"/>
+                        <constraint firstAttribute="bottom" secondItem="Tfm-yd-zJn" secondAttribute="bottom" id="x2H-7n-ysD"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I08-S6-beg" customClass="LGButton" customModule="LGButton">
-                    <rect key="frame" x="42.5" y="472" width="290" height="44"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Ja-vk-vOz">
+                    <rect key="frame" x="0.0" y="270" width="187.5" height="3"/>
+                    <color key="backgroundColor" name="蓝色字体颜色"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="44" id="SBR-oP-3BO"/>
+                        <constraint firstAttribute="height" constant="3" id="Vwi-LV-4rf"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
-                            <color key="value" name="按钮渐变色上"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
-                            <color key="value" name="按钮渐变色下"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="string" keyPath="titleString" value="登录"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="5"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
-                            <real key="value" value="17"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFang SC Medium"/>
-                        <userDefinedRuntimeAttribute type="string" keyPath="loadingString" value="登录中"/>
-                        <userDefinedRuntimeAttribute type="number" keyPath="loadingFontSize">
-                            <real key="value" value="17"/>
+                            <real key="value" value="3"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
                     </userDefinedRuntimeAttributes>
-                    <connections>
-                        <action selector="loginAction:" destination="-1" eventType="touchUpInside" id="jlC-gq-qwQ"/>
-                    </connections>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MQe-6S-qXS">
-                    <rect key="frame" x="154" y="536" width="67" height="28"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="67" id="PNh-iY-RQs"/>
-                        <constraint firstAttribute="height" constant="28" id="iJk-Xk-Gco"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <state key="normal" title="忘记密码？"/>
-                    <connections>
-                        <action selector="forgetPasswordAction:" destination="-1" eventType="touchUpInside" id="aEs-Yr-lkP"/>
-                    </connections>
-                </button>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="AdE-4p-9iF" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="0n8-IS-rmb"/>
-                <constraint firstAttribute="trailing" secondItem="5Z0-Os-dI3" secondAttribute="trailing" id="3iv-eA-R45"/>
-                <constraint firstItem="AdE-4p-9iF" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="4DA-PL-Dyu"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="AdE-4p-9iF" secondAttribute="trailing" id="52s-wi-qTU"/>
-                <constraint firstItem="X0U-me-oUu" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="B8A-WB-VZx"/>
-                <constraint firstItem="I08-S6-beg" firstAttribute="top" secondItem="ZRL-RS-ju7" secondAttribute="bottom" constant="54.5" id="Ckv-FM-r87"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="I08-S6-beg" secondAttribute="trailing" constant="42.5" id="DRM-x9-6Rb"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="OaN-ws-ype" secondAttribute="trailing" id="GHw-Ou-3wH"/>
-                <constraint firstItem="I08-S6-beg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="42.5" id="GLb-WC-KJp"/>
-                <constraint firstItem="ZRL-RS-ju7" firstAttribute="top" secondItem="OaN-ws-ype" secondAttribute="bottom" constant="7" id="IvG-Cg-ypZ"/>
-                <constraint firstItem="MQe-6S-qXS" firstAttribute="centerX" secondItem="I08-S6-beg" secondAttribute="centerX" id="JRV-dC-nsB"/>
-                <constraint firstItem="OaN-ws-ype" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Ki0-9j-ntq"/>
-                <constraint firstItem="MQe-6S-qXS" firstAttribute="top" secondItem="I08-S6-beg" secondAttribute="bottom" constant="20" id="Mqb-GW-bmK"/>
-                <constraint firstItem="OaN-ws-ype" firstAttribute="top" secondItem="X0U-me-oUu" secondAttribute="bottom" constant="7" id="STu-O3-rjB"/>
-                <constraint firstItem="5Z0-Os-dI3" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="XO0-KU-si0"/>
-                <constraint firstItem="ZRL-RS-ju7" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Zbr-O7-mvI"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="X0U-me-oUu" secondAttribute="trailing" id="b2z-fR-fAI"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="ZRL-RS-ju7" secondAttribute="trailing" id="buy-UI-lDF"/>
-                <constraint firstItem="X0U-me-oUu" firstAttribute="top" secondItem="AdE-4p-9iF" secondAttribute="bottom" id="fEt-nJ-ird"/>
-                <constraint firstItem="5Z0-Os-dI3" firstAttribute="bottom" secondItem="AdE-4p-9iF" secondAttribute="top" id="mfQ-JT-Qvb"/>
+                <constraint firstItem="8TK-uX-oiI" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="21e-ws-PcC"/>
+                <constraint firstItem="Wdn-1F-VeB" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="2wK-cQ-Hss"/>
+                <constraint firstItem="D5t-7a-0cK" firstAttribute="top" secondItem="AdE-4p-9iF" secondAttribute="bottom" id="8HN-KF-pot"/>
+                <constraint firstItem="AdE-4p-9iF" firstAttribute="top" secondItem="5Z0-Os-dI3" secondAttribute="bottom" id="BRa-0m-FiZ"/>
+                <constraint firstItem="Wdn-1F-VeB" firstAttribute="top" secondItem="8TK-uX-oiI" secondAttribute="bottom" id="EAk-7A-42J"/>
+                <constraint firstItem="Wdn-1F-VeB" firstAttribute="top" secondItem="0Ja-vk-vOz" secondAttribute="bottom" id="Hdm-Kv-ckl"/>
+                <constraint firstItem="iYx-nR-RL7" firstAttribute="top" secondItem="8TK-uX-oiI" secondAttribute="bottom" id="Je8-3D-zrv"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="iYx-nR-RL7" secondAttribute="trailing" id="JnY-Re-yNz"/>
+                <constraint firstAttribute="trailing" secondItem="5Z0-Os-dI3" secondAttribute="trailing" id="KFK-VC-scK"/>
+                <constraint firstItem="5Z0-Os-dI3" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="KUM-Hy-dKy"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="8TK-uX-oiI" secondAttribute="trailing" id="Mtx-ax-LrJ"/>
+                <constraint firstItem="iYx-nR-RL7" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="PE0-nn-wXu"/>
+                <constraint firstItem="MQe-6S-qXS" firstAttribute="top" secondItem="I08-S6-beg" secondAttribute="bottom" constant="25" id="Qki-Vc-Skx"/>
+                <constraint firstItem="0Ja-vk-vOz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="RhV-iN-pOc"/>
+                <constraint firstItem="D5t-7a-0cK" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="UEK-xd-oQx"/>
+                <constraint firstItem="5Z0-Os-dI3" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="-60" id="YRG-FT-tB2"/>
+                <constraint firstItem="0Ja-vk-vOz" firstAttribute="width" secondItem="Nig-Dz-4dg" secondAttribute="width" id="ZE1-ky-VsD"/>
+                <constraint firstItem="AdE-4p-9iF" firstAttribute="top" secondItem="5Z0-Os-dI3" secondAttribute="bottom" id="b0y-0C-ElT"/>
+                <constraint firstItem="AdE-4p-9iF" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="coM-EX-tz4"/>
+                <constraint firstItem="I08-S6-beg" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="hlv-iY-Iqq"/>
+                <constraint firstItem="MQe-6S-qXS" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="n1h-SV-0cU"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="I08-S6-beg" secondAttribute="trailing" constant="42.5" id="o5J-jF-e0Y"/>
+                <constraint firstItem="8TK-uX-oiI" firstAttribute="top" secondItem="D5t-7a-0cK" secondAttribute="bottom" id="oUV-45-9Zd"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="D5t-7a-0cK" secondAttribute="trailing" id="pgT-5y-uv9"/>
+                <constraint firstItem="AdE-4p-9iF" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="sQF-W0-5Zt"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="MQe-6S-qXS" secondAttribute="trailing" id="sT3-ls-2JK"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Wdn-1F-VeB" secondAttribute="trailing" id="twq-n9-MMO"/>
+                <constraint firstItem="I08-S6-beg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="42.5" id="uJU-JF-yWK"/>
+                <constraint firstItem="I08-S6-beg" firstAttribute="top" secondItem="iYx-nR-RL7" secondAttribute="bottom" constant="8" id="yO3-cZ-tUg"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="111.2" y="116.49175412293854"/>
@@ -309,7 +464,6 @@
         <image name="banner" width="750" height="468"/>
         <image name="guanbi" width="37" height="18"/>
         <image name="sekuai" width="375" height="30"/>
-        <image name="xianshi " width="37" height="24"/>
         <namedColor name="分界线颜色">
             <color red="0.65100002288818359" green="0.75700002908706665" blue="0.87800002098083496" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -322,5 +476,11 @@
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="蓝色字体颜色">
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -108,7 +108,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     //MARK:--加载更多数据
     @objc func loadMoreData(){
         print("加载更多数据")
-        
+      
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
         var dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"order_status":orderStatus,"pay_status":payStatus,"order_source":orderSource,"shipping_status":shippingStatus,"start_time":startTime,"end_time":endTime]
         if endTime == 0 {

GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderListViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderListViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="gk3-xb-88Q" id="Mmc-gK-QV8"/>
                 <outlet property="searchBgView" destination="f4t-Fn-Swl" id="yJO-4i-XHP"/>
@@ -28,7 +28,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oFn-kE-fo4">
-                    <rect key="frame" x="320" y="7.5" width="55" height="30"/>
+                    <rect key="frame" x="320" y="11.5" width="55" height="22"/>
                     <state key="normal" image="shaixuan"/>
                     <connections>
                         <action selector="SelectOtherAction:" destination="-1" eventType="touchUpInside" id="Q40-3H-hF7"/>