Commit e9166527 authored by Achilles's avatar Achilles

fix bugs

parent 30daa7e6
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
return; return;
} }
[self http_get:@"/project/queryprojectsby"].PARAM(@"classificationEquals", self.classificationEquals).PARAM(@"nameLike", nil == self.nameLike? @"": self.nameLike).PARAM(@"salesDateEquals", self.salesDateEquals).PARAM(@"passengerDateEquals", self.passengerDateEquals).PARAM(@"trafficDateEquals", self.trafficDateEquals).TIMEOUT(10); [self http_get:@"/project/queryprojectsby"].PARAM(@"classificationEquals", self.classificationEquals).PARAM(@"nameLike", nil == self.nameLike ? @"" : self.nameLike).PARAM(@"salesDateEquals", self.salesDateEquals).PARAM(@"passengerDateEquals", self.passengerDateEquals).PARAM(@"trafficDateEquals", self.trafficDateEquals).TIMEOUT(10);
} }
else if (self.succeed) else if (self.succeed)
{ {
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
[self setClientError: @"项目分类不能为空"]; [self setClientError: @"项目分类不能为空"];
return NO; return NO;
} }
if ([VankeUtil isBlankString:self.salesDateEquals]) { if ([VankeUtil isBlankString:self.salesDateEquals]) {
[self setClientError: @"销量日期不能为空"]; [self setClientError: @"销量日期不能为空"];
return NO; return NO;
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
return @"floor-def.jpg"; return @"floor-def.jpg";
} else { } else {
return self.pictureUrl; return self.pictureUrl;
// return [NSString stringWithFormat:@"%@/%@", VANKE_SERVER_MEDIA_BASE_URL, self.picture]; // return [NSString stringWithFormat:@"%@/%@", VANKE_SERVER_MEDIA_BASE_URL, self.picture];
} }
} }
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
CONVERT_PROPERTY_CLASS(data, ProjectCategory) CONVERT_PROPERTY_CLASS(data, ProjectCategory)
-(int) total { -(int) total {
return nil == data? 0: [data count]; return nil == data ? 0 :[data count];
} }
@end @end
...@@ -70,13 +70,8 @@ SUPPORT_RESOURCE_LOADING( YES ) ...@@ -70,13 +70,8 @@ SUPPORT_RESOURCE_LOADING( YES )
} }
ChartValue *data = self.data; ChartValue *data = self.data;
NSUInteger colorLen = [chartColors count]; NSInteger colorLen = [chartColors count];
// [data.values enumerateObjectsUsingBlock:^(ProjectSaleVolume *obj, NSUInteger idx, BOOL * _Nonnull stop) {
// UIColor *color = [chartColors objectAtIndex:idx % colorLen];
// float itemValue = [obj.amount floatValue];
// NSString *itemDesc = obj.dimensionValue;
// [items addObject:[PNPieChartDataItem dataItemWithValue:itemValue color:color description:itemDesc]];
// }];
for (NSInteger i = 0; i < [data.values count]; ++i) { for (NSInteger i = 0; i < [data.values count]; ++i) {
ProjectSaleVolume *obj = [data.values objectAtIndex:i]; ProjectSaleVolume *obj = [data.values objectAtIndex:i];
UIColor *color = [chartColors objectAtIndex:i % colorLen]; UIColor *color = [chartColors objectAtIndex:i % colorLen];
...@@ -84,6 +79,12 @@ SUPPORT_RESOURCE_LOADING( YES ) ...@@ -84,6 +79,12 @@ SUPPORT_RESOURCE_LOADING( YES )
NSString *itemDesc = obj.dimensionValue; NSString *itemDesc = obj.dimensionValue;
[items addObject:[PNPieChartDataItem dataItemWithValue:itemValue color:color description:itemDesc]]; [items addObject:[PNPieChartDataItem dataItemWithValue:itemValue color:color description:itemDesc]];
} }
// [data.values enumerateObjectsUsingBlock:^(ProjectSaleVolume *obj, NSUInteger idx, BOOL * _Nonnull stop) {
// UIColor *color = [chartColors objectAtIndex:idx % colorLen];
// float itemValue = [obj.amount floatValue];
// NSString *itemDesc = obj.dimensionValue;
// [items addObject:[PNPieChartDataItem dataItemWithValue:itemValue color:color description:itemDesc]];
// }];
return items; return items;
} }
......
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
shadow-radius: 2px; shadow-radius: 2px;
shadow-color: gray; shadow-color: gray;
input-return-key: search; input-return-key: search;
input-keyboard: abc;
} }
</style> </style>
</template> </template>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
height: 100%; height: 100%;
position: absolute; position: absolute;
background-color: white; background-color: white;
image-mode: center; image-mode: fit;
image-src: url(login_bg.png); image-src: url(login_bg.png);
} }
...@@ -131,6 +131,10 @@ ...@@ -131,6 +131,10 @@
#btnRegister { #btnRegister {
float: right; float: right;
} }
#btnGetPwd,#btnRegister {
display: none;
}
</style> </style>
</ui> </ui>
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
float: right; float: right;
placeholder: "楼盘查询"; placeholder: "楼盘查询";
input-return-key: search; input-return-key: search;
input-keyboard: abc;
} }
#weatherBoard { #weatherBoard {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#pragma mark - #pragma mark -
@interface VankeServiceDashBoard_iPhone() @interface VankeServiceDashBoard_iPhone ()
{ {
} }
@end @end
...@@ -30,7 +30,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint ); ...@@ -30,7 +30,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
return board; return board;
} }
+ (id) centerDashBarod{ + (id) centerDashBarod {
VankeServiceDashBoard_iPhone *board = [super cell]; VankeServiceDashBoard_iPhone *board = [super cell];
board.name = @"万科中心"; board.name = @"万科中心";
board.theme = @"purple"; board.theme = @"purple";
...@@ -56,20 +56,21 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint ); ...@@ -56,20 +56,21 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
self.traffic.imgIcon.data = @"car.png"; self.traffic.imgIcon.data = @"car.png";
self.traffic.lblTitle.data = @"当前车流"; self.traffic.lblTitle.data = @"当前车流";
self.traffic.imgBg.backgroundColor = [UIColor colorWithRed:79/255.0 green:143/255.0 blue:248/255.0 alpha:1]; self.traffic.imgBg.backgroundColor = [UIColor colorWithRed:79/255.0 green:143/255.0 blue:248/255.0 alpha:1];
self.traffic.lblAmountUnit.data = @"次"; // self.traffic.lblAmountUnit.data = @"次";
[self.traffic asNotAvailableCell];
self.energy.imgIcon.data = @"energy.png"; self.energy.imgIcon.data = @"energy.png";
self.energy.lblTitle.data = @"能耗"; self.energy.lblTitle.data = @"能耗";
self.energy.imgBg.backgroundColor = [UIColor colorWithRed:149/255.0 green:200/255.0 blue:8/255.0 alpha:1]; self.energy.imgBg.backgroundColor = [UIColor colorWithRed:149/255.0 green:200/255.0 blue:8/255.0 alpha:1];
// self.energy.lblAmountUnit.data = @"正在研发中..."; // self.energy.lblAmountUnit.data = @"正在研发中...";
// self.energy.lblAmount.data = @" "; // self.energy.lblAmount.data = @" ";
[self.energy asNotAvailableCell]; [self.energy asNotAvailableCell];
self.complaint.imgIcon.data = @"complaint.png"; self.complaint.imgIcon.data = @"complaint.png";
self.complaint.lblTitle.data = @"投诉"; self.complaint.lblTitle.data = @"投诉";
self.complaint.imgBg.backgroundColor = [UIColor colorWithRed:252/255.0 green:67/255.0 blue:62/255.0 alpha:1]; self.complaint.imgBg.backgroundColor = [UIColor colorWithRed:252/255.0 green:67/255.0 blue:62/255.0 alpha:1];
// self.complaint.lblAmountUnit.data = @"正在研发中..."; // self.complaint.lblAmountUnit.data = @"正在研发中...";
// self.complaint.lblAmount.data = @" "; // self.complaint.lblAmount.data = @" ";
[self.complaint asNotAvailableCell]; [self.complaint asNotAvailableCell];
} }
...@@ -86,7 +87,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint ); ...@@ -86,7 +87,7 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
if (nil != summary) { if (nil != summary) {
[self.salesInfo setData:summary.salesAmount]; [self.salesInfo setData:summary.salesAmount];
[self.passenger setData:summary.passengerFlowVolume]; [self.passenger setData:summary.passengerFlowVolume];
[self.traffic setData:summary.trafficVolume]; // [self.traffic setData:summary.trafficVolume];
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ui namespace="VankeWeatherCell_iPhone"> <ui namespace="VankeWeatherCell_iPhone">
<linear class="wrapper" orientation="v"> <linear class="wrapper" orientation="v">
<image class="bg" src="home_bg.png"/> <image class="bg"/>
<button id="btnMask" class="mask" /> <button id="btnMask" class="mask" />
<linear class="root" orientation="v"> <linear class="root" orientation="v">
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
image-src: url(home_bg.png);
image-mode: fill;
} }
.mask { .mask {
......
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