Merge branch 'master' of https://git.oschina.net/gomore/vanke

vanke/view_iPhone/templates/main/VankeMainBoard_iPhone.m

@@ -96,9 +96,9 @@ ON_WILL_APPEAR( signal )
 ON_DID_APPEAR( signal )
 {
     // 如果没有设置当前tab，则默认为第一页
-    if (nil == _currDashBoard) {
-        [self showTab: 0];
-    }
+//    if (nil == _currDashBoard) {
+//        [self showTab: 0];
+//    }
 }
 
 ON_WILL_DISAPPEAR( signal )
@@ -228,21 +228,21 @@ ON_SIGNAL3(VankeProjectSummaryModel, RELOADED, signal) {
         return;
     }
     
-    if (nil != _currDashBoard) {
-        ProjectSummary *data = [[_summaryModel getServerResp] getSummary:_currDashBoard.name];
-        if (nil != data) {
-            [_currDashBoard setData:data];
-        }
-    }
-    
     ProjectSummaryResponse *resp = [_summaryModel getServerResp];
     if ([resp hasClassification:@"社区2049"]) {
-        [self showTab: 0];
+        [self showTab:0];
     } else if ([resp hasClassification:@"万科中心"]) {
         [self showTab:1];
     } else if ([resp hasClassification:@"万科广场"]) {
         [self showTab:2];
     }
+    
+    if (nil != _currDashBoard) {
+        ProjectSummary *data = [[_summaryModel getServerResp] getSummary:_currDashBoard.name];
+        if (nil != data) {
+            [_currDashBoard setData:data];
+        }
+    }
 }
 
 -(void) addLeftIconToTextField: (BeeUITextField*) textField icon: (NSString*) icon {

vanke/view_iPhone/templates/main/VankeTopMenuBoardCell_iPhone.xml

@@ -5,7 +5,7 @@
         <image class="bg" />
         <linear orientation="h" class="top-menu">
             <linear orientation="v" class="menu-item">
-                <button class="menu active" id="menuCommunity">社区2049</button>
+                <button class="menu" id="menuCommunity">社区2049</button>
             </linear>
             <linear orientation="v" class="menu-item">
                 <button class="menu" id="menuCenter">万科中心</button>