bug

XFFruit.xcodeproj/project.pbxproj

@@ -3453,7 +3453,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3478,7 +3478,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Macro/ICRAppMacro.h

@@ -26,11 +26,11 @@
 //#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
 
 //********现场测试环境********
-#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
+//#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
 
 
 //********现场正式环境*********
-// #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
+ #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
 
 
 // HTTP

XFFruit/ViewControllers/Report/Controllers/ReportViewController.m

@@ -44,7 +44,7 @@
 @property (nonatomic,assign)NSInteger storeCount;
 @property (nonatomic,strong)NSIndexPath *currentIndex;
 @property (nonatomic,strong)NSMutableArray *selectArr;
-@property (nonatomic, assign) BOOL isSegOne;
+//@property (nonatomic, assign) BOOL isSegOne;
 
 @end
 
@@ -67,7 +67,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.isSegOne = NO;
+//    self.isSegOne = NO;
     //布局
 #if 1
     self.dataArr = [NSMutableArray array];
@@ -356,8 +356,10 @@
     NSString *dayType = @"";
     if ([title isEqualToString:SaleWeek]) {
         dayType = @"week";
+        self.dayType = dayType;
+        self.orgScope = nil;
         [self getWeekbydayFromServer];
-        //        self.scopeType = [IBTCommon getWeekFromDate];
+        return;
     }
    
     if ([title isEqualToString:SaleDay]) {
@@ -375,7 +377,6 @@
     CLog(@"-------%@",self.scopeType);
     self.dayType = dayType;
     self.orgScope = nil;
-    self.isSegOne = YES;
     [self getDataFromServer];