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