Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
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
张杰
Opple-iOS
Commits
bc97f64a
Commit
bc97f64a
authored
Jun 02, 2016
by
勾芒
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
330971f1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
132 additions
and
77 deletions
+132
-77
ProductLibraryViewController.m
Lighting/Class/ProductLibraryViewController.m
+7
-1
StoryboardwithCYX.storyboard
Lighting/Lighting/StoryboardwithCYX.storyboard
+1
-1
ProductScreeningCollectionViewCell.h
Lighting/Tools/ProductScreeningCollectionViewCell.h
+6
-1
ProductScreeningCollectionViewCell.m
Lighting/Tools/ProductScreeningCollectionViewCell.m
+9
-4
SceneSectionHeaderView.m
Lighting/Tools/SceneSectionHeaderView.m
+5
-0
SceneViewController.m
Lighting/Tools/SceneViewController.m
+102
-68
ScreeningTableViewCell.m
Lighting/Tools/ScreeningTableViewCell.m
+2
-2
No files found.
Lighting/Class/ProductLibraryViewController.m
View file @
bc97f64a
...
...
@@ -281,7 +281,6 @@
NSArray
*
spacrArray
=
[
weakSelf
.
selectedCode
componentsSeparatedByString
:
@"到"
];
weakSelf
.
condtionModel
.
startprice
=
[
NSNumber
numberWithInteger
:[[
spacrArray
objectAtIndex_opple
:
0
]
integerValue
]];
weakSelf
.
condtionModel
.
endprice
=
[
NSNumber
numberWithInteger
:[[
spacrArray
objectAtIndex_opple
:
1
]
integerValue
]];
weakSelf
.
condtionModel
.
categoryEquals
=
_selectedCode
;
}
break
;
...
...
@@ -616,6 +615,13 @@
self
.
selectedCode
=
title
;
}
else
{
self
.
condtionModel
.
styleEquals
=
nil
;
self
.
condtionModel
.
spaceEquals
=
nil
;
self
.
condtionModel
.
categoryEquals
=
nil
;
self
.
condtionModel
.
startprice
=
nil
;
self
.
condtionModel
.
endprice
=
nil
;
self
.
condtionModel
.
materialEqueals
=
nil
;
self
.
selectedCode
=
typecode
;
}
[
self
.
productCollectionView
.
mj_header
beginRefreshing
];
...
...
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @
bc97f64a
...
...
@@ -3477,7 +3477,7 @@
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"236"
height=
"210"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<subviews>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
id=
"Wom-Bb-RIf"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
i
mage=
"登录"
i
d=
"Wom-Bb-RIf"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"236"
height=
"125"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<color
key=
"backgroundColor"
red=
"0.9882352941176471"
green=
"0.97254901960784312"
blue=
"0.93725490196078431"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
...
...
Lighting/Tools/ProductScreeningCollectionViewCell.h
View file @
bc97f64a
...
...
@@ -7,7 +7,7 @@
//
#import <UIKit/UIKit.h>
#import "TOGoodsEntityModel.h"
@interface
ProductScreeningCollectionViewCell
:
UICollectionViewCell
...
...
@@ -31,4 +31,9 @@
*/
@property
(
weak
,
nonatomic
)
IBOutlet
UILabel
*
goodsPrice
;
/**
* 数据源
*/
@property
(
nonatomic
,
strong
)
TOGoodsEntityModel
*
model
;
@end
Lighting/Tools/ProductScreeningCollectionViewCell.m
View file @
bc97f64a
...
...
@@ -10,9 +10,14 @@
@implementation
ProductScreeningCollectionViewCell
/**
* 商品图片
*/
-
(
void
)
setModel
:(
TOGoodsEntityModel
*
)
model
{
_model
=
model
;
NSArray
*
images
=
[
_model
.
pictures
componentsSeparatedByString
:
@","
];
[
self
.
goodsImageView
sd_setImageWithURL
:[
NSURL
URLWithString
:[
images
firstObject
]]
placeholderImage
:
REPLACEIMAGE
];
self
.
goodsName
.
text
=
_model
.
name
;
self
.
goodsSpecifications
.
text
=
_model
.
code
;
self
.
goodsPrice
.
text
=
[
NSString
stringWithFormat
:
@"¥%@"
,[
_model
.
tagPrice
stringValue
]];
}
@end
Lighting/Tools/SceneSectionHeaderView.m
View file @
bc97f64a
...
...
@@ -34,6 +34,11 @@
UIView
*
lineView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
54
,
100
,
1
)];
lineView
.
backgroundColor
=
kTCColor
(
221
,
221
,
221
);
[
self
addSubview
:
lineView
];
//横线
UIView
*
newLineView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
100
,
1
)];
newLineView
.
backgroundColor
=
kTCColor
(
221
,
221
,
221
);
[
self
addSubview
:
newLineView
];
}
return
self
;
}
...
...
Lighting/Tools/SceneViewController.m
View file @
bc97f64a
This diff is collapsed.
Click to expand it.
Lighting/Tools/ScreeningTableViewCell.m
View file @
bc97f64a
...
...
@@ -21,8 +21,8 @@
if
(
self
=
[
super
initWithStyle
:
style
reuseIdentifier
:
reuseIdentifier
])
{
self
.
screeningLabe
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
100
,
55
)];
self
.
screeningLabe
.
textColor
=
k
TCColor
(
170
,
170
,
170
)
;
self
.
screeningLabe
.
font
=
[
UIFont
systemFontOfSize
:
1
3
];
self
.
screeningLabe
.
textColor
=
k
MainBlueColor
;
self
.
screeningLabe
.
font
=
[
UIFont
systemFontOfSize
:
1
0
];
self
.
screeningLabe
.
textAlignment
=
NSTextAlignmentCenter
;
[
self
.
contentView
addSubview
:
self
.
screeningLabe
];
}
...
...
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