Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
xffruit
Commits
381594c8
Commit
381594c8
authored
Sep 02, 2015
by
zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
51d78232
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
69 additions
and
144 deletions
+69
-144
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+60
-39
NewPurchaseNoticeViewController.m
...chaseNotice/Controllers/NewPurchaseNoticeViewController.m
+1
-1
SelectCompanyViewController.m
...ollers/PurchaseNotice/Views/SelectCompanyViewController.m
+6
-3
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+1
-101
ChooseProductViewController.m
...trollers/Survey/controllers/ChooseProductViewController.m
+1
-0
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
381594c8
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
View file @
381594c8
...
...
@@ -374,7 +374,7 @@ typedef enum : NSUInteger {
ShopDetaileViewController
*
svc
=
[[
ShopDetaileViewController
alloc
]
init
];
svc
.
title
=
[
IBTCommon
localizableString
:
@"AddShopDetail"
];
[
self
PushViewController
:
svc
animated
:
YES
];
NSLog
(
@"1111111111"
);
}
//编辑
-
(
void
)
didtoucher
...
...
XFFruit/ViewControllers/PurchaseNotice/Views/SelectCompanyViewController.m
View file @
381594c8
...
...
@@ -35,7 +35,9 @@
self
.
tableView
.
backgroundColor
=
[
UIColor
whiteColor
];
self
.
tableView
.
delegate
=
self
;
self
.
tableView
.
dataSource
=
self
;
[
self
.
view
addSubview
:
self
.
tableView
];
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
}
...
...
@@ -48,10 +50,11 @@
if
(
cell
==
nil
)
{
cell
=
[[
UITableViewCell
alloc
]
initWithStyle
:
UITableViewCellStyleDefault
reuseIdentifier
:
cellID
];
tableView
.
separatorStyle
=
UITableViewCellSeparatorStyleNone
;
//
tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
cell
.
selectionStyle
=
UITableViewCellSelectionStyleNone
;
if
(
indexPath
.
row
>
0
&&
indexPath
.
row
<
_dataArr
.
count
)
{
cell
.
accessoryType
=
UITableViewCellAccessoryDisclosureIndicator
;
if
(
indexPath
.
row
>=
0
&&
indexPath
.
row
<
_dataArr
.
count
)
{
// cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell
.
textAlignment
=
UITextAlignmentCenter
;
cell
.
textLabel
.
text
=
self
.
dataArr
[
indexPath
.
row
];
}
...
...
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
381594c8
...
...
@@ -59,7 +59,6 @@ typedef enum : NSUInteger {
[
super
viewDidLoad
];
self
.
title
=
self
.
navTitle
;
[
self
initData
];
// [self createTableView];
[
self
setupSubviews
];
// Do any additional setup after loading the view.
}
...
...
@@ -296,111 +295,12 @@ typedef enum : NSUInteger {
{
_titleField
.
placeholder
=
@"输入备注内容"
;
}
// if (self.survey) {
// _titleField.text = [IBTCommon checkString:self.survey.title];
// self.titleStr = [IBTCommon checkString:self.survey.title];
// }
}
// _titleField = [[UITextField alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
// _titleField.textAlignment = NSTextAlignmentRight;
// _titleField.textColor = HexColor(@"444444");
// _titleField.placeholder = @"输入调研标题";
// _titleField.font = FontSize(15);
// _titleField.returnKeyType = UIReturnKeyDone;
// _titleField.delegate = self;
// [cell.contentView addSubview:_titleField];
// if (self.survey) {
// _titleField.text = [IBTCommon checkString:self.survey.title];
// self.titleStr = [IBTCommon checkString:self.survey.title];
// }
// }else if (indexPath.row == _dataArr.count -1){
// _noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
// _noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
// _noteTextView.minNumberOfLines = 1;
// _noteTextView.maxNumberOfLines = 4;
// _noteTextView.font = FontSize(15);
// _noteTextView.textAlignment = NSTextAlignmentRight;
// _noteTextView.delegate = self;
// _noteTextView.returnKeyType = UIReturnKeyDone;
// _noteTextView.placeholder = @"输入备注内容";
// [cell.contentView addSubview:_noteTextView];
// if (self.survey) {
// _noteTextView.text = [IBTCommon checkString:self.survey.remark];
// self.remarkStr = [IBTCommon checkString:self.survey.remark];
// }
// CGRect lineFrame = cell.lineLabel.frame;
// lineFrame.origin.y = TableHeight*2-1;
// cell.lineLabel.frame = lineFrame;
// }else{
// UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight))];
// contentLabel.textAlignment= NSTextAlignmentRight;
// contentLabel.textColor = HexColor(@"bbbbbb");
// contentLabel.font = FontSize(TitleSize);
// [cell.contentView addSubview:contentLabel];
// if (indexPath.row == 1) {
// contentLabel.text = @"选择商品";
// _productLabel = contentLabel;
// [self preferDataInProductLabel];
// }else if(indexPath.row == 2){
// contentLabel.text = @"选择日期";
// _startDateLabel = contentLabel;
// if (self.survey) {
// if (self.survey.beginDate.length > 9) {
// _startDateLabel.text = [[IBTCommon checkString:self.survey.beginDate]substringToIndex:10];
// }
// _startDateLabel.textColor = HexColor(@"444444");
// self.beginDateStr =[IBTCommon checkString:self.survey.beginDate];
//
// }
// }else if(indexPath.row == 3){
// contentLabel.text = @"选择日期";
// _endDateLabel = contentLabel;
// if (self.survey) {
// if (self.survey.endDate.length > 9) {
// _endDateLabel.text = [[IBTCommon checkString:self.survey.endDate]substringToIndex:10];
// }
// _endDateLabel.textColor = HexColor(@"444444");
// self.endDateStr = [IBTCommon checkString:self.survey.endDate];
// }
// }else if(indexPath.row == 4){
// contentLabel.text = @"选择调研人员";
// _personLabel = contentLabel;
// [self preferDataInPersonLabel];
// }
// }
}
-
(
void
)
tableView
:
(
UITableView
*
)
tableView
didSelectRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
// if (indexPath.row == 2 || indexPath.row == 3) {
// [self keyboardHidden];
// if (indexPath.row == 2) {
// _isClickStart = YES;
// }else{
// _isClickStart = NO;
// }
// [self startDatePickView];
// }else if(indexPath.row == 4){
// ChosePersonViewController *cvc = [ChosePersonViewController new];
// cvc.chosePerson = ^(NSArray *users){
// NSString *textStr = @"";
// if (self.users.count <=0) {
// [self.users removeAllObjects];
// }
// for (SurveyUser *user in users) {
// if (textStr.length == 0) {
// textStr = [textStr stringByAppendingFormat:@"%@",user.userName];
// }else {
// textStr = [textStr stringByAppendingFormat:@"、%@",user.userName];
// }
// [self.users addObject:[user dictForCommit]];
// }
// _personLabel.text = textStr;
// _personLabel.textColor = HexColor(@"444444");
// };
// cvc.isMoreChose = YES;
// [self PushViewController:cvc animated:YES];
// }else
if
(
indexPath
.
row
==
0
){
ChooseProductViewController
*
cvc
=
[
ChooseProductViewController
new
];
cvc
.
choseProduct
=
^
(
Product
*
product
){
...
...
XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m
View file @
381594c8
...
...
@@ -111,6 +111,7 @@
if
(
self
.
dataArr
.
count
>
0
)
{
if
(
_currentIndexPath
)
{
Product
*
product
=
self
.
dataArr
[
_currentIndexPath
.
row
];
//block 回调
self
.
choseProduct
(
product
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment