Commit e033334b authored by Achilles's avatar Achilles

首页 客流 车流 日期不对。

parent 2e6a48b1
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
// 销量日期,默认为昨天 // 销量日期,默认为昨天
@property (nonatomic, strong) NSString *salesDateEquals; @property (nonatomic, strong) NSString *salesDateEquals;
// 客流日期,默认为今天
@property (nonatomic, strong) NSString *passengerDateEquals;
// 项目列表 // 项目列表
@property (nonatomic, strong) NSMutableArray *projects; @property (nonatomic, strong) NSMutableArray *projects;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
@synthesize classificationEquals = _classificationEquals; @synthesize classificationEquals = _classificationEquals;
@synthesize nameLike = _nameLike; @synthesize nameLike = _nameLike;
@synthesize salesDateEquals = _salesDateEquals; @synthesize salesDateEquals = _salesDateEquals;
@synthesize passengerDateEquals = _passengerDateEquals;
@synthesize projects = _projects; @synthesize projects = _projects;
- (void)load - (void)load
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
self.classificationEquals = nil; self.classificationEquals = nil;
self.name = nil; self.name = nil;
self.salesDateEquals = nil; self.salesDateEquals = nil;
self.passengerDateEquals = nil;
self.projects = nil; self.projects = nil;
} }
...@@ -83,7 +85,7 @@ ...@@ -83,7 +85,7 @@
api.classificationEquals = self.classificationEquals; api.classificationEquals = self.classificationEquals;
api.nameLike = self.nameLike; api.nameLike = self.nameLike;
api.salesDateEquals = self.salesDateEquals; api.salesDateEquals = self.salesDateEquals;
api.passengerDateEquals = self.salesDateEquals; api.passengerDateEquals = self.passengerDateEquals;
api.trafficDateEquals = self.salesDateEquals; api.trafficDateEquals = self.salesDateEquals;
api.whenUpdate = ^ api.whenUpdate = ^
......
...@@ -25,6 +25,8 @@ AS_OUTLET( BeeUISearchBar, searchBar); ...@@ -25,6 +25,8 @@ AS_OUTLET( BeeUISearchBar, searchBar);
@property (strong, nonatomic) NSString *projectNameLike; @property (strong, nonatomic) NSString *projectNameLike;
// 销售日期 // 销售日期
@property (strong, nonatomic) NSString *salesDate; @property (strong, nonatomic) NSString *salesDate;
// 客流日期
@property (strong, nonatomic) NSString *passengerDate;
+ (id)boardWithType: (CellType) type; + (id)boardWithType: (CellType) type;
......
...@@ -27,6 +27,7 @@ SUPPORT_AUTOMATIC_LAYOUT(YES) ...@@ -27,6 +27,7 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
@synthesize projectCategory = _projectCategory; @synthesize projectCategory = _projectCategory;
@synthesize projectNameLike = _projectNameLike; @synthesize projectNameLike = _projectNameLike;
@synthesize salesDate = _salesDate; @synthesize salesDate = _salesDate;
@synthesize passengerDate = _passengerDate;
@synthesize listType = _listType; @synthesize listType = _listType;
DEF_MODEL( VankeProjectListModel, model ); DEF_MODEL( VankeProjectListModel, model );
...@@ -132,6 +133,7 @@ ON_CREATE_VIEWS( signal ) ...@@ -132,6 +133,7 @@ ON_CREATE_VIEWS( signal )
self.model.classificationEquals = _projectCategory; self.model.classificationEquals = _projectCategory;
self.model.nameLike = _projectNameLike; self.model.nameLike = _projectNameLike;
self.model.salesDateEquals = _salesDate; self.model.salesDateEquals = _salesDate;
self.model.passengerDateEquals = _passengerDate;
_searchBar.text = _projectNameLike; _searchBar.text = _projectNameLike;
} }
...@@ -196,7 +198,7 @@ ON_SIGNAL3( VankePassengerListBoardCell_iPhone, mask, signal ) ...@@ -196,7 +198,7 @@ ON_SIGNAL3( VankePassengerListBoardCell_iPhone, mask, signal )
if (self.listType == CELL_TYPE_PASSENGER) { if (self.listType == CELL_TYPE_PASSENGER) {
VankePassengerDetailBoard_iPhone * board = [VankePassengerDetailBoard_iPhone board]; VankePassengerDetailBoard_iPhone * board = [VankePassengerDetailBoard_iPhone board];
board.data = cellValue.project; board.data = cellValue.project;
board.passengerFlowDate = _salesDate; board.passengerFlowDate = _passengerDate;
board.theme = self.theme; board.theme = self.theme;
[self.stack pushBoard:board animated:YES]; [self.stack pushBoard:board animated:YES];
} else { } else {
......
...@@ -251,12 +251,8 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) { ...@@ -251,12 +251,8 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
board.projectNameLike = nameLike; board.projectNameLike = nameLike;
} }
if (type == CELL_TYPE_FLOOR) { board.salesDate = _summaryModel.salesDate;
board.salesDate = _summaryModel.salesDate; board.passengerDate = _summaryModel.passengerDate;
} else {
board.salesDate = [self today];
}
[self.stack pushBoard:board animated:YES]; [self.stack pushBoard:board animated:YES];
} }
......
...@@ -60,7 +60,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint ); ...@@ -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.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.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.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]]; [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]];
} }
......
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