fix bugs

vanke/Base.lproj/LaunchScreen.xib

@@ -15,7 +15,7 @@
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <animations/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>

vanke/view_iPhone/templates/floor-detail/VankeFloorDetailBoard_iPhone.m

@@ -146,7 +146,7 @@ ON_DID_DISAPPEAR( signal )
 
 ON_SIGNAL3( VankeSaleVolumeModel, RELOADING, signal )
 {
-    self.list.headerLoading = self.saleVolumeModel.loaded;
+    self.list.headerLoading = YES;
     self.list.footerLoading = YES;
 }
 

vanke/view_iPhone/templates/floor-detail/VankePassengerDetailBoard_iPhone.m

@@ -98,17 +98,17 @@ ON_CREATE_VIEWS( signal )
     
     self.list.whenHeaderRefresh = ^
     {
-        [self reloadSalesolumeModel];
+        [self reloadPassengerFlowModel];
     };
     
     self.list.whenFooterRefresh = ^
     {
-        [self reloadSalesolumeModel];
+        [self reloadPassengerFlowModel];
     };
     
     self.list.whenReachBottom = ^
     {
-        [self reloadSalesolumeModel];
+        [self reloadPassengerFlowModel];
     };
 }
 
@@ -140,13 +140,13 @@ ON_DID_DISAPPEAR( signal )
 
 #pragma mark -
 
-ON_SIGNAL3( VankeSaleVolumeModel, RELOADING, signal )
+ON_SIGNAL3( VankePassengerFlowModel, RELOADING, signal )
 {
-    self.list.headerLoading = self.passengerFlowModel.loaded;
+    self.list.headerLoading = YES;
     self.list.footerLoading = YES;
 }
 
-ON_SIGNAL3( VankeSaleVolumeModel, RELOADED, signal )
+ON_SIGNAL3( VankePassengerFlowModel, RELOADED, signal )
 {
     self.list.headerLoading = NO;
     self.list.footerLoading = NO;
@@ -154,7 +154,7 @@ ON_SIGNAL3( VankeSaleVolumeModel, RELOADED, signal )
     [self.list reloadData];
 }
 
--(void) reloadSalesolumeModel {
+-(void) reloadPassengerFlowModel {
     self.passengerFlowModel.projectEquals = self.data.projectId;
     self.passengerFlowModel.passengerFlowDateEquals = self.passengerFlowDate;
     [self.passengerFlowModel reload];

vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.h

@@ -20,6 +20,8 @@ AS_OUTLET( BeeUITextField,  txtQuery);
 @property (strong, nonatomic) NSString *projectNameLike;
 // 销售日期
 @property (strong, nonatomic) NSString *salesDate;
+//// 客流日期
+//@property (nonatomic, strong) NSString *passengerFlowDate;
 
 + (id)boardWithType: (CellType) type;
 

vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m

@@ -25,6 +25,7 @@ SUPPORT_AUTOMATIC_LAYOUT(YES)
 @synthesize projectCategory = _projectCategory;
 @synthesize projectNameLike = _projectNameLike;
 @synthesize salesDate = _salesDate;
+//@synthesize passengerFlowDate = _passengerFlowDate;
 @synthesize listType = _listType;
 
 DEF_MODEL( VankeProjectListModel, model );
@@ -124,6 +125,7 @@ ON_CREATE_VIEWS( signal )
     self.model.classificationEquals = _projectCategory;
     self.model.nameLike = _projectNameLike;
     self.model.salesDateEquals = _salesDate;
+
     $(self.txtQuery).DATA(_projectNameLike);
 }
 

vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m

@@ -262,13 +262,24 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
     VankeFloorListBoard_iPhone * board = [VankeFloorListBoard_iPhone boardWithType:type];
     if (nil != _currDashBoard) {
         board.projectCategory = _currDashBoard.name;
-        board.salesDate = _summaryModel.salesDate;
         board.theme = _currDashBoard.theme;
-        
         NSString *nameLike = [VankeUtil trim:$(self.txtQuery).data];
         board.projectNameLike = nameLike;
     }
+    
+    if (type == CELL_TYPE_FLOOR) {
+        board.salesDate = _summaryModel.salesDate;
+    } else {
+        board.salesDate = [self today];
+    }
+    
     [self.stack pushBoard:board animated:YES transition:bee.ui.transitionFade];
 }
 
+-(NSString*) today {
+    NSDateFormatter *df = [[NSDateFormatter alloc] init];
+    [df setDateFormat:@"yyyy-MM-dd"];
+    return [df stringFromDate:[NSDate date]];
+}
+
 @end