规格描述

XFFruit.xcodeproj/project.pbxproj

@@ -147,6 +147,18 @@
 		72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CEA1BA27BA6007B3387 /* GXFPopView.m */; };
 		72873CEE1BA280DD007B3387 /* GXFPopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CED1BA280DD007B3387 /* GXFPopCell.m */; };
 		72882D8B1BA9121E00935BA6 /* ChooseProductUnitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72882D8A1BA9121E00935BA6 /* ChooseProductUnitViewController.m */; };
+		728899D01BECADA8003CC41E /* ReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899CD1BECADA8003CC41E /* ReportViewController.m */; settings = {ASSET_TAGS = (); }; };
+		728899D31BECADCD003CC41E /* CustomSegView.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899D21BECADCD003CC41E /* CustomSegView.m */; settings = {ASSET_TAGS = (); }; };
+		728899D61BECB323003CC41E /* SaleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899D51BECB323003CC41E /* SaleViewController.m */; settings = {ASSET_TAGS = (); }; };
+		728899D91BEF20BA003CC41E /* SMPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899D81BEF20BA003CC41E /* SMPageControl.m */; settings = {ASSET_TAGS = (); }; };
+		728899E21BEF35F3003CC41E /* SaleViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899E11BEF35F3003CC41E /* SaleViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		728899E51BEF3609003CC41E /* SaleHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899E41BEF3609003CC41E /* SaleHeaderView.m */; settings = {ASSET_TAGS = (); }; };
+		728899E81BEF41FC003CC41E /* PassengerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899E71BEF41FC003CC41E /* PassengerViewController.m */; settings = {ASSET_TAGS = (); }; };
+		728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; settings = {ASSET_TAGS = (); }; };
+		728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; settings = {ASSET_TAGS = (); }; };
+		728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; settings = {ASSET_TAGS = (); }; };
+		728899F41BEF4D3D003CC41E /* PassgerPriceHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F31BEF4D3D003CC41E /* PassgerPriceHeaderCell.m */; settings = {ASSET_TAGS = (); }; };
+		728899F71BEF4D53003CC41E /* PassgerPriceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F61BEF4D53003CC41E /* PassgerPriceCell.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 */; };
@@ -714,6 +726,30 @@
 		72873CED1BA280DD007B3387 /* GXFPopCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFPopCell.m; sourceTree = "<group>"; };
 		72882D891BA9121E00935BA6 /* ChooseProductUnitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductUnitViewController.h; sourceTree = "<group>"; };
 		72882D8A1BA9121E00935BA6 /* ChooseProductUnitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseProductUnitViewController.m; sourceTree = "<group>"; };
+		728899CC1BECADA8003CC41E /* ReportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportViewController.h; sourceTree = "<group>"; };
+		728899CD1BECADA8003CC41E /* ReportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReportViewController.m; sourceTree = "<group>"; };
+		728899D11BECADCD003CC41E /* CustomSegView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomSegView.h; sourceTree = "<group>"; };
+		728899D21BECADCD003CC41E /* CustomSegView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomSegView.m; sourceTree = "<group>"; };
+		728899D41BECB323003CC41E /* SaleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleViewController.h; sourceTree = "<group>"; };
+		728899D51BECB323003CC41E /* SaleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleViewController.m; sourceTree = "<group>"; };
+		728899D71BEF20BA003CC41E /* SMPageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMPageControl.h; sourceTree = "<group>"; };
+		728899D81BEF20BA003CC41E /* SMPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMPageControl.m; sourceTree = "<group>"; };
+		728899E01BEF35F3003CC41E /* SaleViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleViewCell.h; sourceTree = "<group>"; };
+		728899E11BEF35F3003CC41E /* SaleViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleViewCell.m; sourceTree = "<group>"; };
+		728899E31BEF3609003CC41E /* SaleHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleHeaderView.h; sourceTree = "<group>"; };
+		728899E41BEF3609003CC41E /* SaleHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleHeaderView.m; sourceTree = "<group>"; };
+		728899E61BEF41FC003CC41E /* PassengerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassengerViewController.h; sourceTree = "<group>"; };
+		728899E71BEF41FC003CC41E /* PassengerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassengerViewController.m; sourceTree = "<group>"; };
+		728899E91BEF4233003CC41E /* PassgerPriceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassgerPriceViewController.h; sourceTree = "<group>"; };
+		728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassgerPriceViewController.m; sourceTree = "<group>"; };
+		728899EC1BEF4A75003CC41E /* PasengerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PasengerCell.h; sourceTree = "<group>"; };
+		728899ED1BEF4A75003CC41E /* PasengerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PasengerCell.m; sourceTree = "<group>"; };
+		728899EF1BEF4A8A003CC41E /* PassengerHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassengerHeaderCell.h; sourceTree = "<group>"; };
+		728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassengerHeaderCell.m; sourceTree = "<group>"; };
+		728899F21BEF4D3D003CC41E /* PassgerPriceHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassgerPriceHeaderCell.h; sourceTree = "<group>"; };
+		728899F31BEF4D3D003CC41E /* PassgerPriceHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassgerPriceHeaderCell.m; sourceTree = "<group>"; };
+		728899F51BEF4D53003CC41E /* PassgerPriceCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassgerPriceCell.h; sourceTree = "<group>"; };
+		728899F61BEF4D53003CC41E /* PassgerPriceCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassgerPriceCell.m; sourceTree = "<group>"; };
 		729A2E911BE60C0200493603 /* GeometryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryView.h; sourceTree = "<group>"; };
 		729A2E921BE60C0200493603 /* GeometryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeometryView.m; sourceTree = "<group>"; };
 		72A8132B1BCA8BBA003631F3 /* ChooseTransportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseTransportViewController.h; sourceTree = "<group>"; };
@@ -1568,6 +1604,61 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		728899C71BEC8766003CC41E /* Report */ = {
+			isa = PBXGroup;
+			children = (
+				728899CB1BECADA8003CC41E /* Controllers */,
+				728899CE1BECADA8003CC41E /* Models */,
+				728899CF1BECADA8003CC41E /* Views */,
+			);
+			path = Report;
+			sourceTree = "<group>";
+		};
+		728899CB1BECADA8003CC41E /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				728899CC1BECADA8003CC41E /* ReportViewController.h */,
+				728899CD1BECADA8003CC41E /* ReportViewController.m */,
+				728899D41BECB323003CC41E /* SaleViewController.h */,
+				728899D51BECB323003CC41E /* SaleViewController.m */,
+				728899E61BEF41FC003CC41E /* PassengerViewController.h */,
+				728899E71BEF41FC003CC41E /* PassengerViewController.m */,
+				728899E91BEF4233003CC41E /* PassgerPriceViewController.h */,
+				728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
+		728899CE1BECADA8003CC41E /* Models */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		728899CF1BECADA8003CC41E /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				728899D71BEF20BA003CC41E /* SMPageControl.h */,
+				728899D81BEF20BA003CC41E /* SMPageControl.m */,
+				728899D11BECADCD003CC41E /* CustomSegView.h */,
+				728899D21BECADCD003CC41E /* CustomSegView.m */,
+				728899E01BEF35F3003CC41E /* SaleViewCell.h */,
+				728899E11BEF35F3003CC41E /* SaleViewCell.m */,
+				728899E31BEF3609003CC41E /* SaleHeaderView.h */,
+				728899E41BEF3609003CC41E /* SaleHeaderView.m */,
+				728899EC1BEF4A75003CC41E /* PasengerCell.h */,
+				728899ED1BEF4A75003CC41E /* PasengerCell.m */,
+				728899EF1BEF4A8A003CC41E /* PassengerHeaderCell.h */,
+				728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */,
+				728899F21BEF4D3D003CC41E /* PassgerPriceHeaderCell.h */,
+				728899F31BEF4D3D003CC41E /* PassgerPriceHeaderCell.m */,
+				728899F51BEF4D53003CC41E /* PassgerPriceCell.h */,
+				728899F61BEF4D53003CC41E /* PassgerPriceCell.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		72A813F11BCD3117003631F3 /* Receiving */ = {
 			isa = PBXGroup;
 			children = (
@@ -2331,6 +2422,7 @@
 		C1C6FEED1AB88A3400D4C41A /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
+				728899C71BEC8766003CC41E /* Report */,
 				72A813F11BCD3117003631F3 /* Receiving */,
 				72805CED1BB79D68009E1F82 /* Transfer */,
 				72B3C0A91B9D3C7300025D81 /* Transport */,
@@ -2754,7 +2846,10 @@
 				C142D2AE1AC3A155000109A7 /* NSString+TrimmingAdditions.m in Sources */,
 				C15918471AC062460013B391 /* IBTCommon.m in Sources */,
 				C1FE502D1ADD887400C18080 /* LBorderView.m in Sources */,
+				728899F71BEF4D53003CC41E /* PassgerPriceCell.m in Sources */,
 				C1B810AF1ADF4D6A00BBC75A /* ICRAttachTitleView.m in Sources */,
+				728899E21BEF35F3003CC41E /* SaleViewCell.m in Sources */,
+				728899D31BECADCD003CC41E /* CustomSegView.m in Sources */,
 				C159186F1AC1A0510013B391 /* ICRSystemViewController.m in Sources */,
 				72B3C0D31B9D72C600025D81 /* TransportPdtDetail.m in Sources */,
 				72B3C0C91B9D3C7300025D81 /* TransportPurchaseCell.m in Sources */,
@@ -2794,6 +2889,7 @@
 				C123A92B1B26EDDA003C0C36 /* ICRQuestionHelperView.m in Sources */,
 				7281A0BF1B8980E60052B1AC /* PurchaseBill.m in Sources */,
 				72F9D4851BA7FFC400795A00 /* PurchaseNotice.m in Sources */,
+				728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */,
 				0414FF191B94959700C7B00E /* PurchaseNoticeCell.m in Sources */,
 				7217E9EB1B72364300FE5C1D /* HPGrowingTextView.m in Sources */,
 				724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */,
@@ -2805,11 +2901,13 @@
 				0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */,
 				C1374F581B33C40D00594D19 /* IBTWebViewController.m in Sources */,
 				C159186B1AC1A03B0013B391 /* ICRSyncViewController.m in Sources */,
+				728899F41BEF4D3D003CC41E /* PassgerPriceHeaderCell.m in Sources */,
 				C1C564431AD66C6E006A1050 /* ICRTaskEditViewController.m in Sources */,
 				72F9D48B1BA8582100795A00 /* NoticeBoltView.m in Sources */,
 				C142D2AA1AC3A155000109A7 /* NSDate+FormatterAdditions.m in Sources */,
 				72805CF61BB8E20B009E1F82 /* NewTransferViewController.m in Sources */,
 				C1B307A31ADD199600657F11 /* ICRTaskResultContentView.m in Sources */,
+				728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */,
 				72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */,
 				721BF46A1BAAA18400255750 /* FooterCell.m in Sources */,
 				30DB9F971AD7DEC00085FA5C /* IBTUISearchBar.m in Sources */,
@@ -2818,6 +2916,7 @@
 				C1D017281AD8F46700CD9CB8 /* IBTScrollLoadMoreView.m in Sources */,
 				72A813FD1BCD33BE003631F3 /* ReceiveBoltView.m in Sources */,
 				C18AEA841AC8D2EA00A1DB7B /* IBTUIButton.m in Sources */,
+				728899D61BECB323003CC41E /* SaleViewController.m in Sources */,
 				C1FE50521AE024FA00C18080 /* UIAlertView+Blocks.m in Sources */,
 				351CFF5C1B90633700F30866 /* GXFFunction.m in Sources */,
 				C1E108691ADADB5500620375 /* IBTCustomButtom.m in Sources */,
@@ -2862,13 +2961,16 @@
 				C15295B71B24450A00DF60D1 /* ICRQAViewController.m in Sources */,
 				30D7FE5D1AD4F941003D92EE /* ICRAboutViewController.m in Sources */,
 				7281A0B31B8974120052B1AC /* NewPurchaseViewController.m in Sources */,
+				728899E81BEF41FC003CC41E /* PassengerViewController.m in Sources */,
 				C10214DF1AD90A3F0024637E /* ICRFunctionItemControl.m in Sources */,
 				358432F11B993BD8007E73ED /* GXFProcessProductTableViewCell.m in Sources */,
+				728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */,
 				C15918431AC062460013B391 /* IBTTableViewUserInfo.m in Sources */,
 				30D702461ADE3862008DC0BF /* ICRAnnouncementDetailHeadView.m in Sources */,
 				C17E50D91B09830200C15359 /* ICRPostAttachment.m in Sources */,
 				C18AEA911AC9B88F00A1DB7B /* ICRUIAppearance.m in Sources */,
 				C142D2B61AC3A155000109A7 /* UILabel+SizeCalculate.m in Sources */,
+				728899D01BECADA8003CC41E /* ReportViewController.m in Sources */,
 				72B3C0D01B9D6B9E00025D81 /* TransportViewController.m in Sources */,
 				724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */,
 				72B3C0C71B9D3C7300025D81 /* BottomTransportView.m in Sources */,
@@ -2931,6 +3033,7 @@
 				C142D2B81AC3A155000109A7 /* UIResponder+FirstResponder.m in Sources */,
 				30D3C1251ADF6451004AC54E /* ICRAnnouncementDetailContentView.m in Sources */,
 				FEAE16E91B79C9F9009D9E01 /* ResultView.m in Sources */,
+				728899E51BEF3609003CC41E /* SaleHeaderView.m in Sources */,
 				C142D2C01AC3A155000109A7 /* UIView+ViewFrameGeometry.m in Sources */,
 				C1FE50451AE0249A00C18080 /* IBTImagePicker.m in Sources */,
 				C1E108611ADA8D3800620375 /* ICRAttachment.m in Sources */,
@@ -2964,6 +3067,7 @@
 				351CFF5D1B90633700F30866 /* GXFFunctionCollectionViewCell.m in Sources */,
 				726F4C6D1BDE5F83006A5E6D /* RejectView.m in Sources */,
 				7281A0B91B897BB20052B1AC /* PurchaseViewController.m in Sources */,
+				728899D91BEF20BA003CC41E /* SMPageControl.m in Sources */,
 				358432EE1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.m in Sources */,
 				C1C5644F1AD6719B006A1050 /* ICRTaskDetailViewController.m in Sources */,
 				C1E1085D1ADA577500620375 /* ICRTaskDetailContentView.m in Sources */,
@@ -3264,8 +3368,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
 				COPYING_PRESERVES_HFS_DATA = NO;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
@@ -3290,7 +3394,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
 				COPYING_PRESERVES_HFS_DATA = NO;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";

XFFruit/Utilities/IBTUIKit/IBTCommon.h

@@ -40,8 +40,10 @@
 + (NSString *)checkNull: (id)data;
 + (BOOL)checkStringIsNilOrSpance: (NSString *)str;
 + (NSMutableAttributedString *)setTextViewFontOfString:(NSString *)string paragraphStyle:(NSInteger)lineHeight fontSize:(float)size color:(UIColor *)color;
++ (NSMutableAttributedString *)setTextViewBoldFontOfString:(NSString *)string paragraphStyle:(NSInteger)lineHeight fontSize:(float)size color:(UIColor *)color;
 + (NSString *)trimmingCharacters:(NSString *)str;
 + (int)compareDate:(NSString*)oneDate withDate:(NSString*)twoDate;
 + (BOOL)checkIsPermission:(NSString *)permission;
-
++(UILabel *)labelWithTitle:(NSString *)title frame:(CGRect)frame textFont:(UIFont *)titleFont;
++ (UIButton *)buttonWithTitle:(NSString *)title Image:(UIImage *)image frame:(CGRect)frame fontSize:(float)fontSize fontColor:(UIColor *)color;
 @end

XFFruit/Utilities/IBTUIKit/IBTCommon.m

@@ -224,6 +224,14 @@
     return attributeStr;
 }
 
++ (NSMutableAttributedString *)setTextViewBoldFontOfString:(NSString *)string paragraphStyle:(NSInteger)lineHeight fontSize:(float)size color:(UIColor *)color {
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]init];
+    paragraphStyle.lineSpacing = lineHeight;
+    NSDictionary *attributes = @{ NSFontAttributeName:[UIFont boldSystemFontOfSize:size],NSForegroundColorAttributeName :color, NSParagraphStyleAttributeName:paragraphStyle};
+    NSMutableAttributedString *attributeStr = [[NSMutableAttributedString alloc] initWithString:string attributes:attributes];
+    return attributeStr;
+}
+
 + (NSString *)trimmingCharacters:(NSString *)str{
     NSString *newStr = [str stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
     return newStr;
@@ -258,4 +266,36 @@
     return NO;
 }
 
+
++(UILabel *)labelWithTitle:(NSString *)title frame:(CGRect)frame textFont:(UIFont *)titleFont
+{
+    UILabel * titleLabel = [[UILabel alloc] initWithFrame:frame];
+    titleLabel.backgroundColor = [UIColor clearColor];
+    titleLabel.font = titleFont;
+    titleLabel.textColor = [UIColor blackColor];
+    titleLabel.numberOfLines = 1;
+    
+    //设置文字过长时的显示格式,截去尾部...
+    titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
+    titleLabel.text=title;
+    
+    return titleLabel;
+}
+
++ (UIButton *)buttonWithTitle:(NSString *)title Image:(UIImage *)image frame:(CGRect)frame fontSize:(float)fontSize fontColor:(UIColor *)color
+{
+    UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom];
+    
+    [button setTitle:title forState:UIControlStateNormal];
+    button.frame = frame;
+    button.titleLabel.font = [UIFont systemFontOfSize:fontSize];
+    button.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;
+    button.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
+    [button setImage:image forState:UIControlStateNormal];
+    [button setTitleColor:color forState:UIControlStateNormal];
+    
+    return button;
+}
+
+
 @end

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -217,11 +217,15 @@
 #define TRANSPORT_ACTION_FINISH         @"500504"  //结束权
 #define TRANSPORT_ACTION_ABORT          @"500505"   //作废权
 
