Skip to content

X
xffruit
Commit 372eed79 authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

细节

parent ec8e277a
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 66 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ 372eed79
......@@ -3040,7 +3040,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
......@@ -3078,7 +3078,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
......@@ -3102,7 +3102,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -3123,7 +3123,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......@@ -3146,7 +3146,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......@@ -3166,7 +3166,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......
XFFruit/ViewControllers/Purchase/Views/ProductBillCell.h
View file @ 372eed79
......@@ -33,6 +33,5 @@
@property (nonatomic,assign)BOOL isShowShipping;//是否发运
- (void)setBillProduct:(PurchaseBillProduct *)billProduct row:(NSInteger)row;
- (void)setNoticeProduct:(PurchaseBillProduct *)billProduct row:(NSInteger)row;
@end
XFFruit/ViewControllers/PurchaseNotice/Controllers/FollowUpRecordViewController.m
View file @ 372eed79
......@@ -24,6 +24,7 @@
- (void)bulidLayout{
self.productArr=[[NSMutableArray alloc]initWithObjects:@"",@"", nil];
self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, ScreenSize.height) style:(UITableViewStylePlain)];
self.tableView.backgroundColor = [UIColor clearColor];
self.tableView.delegate = self;
self.tableView.dataSource = self;
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
View file @ 372eed79
......@@ -151,14 +151,12 @@ typedef enum : NSUInteger {
_tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, LeftMargin,ScreenSize.width, ScreenSize.height/3-LeftMargin)) style:(UITableViewStylePlain)];
_tableView.backgroundColor = [UIColor whiteColor];
_tableView.tag=1001;
_tableView.bounces = NO;
_tableView.delegate = self;
_tableView.dataSource = self;
mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_tableView.frame.size.height, ScreenSize.width, ScreenSize.height-_tableView.height-ScreenSize.height/5)];
mingXiTableView.backgroundColor = [UIColor whiteColor];
mingXiTableView.tag=1002;
mingXiTableView.bounces=NO;
mingXiTableView.delegate=self;
mingXiTableView.dataSource=self;
......@@ -216,8 +214,6 @@ typedef enum : NSUInteger {
[footView3 addSubview:self.HeardLabel];
[footView3 addSubview:self.FootLabel];
mingXiTableView.tableFooterView = footView3;
mingXiTableView.tableHeaderView=footView2;
[self.view addSubview:_tableView];
......@@ -272,12 +268,9 @@ typedef enum : NSUInteger {
Cell = [[PurchaseNoticeCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellID];
tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
Cell.selectionStyle = UITableViewCellSelectionStyleNone;
// Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;向左箭头
// [self showShopDetail:Cell indexPath:indexPath];
}
[self showShopDetail:Cell indexPath:indexPath];
if (Cell.isSelected==YES) {
if ([self comperIndexpath:indexPath]) {
Cell.arrowView.image = [UIImage imageNamed:@"arrowdown"];
Cell.backgroundColor=XXFBgColor;
Cell.subSview.hidden=NO;
......@@ -337,17 +330,16 @@ typedef enum : NSUInteger {
}else if ([tableView isEqual:mingXiTableView])
{
PurchaseNoticeCell *Cell=(PurchaseNoticeCell*)[mingXiTableView cellForRowAtIndexPath:indexPath ];
if (Cell.isSelected==NO) {
if (![self comperIndexpath:indexPath]) {
Cell.isSelected=YES;
Cell.subSview.hidden = NO;
[selectCellAry addObject:indexPath];
}else{
Cell.isSelected=NO;
Cell.subSview.hidden = YES;
[selectCellAry removeObject:indexPath];
}
selectedCellIndexPath = indexPath;
[mingXiTableView reloadData];
}
}
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m
View file @ 372eed79
......@@ -142,7 +142,6 @@ typedef enum : NSUInteger {
[self createMingXiTableView];//自定义
}
- (void)hiddenBottomBtn{
_endBtn.hidden = YES;
_rejectBtn.hidden = YES;
CGRect scrollViewFrame = _scrollView.frame;
......@@ -269,7 +268,7 @@ typedef enum : NSUInteger {
}
- (void)createMingXiTableView
{
_bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_purchaseView.frame) + TopMargin, ScreenSize.width, 200)];
_bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_purchaseView.frame) + TopMargin, ScreenSize.width, 300)];
_bottomView.backgroundColor = [UIColor whiteColor];
[_scrollView addSubview:_bottomView];
......@@ -365,16 +364,10 @@ typedef enum : NSUInteger {
- (void)setNoteHeight
{
CGFloat height = [self.noteLabel calculateHeight];
self.noteLabel.height = height;
CGRect noteFrame = self.noteLabel.frame;
noteFrame.size.height = height;
self.noteLabel.frame = noteFrame;
CGFloat totalHeight = height + LeftHeight*_leftArr.count;
CGRect purchaseFrame = _purchaseView.frame;
purchaseFrame.size.height = totalHeight;
_purchaseView.frame = purchaseFrame;
CGFloat totalHeight = height + LeftHeight *_leftArr.count;
_purchaseView.height = totalHeight;
CGRect bottomFrame = _bottomView.frame;
bottomFrame.origin.y = CGRectGetMaxY(_purchaseView.frame) + TopMargin;
......@@ -416,12 +409,10 @@ typedef enum : NSUInteger {
Cell.isButtonhidden=YES;
tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
Cell.selectionStyle = UITableViewCellSelectionStyleNone;
// Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;向左箭头
// [self showShopDetail:Cell indexPath:indexPath];
}
[self showShopDetail:Cell indexPath:indexPath];
if (Cell.isSelected==YES) {
if ([self comperIndexpath:indexPath]) {
Cell.arrowView.image = [UIImage imageNamed:@"arrowdown"];
Cell.button.hidden=YES;
Cell.backgroundColor=XXFBgColor;
......@@ -443,9 +434,6 @@ typedef enum : NSUInteger {
return nil;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
if ([tableView isEqual:mingXiTableView])
{
if ([self comperIndexpath:indexPath]) {
......@@ -462,17 +450,16 @@ typedef enum : NSUInteger {
if ([tableView isEqual:mingXiTableView])
{
PurchaseNoticeCell *Cell=(PurchaseNoticeCell*)[mingXiTableView cellForRowAtIndexPath:indexPath ];
if (Cell.isSelected==NO) {
if (![self comperIndexpath:indexPath]) {
Cell.isSelected=YES;
Cell.subSview.hidden = NO;
[selectCellAry addObject:indexPath];
}else{
Cell.isSelected=NO;
Cell.subSview.hidden = YES;
[selectCellAry removeObject:indexPath];
}
selectedCellIndexPath = indexPath;
[mingXiTableView reloadData];
}
}
......
XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeCell.m
View file @ 372eed79
......@@ -90,7 +90,7 @@
// }
lable.text=[array objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
[lable setTextColor:GXF_CONTENT_COLOR];
[lable setTextColor:GXF_PLACEHOLDER_COLOR];
[self.subSview addSubview:lable];
UILabel*shopeLable= [self.shopDetailAry1 objectAtIndex:i];
......@@ -101,7 +101,7 @@
}
shopeLable.font=FontSize(TitleSize-2);
[shopeLable setTextColor:GXF_CONTENT_COLOR];
[shopeLable setTextColor:GXF_PLACEHOLDER_COLOR];
// shopeLable.backgroundColor=[UIColor redColor];
[self.subSview addSubview:shopeLable];
}
......@@ -110,13 +110,13 @@
lable.text=[array1 objectAtIndex:i];
lable.font=FontSize(TitleSize-2);
[lable setTextColor:GXF_CONTENT_COLOR];
[lable setTextColor:GXF_PLACEHOLDER_COLOR];
[self.subSview addSubview:lable];
UILabel*shopeLable= [self.shopDetailAry2 objectAtIndex:i];
shopeLable.frame=CGRectMake(lable.frame.origin.x-LeftMargin+lable.frame.size.width, lable.frame.origin.y,(ScreenSize.width-2*LeftMargin)/4, 10);
shopeLable.font=FontSize(TitleSize-2);
[shopeLable setTextColor:GXF_CONTENT_COLOR];
[shopeLable setTextColor:GXF_PLACEHOLDER_COLOR];
// shopeLable.backgroundColor=[UIColor redColor];
[self.subSview addSubview:shopeLable];
}
......@@ -129,7 +129,7 @@
self.button.hidden=YES;
}
[self.contentView addSubview:self.button];
[self.contentView addSubview:self.subSview];
[self.contentView addSubview:self.subSview];
[self.contentView addSubview:self.SpLabel];
[self.contentView addSubview:self.DjLabel];
[self.contentView addSubview:self.BzslLabel];
......
XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeListCell.m
View file @ 372eed79
......@@ -80,7 +80,7 @@
stateStr = @"未接受";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([purchaseNotice.state isEqualToString:PURCHASENOTICE_STATE_PURCHASEING]) {
stateStr = @"采购中";
stateStr = @"发运中";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([purchaseNotice.state isEqualToString:PURCHASE_STATE_FINISHED]) {
stateStr = @"已完成";
......
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @ 372eed79
......@@ -70,9 +70,9 @@ typedef enum : NSUInteger {
_dataArr = [NSMutableArray array];
self.users = [NSMutableArray array];
[_dataArr addObject:@"商品"];
[_dataArr addObject:@"包装单位"];
[_dataArr addObject:@"包装规格"];
[_dataArr addObject:@"包装数量"];
[_dataArr addObject:@"包装单位"];
[_dataArr addObject:@"基础数量"];
[_dataArr addObject:@"基础单价"];
[_dataArr addObject:@"包装单价"];
......@@ -243,7 +243,7 @@ typedef enum : NSUInteger {
cell = [[SurveyCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
if (indexPath.row==0||indexPath.row==3) {
if (indexPath.row==0||indexPath.row==1) {
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
}
[self createViewInCell:cell indexPath:indexPath];
......@@ -253,7 +253,7 @@ typedef enum : NSUInteger {
}
- (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
if (indexPath.row == 0||indexPath.row==3) {
if (indexPath.row == 0||indexPath.row==1) {
UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight))];
contentLabel.textAlignment= NSTextAlignmentRight;
contentLabel.textColor = GXF_PLACEHOLDER_COLOR;
......@@ -262,7 +262,7 @@ typedef enum : NSUInteger {
if (indexPath.row==0) {
_productLabel = contentLabel;
contentLabel.text = @"选择商品";
}else if (indexPath.row==3)
}else if (indexPath.row==1)
{
_PackagingLable = contentLabel;
contentLabel.text = @"选择包装单位";
......@@ -277,10 +277,10 @@ typedef enum : NSUInteger {
textField.returnKeyType = UIReturnKeyDone;
textField.delegate = self;
[cell.contentView addSubview:textField];
if (indexPath.row==1) {
if (indexPath.row==2) {
packageSpecification=textField;//包装规格
textField.placeholder = @"输入包装规格";
}else if (indexPath.row==2)
}else if (indexPath.row==3)
{
packageQuantity=textField; //包装数量
textField.placeholder = @"输入包装数量";
......@@ -290,8 +290,8 @@ typedef enum : NSUInteger {
textField.placeholder = @"输入基础数量";
}else if (indexPath.row==5)
{
foundationUnitPrice=textField; //基础单价
textField.placeholder = @"输入基础单价";
foundationUnitPrice=textField; //基础单价
textField.frame = CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-30, TableHeight);
UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMaxX(textField.frame) + 5, 0, 20, TableHeight)];
label.text = @"元";
......@@ -300,8 +300,8 @@ typedef enum : NSUInteger {
[cell.contentView addSubview:label];
}else if (indexPath.row==6)
{
packageUnitPrice=textField; //包装单价
textField.placeholder = @"输入包装单价";
packageUnitPrice=textField; //包装单价
textField.frame = CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-30, TableHeight);
UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMaxX(textField.frame) + 5, 0, 20, TableHeight)];
label.text = @"元";
......@@ -310,8 +310,9 @@ typedef enum : NSUInteger {
[cell.contentView addSubview:label];
}else if (indexPath.row==7)
{
totalMoney=textField; //总金额
textField.placeholder = @"输入总金额";
totalMoney=textField; //总金额
textField.text = @"0";
textField.frame = CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-30, TableHeight);
textField.textColor = [UIColor redColor];
......@@ -346,7 +347,7 @@ typedef enum : NSUInteger {
};
cvc.isMoreChose = NO;
[self PushViewController:cvc animated:YES];
}else if (indexPath.row ==3)
}else if (indexPath.row ==1)
{
ChooseProductUnitViewController *cvc = [ChooseProductUnitViewController new];
cvc.choseBaseInfo = ^(NSArray *products){
......
XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m
View file @ 372eed79
......@@ -264,19 +264,10 @@ typedef enum : NSUInteger {
}
- (void)createBottomView{
_bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_transportView.frame) + TopMargin, ScreenSize.width, 300)];
_bottomView.backgroundColor = [UIColor whiteColor];
[_scrollView addSubview:_bottomView];
_transView = [[BottomTransportView alloc]initWithFrame:_bottomView.bounds withHidden:YES];
// _transView.backgroundColor = [UIColor redColor];
[_bottomView addSubview:_transView];
// _tpv = [[TransportProductViewController alloc]init];
// [self addChildViewController:_tpv];
//
// _tpv.viewFrame = _bottomView.bounds;
// _tpv.isHiddenEdit = YES;
// [_bottomView addSubview:_tpv.view];
}
......
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