Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
万
万科
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
张杰
万科
Commits
e033334b
Commit
e033334b
authored
Feb 03, 2016
by
Achilles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页 客流 车流 日期不对。
parent
2e6a48b1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
9 deletions
+14
-9
VankeProjectListModel.h
vanke/model/VankeProjectListModel.h
+3
-0
VankeProjectListModel.m
vanke/model/VankeProjectListModel.m
+3
-1
VankeFloorListBoard_iPhone.h
..._iPhone/templates/floor-list/VankeFloorListBoard_iPhone.h
+2
-0
VankeFloorListBoard_iPhone.m
..._iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
+3
-1
VankeMainBoard_iPhone.m
vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
+2
-6
VankeServiceDashBoard_iPhone.m
...view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
+1
-1
No files found.
vanke/model/VankeProjectListModel.h
View file @
e033334b
...
...
@@ -19,6 +19,9 @@
// 销量日期,默认为昨天
@property
(
nonatomic
,
strong
)
NSString
*
salesDateEquals
;
// 客流日期,默认为今天
@property
(
nonatomic
,
strong
)
NSString
*
passengerDateEquals
;
// 项目列表
@property
(
nonatomic
,
strong
)
NSMutableArray
*
projects
;
...
...
vanke/model/VankeProjectListModel.m
View file @
e033334b
...
...
@@ -17,6 +17,7 @@
@synthesize
classificationEquals
=
_classificationEquals
;
@synthesize
nameLike
=
_nameLike
;
@synthesize
salesDateEquals
=
_salesDateEquals
;
@synthesize
passengerDateEquals
=
_passengerDateEquals
;
@synthesize
projects
=
_projects
;
-
(
void
)
load
...
...
@@ -31,6 +32,7 @@
self
.
classificationEquals
=
nil
;
self
.
name
=
nil
;
self
.
salesDateEquals
=
nil
;
self
.
passengerDateEquals
=
nil
;
self
.
projects
=
nil
;
}
...
...
@@ -83,7 +85,7 @@
api
.
classificationEquals
=
self
.
classificationEquals
;
api
.
nameLike
=
self
.
nameLike
;
api
.
salesDateEquals
=
self
.
salesDateEquals
;
api
.
passengerDateEquals
=
self
.
sales
DateEquals
;
api
.
passengerDateEquals
=
self
.
passenger
DateEquals
;
api
.
trafficDateEquals
=
self
.
salesDateEquals
;
api
.
whenUpdate
=
^
...
...
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.h
View file @
e033334b
...
...
@@ -25,6 +25,8 @@ AS_OUTLET( BeeUISearchBar, searchBar);
@property
(
strong
,
nonatomic
)
NSString
*
projectNameLike
;
// 销售日期
@property
(
strong
,
nonatomic
)
NSString
*
salesDate
;
// 客流日期
@property
(
strong
,
nonatomic
)
NSString
*
passengerDate
;
+
(
id
)
boardWithType
:
(
CellType
)
type
;
...
...
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
View file @
e033334b
...
...
@@ -27,6 +27,7 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
@synthesize
projectCategory
=
_projectCategory
;
@synthesize
projectNameLike
=
_projectNameLike
;
@synthesize
salesDate
=
_salesDate
;
@synthesize
passengerDate
=
_passengerDate
;
@synthesize
listType
=
_listType
;
DEF_MODEL
(
VankeProjectListModel
,
model
);
...
...
@@ -132,6 +133,7 @@ ON_CREATE_VIEWS( signal )
self
.
model
.
classificationEquals
=
_projectCategory
;
self
.
model
.
nameLike
=
_projectNameLike
;
self
.
model
.
salesDateEquals
=
_salesDate
;
self
.
model
.
passengerDateEquals
=
_passengerDate
;
_searchBar
.
text
=
_projectNameLike
;
}
...
...
@@ -196,7 +198,7 @@ ON_SIGNAL3( VankePassengerListBoardCell_iPhone, mask, signal )
if
(
self
.
listType
==
CELL_TYPE_PASSENGER
)
{
VankePassengerDetailBoard_iPhone
*
board
=
[
VankePassengerDetailBoard_iPhone
board
];
board
.
data
=
cellValue
.
project
;
board
.
passengerFlowDate
=
_
sales
Date
;
board
.
passengerFlowDate
=
_
passenger
Date
;
board
.
theme
=
self
.
theme
;
[
self
.
stack
pushBoard
:
board
animated
:
YES
];
}
else
{
...
...
vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m
View file @
e033334b
...
...
@@ -251,12 +251,8 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
board
.
projectNameLike
=
nameLike
;
}
if
(
type
==
CELL_TYPE_FLOOR
)
{
board
.
salesDate
=
_summaryModel
.
salesDate
;
}
else
{
board
.
salesDate
=
[
self
today
];
}
board
.
salesDate
=
_summaryModel
.
salesDate
;
board
.
passengerDate
=
_summaryModel
.
passengerDate
;
[
self
.
stack
pushBoard
:
board
animated
:
YES
];
}
...
...
vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
View file @
e033334b
...
...
@@ -60,7 +60,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
{
self
.
salesInfo
.
imgRightBg
.
backgroundColor
=
[
UIColor
colorWithRed
:
237
/
255
.
0
green
:
27
/
255
.
0
blue
:
35
/
255
.
0
alpha
:
1
];
[
self
.
passenger
loadDefaults
:
@"people.png"
title
:
@"当前客流"
bgColor
:
[
UIColor
colorWithRed
:
0
green
:
195
/
255
.
0
blue
:
230
/
255
.
0
alpha
:
1
]
unit
:
@"人"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
traffic
loadDefaults
:
@"car.png"
title
:
@"车流"
bgColor
:
[
UIColor
colorWithRed
:
79
/
255
.
0
green
:
143
/
255
.
0
blue
:
248
/
255
.
0
alpha
:
1
]
unit
:
@"
人
"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
traffic
loadDefaults
:
@"car.png"
title
:
@"车流"
bgColor
:
[
UIColor
colorWithRed
:
79
/
255
.
0
green
:
143
/
255
.
0
blue
:
248
/
255
.
0
alpha
:
1
]
unit
:
@"
次
"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
energy
loadDefaults
:
@"energy.png"
title
:
@"坪效"
bgColor
:
[
UIColor
colorWithRed
:
149
/
255
.
0
green
:
200
/
255
.
0
blue
:
8
/
255
.
0
alpha
:
1
]
unit
:
@"元"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
[
self
.
complaint
loadDefaults
:
@"complaint.png"
title
:
@"WIFI登录数"
bgColor
:
[
UIColor
colorWithRed
:
252
/
255
.
0
green
:
67
/
255
.
0
blue
:
62
/
255
.
0
alpha
:
1
]
unit
:
@"次"
defValue
:
[
NSNumber
numberWithInt
:
0
]];
}
...
...
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