+//选中的颜色
+#define BASESELECT_COLOR                                RGBA(255, 127, 0, 1)
 
+//销售
+#define SaleDay                         @"日"
+#define SaleWeek                        @"周"
+#define SaleMonth                       @"月"
 
 
 
-//选中的颜色
-#define BASESELECT_COLOR                                RGBA(255, 127, 0, 1)
 
 #endif

XFFruit/Utilities/IBTUIKit/IBTCustomButtom.h

@@ -25,4 +25,12 @@
 
 + (UIButton *)creatButtonWithFrame:(CGRect)frame target:(id)target sel:(SEL)sel tag:(NSInteger)tag image:(NSString *)name title:(NSString *)title titleColor:(UIColor *)titleCorlor isCorner:(BOOL)isCornor corner:(CGFloat)corner bgColor:(UIColor *)bgcolor;
 
+
+#pragma mark - border
+
+- (void)addTopBorderWithHeight:(CGFloat)height color:(UIColor *)color;
+- (void)addBottomBorderWithHeight:(CGFloat)height color:(UIColor *)color;
+- (void)addLeftBorderWithWidth:(CGFloat)width color:(UIColor *)color;
+- (void)addRightBorderWithWidth:(CGFloat)width color:(UIColor *)color;
+
 @end

XFFruit/Utilities/IBTUIKit/IBTCustomButtom.m

