Skip to content

X
xffruit
Commit 9542913c authored by zhu's avatar zhu
Browse files
Options

no message

parent cbc3d2f0
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 28 deletions
Podfile.lock
View file @ 9542913c
......@@ -29,11 +29,11 @@ PODS:
- FMDB/common
- IQKeyboardManager (3.2.4)
- MBProgressHUD (0.9.1)
- MJRefresh (2.2.0)
- MJRefresh (2.2.1)
- Reveal-iOS-SDK (1.5.1)
- SDWebImage (3.7.2):
- SDWebImage/Core (= 3.7.2)
- SDWebImage/Core (3.7.2)
- SDWebImage (3.7.3):
- SDWebImage/Core (= 3.7.3)
- SDWebImage/Core (3.7.3)
- SSKeychain (1.2.3)
DEPENDENCIES:
......@@ -55,9 +55,9 @@ SPEC CHECKSUMS:
FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f
Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
COCOAPODS: 0.37.1
COCOAPODS: 0.38.2
XFFruit.xcodeproj/project.pbxproj
View file @ 9542913c
......@@ -3197,8 +3197,8 @@
baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
......@@ -3208,7 +3208,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -3218,8 +3218,8 @@
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
......@@ -3229,7 +3229,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......@@ -3238,8 +3238,8 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
......@@ -3252,7 +3252,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
PROVISIONING_PROFILE = "2fa95960-d007-48b7-90a8-85831ed9bc43";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......@@ -3262,8 +3262,8 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
......@@ -3272,7 +3272,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
PROVISIONING_PROFILE = "2fa95960-d007-48b7-90a8-85831ed9bc43";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
View file @ 9542913c
......@@ -432,7 +432,7 @@ typedef enum : NSUInteger {
{
NoticeProduct *noticeProduct=[_shopeArr objectAtIndex:indexPath.row];
Cell.SpLabel.text=noticeProduct.productName;//商品
Cell.shopeName.text=[NSString stringWithFormat:@"%@[%@]",noticeProduct.productName,noticeProduct.productCode];
Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
Cell.BzslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m
View file @ 9542913c
......@@ -496,7 +496,7 @@ typedef enum : NSUInteger {
{
NoticeProduct *noticeProduct=[_shopeArr objectAtIndex:indexPath.row];
Cell.SpLabel.text=noticeProduct.productName;//商品
Cell.shopeName.text=[NSString stringWithFormat:@"%@[%@]",noticeProduct.productName,noticeProduct.productCode];
Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
Cell.BzslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
......
XFFruit/ViewControllers/PurchaseNotice/Views/NoticeDetailCell.h
View file @ 9542913c
......@@ -21,6 +21,7 @@
@property (nonatomic, assign) BOOL isSelected;
@property (nonatomic,strong)UIButton *button;
@property (nonatomic,assign)BOOL isButtonhidden;
@property (nonatomic,strong)UILabel *shopeName;//商品
@property (nonatomic,strong)UILabel *packageSpecification;//包装规格
@property (nonatomic,strong)UILabel *packageQuantity;//包装数量
@property (nonatomic,strong)UILabel *packageUnit;//包装单位
......
XFFruit/ViewControllers/PurchaseNotice/Views/NoticeDetailCell.m
View file @ 9542913c
......@@ -28,6 +28,7 @@
}
-(void)initdata
{
self.shopeName=[[UILabel alloc]init];//商品
self.packageSpecification=[[UILabel alloc]init];//包装规格
self.packageQuantity=[[UILabel alloc]init];;//包装数量
self.packageUnit=[[UILabel alloc]init]; ;//包装单位
......@@ -42,6 +43,10 @@
- (void)bulidLayout
{
CGFloat gipWidth = (ScreenSize.width-(LeftMargin+20)-RightWidth-2)/4;
self.shopeName.textAlignment= NSTextAlignmentLeft;
self.shopeName.textColor = GXF_PLACEHOLDER_COLOR;
self.shopeName.font = FontSize(TitleSize-2);
self.HeardLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin * 2, 1))];
self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
......@@ -86,12 +91,18 @@
NSArray*array=[NSArray arrayWithObjects:@"包装规格:",@"基础数量:" ,@"备注:",nil];
NSArray*array1=[NSArray arrayWithObjects:@"包装数量:",@"包装单位:" ,nil];
UILabel *shopeNameLable=[[UILabel alloc]init];
shopeNameLable.frame=CGRectMake(LeftWidth, 0, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
shopeNameLable.text=@"商品:";
shopeNameLable.font=FontSize(TitleSize-2);
[shopeNameLable setTextColor:GXF_PLACEHOLDER_COLOR];
[self.subSview addSubview:shopeNameLable];
self.shopeName.frame=CGRectMake(shopeNameLable.frame.origin.x+shopeNameLable.frame.size.width, shopeNameLable.frame.origin.y,(self.contentView.width-2*LeftMargin)/4*3, TableHeight*2/4);
[self.subSview addSubview:self.shopeName];
for (int i=0; i<array.count; i++) {
UILabel *lable=[[UILabel alloc]init];
// if (i==0) {
lable.frame=CGRectMake(LeftWidth, i*TableHeight*2/4, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
lable.frame=CGRectMake(LeftWidth, i*TableHeight*2/4+TableHeight/2, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
// }
lable.text=[array objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
......@@ -111,7 +122,7 @@
[self.subSview addSubview:shopeLable];
}
for (int i=0; i<array1.count; i++) {
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(LeftWidth+(self.contentView.width-2*LeftMargin)/2, i*TableHeight*2/4, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4)];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(LeftWidth+(self.contentView.width-2*LeftMargin)/2, i*TableHeight*2/4+TableHeight/2, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4)];
lable.text=[array1 objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
......
XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeCell.h
View file @ 9542913c
......@@ -20,6 +20,7 @@
@property (nonatomic, assign) BOOL isSelected;
@property (nonatomic,strong)UIButton *button;
@property (nonatomic,assign)BOOL isButtonhidden;
@property (nonatomic,strong)UILabel *shopeName;//商品
@property (nonatomic,strong)UILabel *packageSpecification;//包装规格
@property (nonatomic,strong)UILabel *packageQuantity;//包装数量
@property (nonatomic,strong)UILabel *packageUnit;//包装单位
......
XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeCell.m
View file @ 9542913c
......@@ -28,6 +28,7 @@
}
-(void)initdata
{
self.shopeName=[[UILabel alloc]init];//商品
self.packageSpecification=[[UILabel alloc]init];//包装规格
self.packageQuantity=[[UILabel alloc]init];;//包装数量
self.packageUnit=[[UILabel alloc]init]; ;//包装单位
......@@ -42,6 +43,9 @@
- (void)bulidLayout
{
CGFloat gipWidth = (ScreenSize.width-(LeftMargin+20)-RightWidth-2)/3;
self.shopeName.textAlignment= NSTextAlignmentLeft;
self.shopeName.textColor = GXF_PLACEHOLDER_COLOR;
self.shopeName.font = FontSize(TitleSize-2);
self.HeardLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin * 2, 1))];
self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
self.HeardLabel.font = FontSize(TitleSize);
......@@ -81,12 +85,19 @@
NSArray*array=[NSArray arrayWithObjects:@"包装规格:",@"基础数量:" ,@"备注:",nil];
NSArray*array1=[NSArray arrayWithObjects:@"包装数量:",@"包装单位:" ,nil];
UILabel *shopeNameLable=[[UILabel alloc]init];
shopeNameLable.frame=CGRectMake(LeftWidth, 0, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
shopeNameLable.text=@"商品:";
shopeNameLable.font=FontSize(TitleSize-2);
[shopeNameLable setTextColor:GXF_PLACEHOLDER_COLOR];
[self.subSview addSubview:shopeNameLable];
self.shopeName.frame=CGRectMake(shopeNameLable.frame.origin.x+shopeNameLable.frame.size.width, shopeNameLable.frame.origin.y,(self.contentView.width-2*LeftMargin)/4*3, TableHeight*2/4);
[self.subSview addSubview:self.shopeName];
for (int i=0; i<array.count; i++) {
UILabel *lable=[[UILabel alloc]init];
// if (i==0) {
lable.frame=CGRectMake(LeftWidth, i*TableHeight*2/4, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
lable.frame=CGRectMake(LeftWidth, i*TableHeight*2/4+TableHeight/2, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4);
// }
lable.text=[array objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
......@@ -106,7 +117,7 @@
[self.subSview addSubview:shopeLable];
}
for (int i=0; i<array1.count; i++) {
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(LeftWidth+(self.contentView.width-2*LeftMargin)/2, i*TableHeight*2/4, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4)];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(LeftWidth+(self.contentView.width-2*LeftMargin)/2, i*TableHeight*2/4+TableHeight/2, (self.contentView.width-2*LeftMargin)/4, TableHeight*2/4)];
lable.text=[array1 objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment