颜色布局修改

Podfile.lock

@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.39.0
+COCOAPODS: 0.38.2

XFFruit.xcodeproj/project.pbxproj

@@ -159,10 +159,8 @@
 		728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; };
 		728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; };
 		728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; };
-
 		728F84AC1C194A05009E4A3D /* UserWarehouse.m in Sources */ = {isa = PBXBuildFile; fileRef = 728F84AB1C194A05009E4A3D /* UserWarehouse.m */; settings = {ASSET_TAGS = (); }; };
 		729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; settings = {ASSET_TAGS = (); }; };
-
 		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
 		72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
 		72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
@@ -2707,7 +2705,6 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
-				B5C1D2A4E2AD146EC3870004 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2847,21 +2844,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		B5C1D2A4E2AD146EC3870004 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3455,7 +3437,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3480,7 +3462,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -368,7 +368,7 @@ typedef enum : NSUInteger {
         self.stateLabel.textColor = [UIColor blackColor];
         self.stateLabel.text = @"已完成";
     }else if ([self.bill.state isEqualToString:PURCHASE_STATE_PROCESS]) {
-        self.stateLabel.textColor = [UIColor blackColor];
+        self.stateLabel.textColor = [UIColor greenColor];
         self.stateLabel.text = @"提交系统处理";
     }else if ([self.bill.state isEqualToString:PURCHASE_STATE_PROCESSFAIL]) {
         self.stateLabel.textColor = [UIColor blackColor];

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.m

@@ -124,7 +124,7 @@ typedef enum : NSUInteger {
         self.stateLabel.textColor = [UIColor greenColor];
         self.stateLabel.text = @"提交系统处理";
     }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
-        self.stateLabel.textColor = [UIColor grayColor];
+        self.stateLabel.textColor = [UIColor blackColor];
         self.stateLabel.text = @"系统处理失败";
 
     }
@@ -152,14 +152,14 @@ typedef enum : NSUInteger {
     self.noteLabel.frame = noteFrame;
     
     CGFloat totalHeight = height + LeftHeight*9;
-    //    CGRect purchaseFrame = _purchaseView.frame;
-    //    purchaseFrame.size.height = totalHeight;
-    //    _purchaseView.frame = purchaseFrame;
-    //
-    //
-    //    CGRect bottomFrame = _bottomView.frame;
-    //    bottomFrame.origin.y = CGRectGetMaxY(_purchaseView.frame) + TopMargin;
-    //    _bottomView.frame = bottomFrame;
+        CGRect purchaseFrame = _transportView.frame;
+        purchaseFrame.size.height = totalHeight + LeftMargin;
+        _transportView.frame = purchaseFrame;
+    
+    
+        CGRect bottomFrame = _bottomView.frame;
+        bottomFrame.origin.y = CGRectGetMaxY(_transportView.frame) + TopMargin;
+        _bottomView.frame = bottomFrame;
     
     _scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2);
 }
@@ -215,6 +215,8 @@ typedef enum : NSUInteger {
             [self hiddenBottom];
         }
 
+    }else{
+        [self hiddenBottom];
     }
     
     NSArray *leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"备注"];

XFFruit/ViewControllers/Transfer/Controllers/TransferDetailViewController.m

@@ -88,7 +88,7 @@ typedef enum : NSUInteger {
         self.stateLabel.textColor = [UIColor grayColor];
         self.stateLabel.text = @"已作废";
     }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESS]) {
-        self.stateLabel.textColor = [UIColor blackColor];
+        self.stateLabel.textColor = [UIColor greenColor];
         self.stateLabel.text = @"提交系统处理";
     }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
         self.stateLabel.textColor = [UIColor blackColor];
@@ -179,7 +179,6 @@ typedef enum : NSUInteger {
         }else{
             [self hiddenBottomView];
         }
-#warning 测试
     }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]){
         NSMutableArray *arr = [NSMutableArray array]; //系统处理失败
         if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -98,7 +98,7 @@ typedef enum : NSUInteger {
         self.stateLabel.textColor = [UIColor grayColor];
         self.stateLabel.text = @"已作废";
     }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_PROCESS]) {
-        self.stateLabel.textColor = [UIColor blackColor];
+        self.stateLabel.textColor = [UIColor greenColor];
         self.stateLabel.text = @"提交系统处理";
     }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]) {
         self.stateLabel.textColor = [UIColor blackColor];