@@ -92,5 +92,39 @@
     return button;
 }
 
+#pragma mark - border
+
+- (void)addTopBorderWithHeight:(CGFloat)height color:(UIColor *)color
+{
+    CALayer *layer = [CALayer layer];
+    layer.frame = CGRectMake(0, 0, self.frame.size.width, height);
+    layer.backgroundColor = color.CGColor;
+    [self.layer addSublayer:layer];
+}
+
+- (void)addBottomBorderWithHeight:(CGFloat)height color:(UIColor *)color
+{
+    CALayer *layer = [CALayer layer];
+    layer.frame = CGRectMake(0, self.frame.size.height - height, self.frame.size.width, height);
+    layer.backgroundColor = color.CGColor;
+    [self.layer addSublayer:layer];
+}
+
+- (void)addLeftBorderWithWidth:(CGFloat)width color:(UIColor *)color
+{
+    CALayer *layer = [CALayer layer];
+    layer.frame = CGRectMake(0, 0, width, self.frame.size.height);
+    layer.backgroundColor = color.CGColor;
+    [self.layer addSublayer:layer];
+}
+
+- (void)addRightBorderWithWidth:(CGFloat)width color:(UIColor *)color
+{
+    CALayer *layer = [CALayer layer];
+    layer.frame = CGRectMake(self.frame.size.width - width, 0, width, self.frame.size.height);
+    layer.backgroundColor = color.CGColor;
+    [self.layer addSublayer:layer];
+}
+
 
 @end

XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m

@@ -396,8 +396,7 @@ typedef enum : NSUInteger {
         billProduct.basePrice = [NSNumber numberWithFloat:0];
         billProduct.total = [NSNumber numberWithFloat:0];
         billProduct.remark = @"";
-#warning 包装规格说明是不是少了在NoticeProduct
-        billProduct.qpcStr = @"无";
+        billProduct.qpcStr = [NSString stringWithFormat:@"1*%@",product.qpc];
         [billArr addObject:billProduct];
     }
     return billArr;

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m

@@ -221,7 +221,7 @@ typedef enum : NSUInteger {
     self.shopDetail.merchandise = self.productNameStr;
     
     self.shopDetail.packageSpecification = packageSpecification.text;
-    self.shopDetail.packageQpcStr = self.packageQpcStr;
+    self.shopDetail.packageQpcStr = [NSString stringWithFormat:@"1*%@",packageSpecification.text];
     self.shopDetail.packageQpcUnit = self.productMeasureUnit;
 
     self.shopDetail.packageUnit = self.packageUintStr;
@@ -407,7 +407,6 @@ typedef enum : NSUInteger {
             self.productNameStr = product.name;
             self.productUuidStr = product.uuid;
             self.productCodeStr = product.code;
-            self.packageQpcStr = product.qpcStr;
             self.productMeasureUnit = product.measureUnit;
             if (self.selectProducts.count > 0) {
                 [self.selectProducts removeAllObjects];

XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m

@@ -33,7 +33,7 @@ typedef enum : NSUInteger {
     UITextField *_leftmoneyField;
     HPGrowingTextView *_noteTextView;
 }
-
+@property (nonatomic,strong)NSString *selectStr;
 @end
 
 @implementation NewCostViewController
@@ -233,6 +233,8 @@ typedef enum : NSUInteger {
     _leftmoneyField.text = [self.accountDetail.leftmoney stringValue];
     _noteTextView.text = self.accountDetail.note;
     
+    self.selectStr = self.accountDetail.accounttitle;
+    
 }
 - (void)textChange:(UITextField *)textField{
     if (_actualmoneyField.text.length > 0 && _paidmoneyField.text.length > 0   ) {
@@ -247,11 +249,15 @@ typedef enum : NSUInteger {
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     if(indexPath.row == 0){
         ChooseCostViewController *cvc = [ChooseCostViewController new];
+        if (self.selectStr.length > 0) {
+            cvc.selectStr = self.selectStr;
+        }
         cvc.choseBaseInfo = ^(NSArray *costs){
             if (costs.count > 0) {
                 Accounttitle *type = costs[0];
                 _chooseCostLabel.text = type.name;
                 _chooseCostLabel.textColor = GXF_CONTENT_COLOR;
+                self.selectStr = type.name;
             }
         };
         [self PushViewController:cvc animated:YES];