bug修复

HDMall.xcodeproj/project.pbxproj

@@ -58,9 +58,9 @@
 		8F973C271F21FD54003D3ADB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F973BF01F21F6DD003D3ADB /* Main.storyboard */; };
 		8F973C321F21FE32003D3ADB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C2F1F21FE32003D3ADB /* AppDelegate.m */; };
 		8F973C341F21FE32003D3ADB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C301F21FE32003D3ADB /* main.m */; };
+		8FB1CCC91F9602BD00B77E0F /* JSDropDownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FB1CCC61F96029B00B77E0F /* JSDropDownMenu.m */; };
+		8FB1CCCA1F9602E900B77E0F /* JSDropDownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FB1CCC61F96029B00B77E0F /* JSDropDownMenu.m */; };
 		8FC2BE8F1F39AC270023FA6B /* SaleInputListViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BE8E1F39AC270023FA6B /* SaleInputListViewModel.m */; };
-		8FC2BE941F39AC430023FA6B /* ico_make.png in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BE911F39AC430023FA6B /* ico_make.png */; };
-		8FC2BE951F39AC430023FA6B /* JSDropDownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BE931F39AC430023FA6B /* JSDropDownMenu.m */; };
 		8FDC89591F90CA5D00D0C442 /* ZJBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E9C1F28612B001496E3 /* ZJBaseModel.m */; };
 		8FDC895A1F90CA5D00D0C442 /* SaleInputState.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FF9F6E21F347517006B0EC0 /* SaleInputState.m */; };
 		8FDC895C1F90CA5D00D0C442 /* ZJShowLogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F250D671F2981200031B4BC /* ZJShowLogView.m */; };
@@ -116,7 +116,6 @@
 		8FDC899E1F90CA5D00D0C442 /* NSNumber+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E541F285E56001496E3 /* NSNumber+Addtions.m */; };
 		8FDC899F1F90CA5D00D0C442 /* HMSaleInputQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F4BFCD81F2EF6CF003EA16B /* HMSaleInputQuery.m */; };
 		8FDC89A01F90CA5D00D0C442 /* MMTopRowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FF9F6F81F37FF6C006B0EC0 /* MMTopRowCell.m */; };
-		8FDC89A31F90CA5D00D0C442 /* JSDropDownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BE931F39AC430023FA6B /* JSDropDownMenu.m */; };
 		8FDC89A41F90CA5D00D0C442 /* MMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FF9F6FA1F37FF6C006B0EC0 /* MMViewController.m */; };
 		8FDC89A61F90CA5D00D0C442 /* SaleInputListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F4BFCD51F2EF56A003EA16B /* SaleInputListTableViewCell.m */; };
 		8FDC89A71F90CA5D00D0C442 /* CalculateHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E821F285F4F001496E3 /* CalculateHelper.m */; };
@@ -137,7 +136,6 @@
 		8FDC89BD1F90CA5D00D0C442 /* SaleInputAddViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F4BFCDE1F2F0279003EA16B /* SaleInputAddViewController.m */; };
 		8FDC89BF1F90CA5D00D0C442 /* libPods-hdmall_base-HDMall_TEST.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3784BD616CA8AF0775D5526F /* libPods-hdmall_base-HDMall_TEST.a */; };
 		8FDC89C11F90CA5D00D0C442 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F973BF51F21F6DD003D3ADB /* LaunchScreen.storyboard */; };
-		8FDC89C21F90CA5D00D0C442 /* ico_make.png in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BE911F39AC430023FA6B /* ico_make.png */; };
 		8FDC89C51F90CA5D00D0C442 /* BusinessItems.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8F4BFCC61F2EDCD8003EA16B /* BusinessItems.plist */; };
 		8FDC89C61F90CA5D00D0C442 /* ZJShowLogView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F250D681F2981200031B4BC /* ZJShowLogView.xib */; };
 		8FDC89C71F90CA5D00D0C442 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8F973C021F21FB67003D3ADB /* Assets.xcassets */; };
@@ -280,11 +278,11 @@
 		8F973C2E1F21FE32003D3ADB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		8F973C2F1F21FE32003D3ADB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		8F973C301F21FE32003D3ADB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		8FB1CCC61F96029B00B77E0F /* JSDropDownMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JSDropDownMenu.m; sourceTree = "<group>"; };
+		8FB1CCC71F96029B00B77E0F /* ico_make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ico_make.png; sourceTree = "<group>"; };
+		8FB1CCC81F96029B00B77E0F /* JSDropDownMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSDropDownMenu.h; sourceTree = "<group>"; };
 		8FC2BE8D1F39AC270023FA6B /* SaleInputListViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleInputListViewModel.h; sourceTree = "<group>"; };
 		8FC2BE8E1F39AC270023FA6B /* SaleInputListViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleInputListViewModel.m; sourceTree = "<group>"; };
-		8FC2BE911F39AC430023FA6B /* ico_make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ico_make.png; sourceTree = "<group>"; };
-		8FC2BE921F39AC430023FA6B /* JSDropDownMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDropDownMenu.h; sourceTree = "<group>"; };
-		8FC2BE931F39AC430023FA6B /* JSDropDownMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDropDownMenu.m; sourceTree = "<group>"; };
 		8FDC89D11F90CA5D00D0C442 /* YI_DI_GANG_TEST.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YI_DI_GANG_TEST.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8FDC89D21F90CA5E00D0C442 /* YI_DI_GANG_TEST.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = YI_DI_GANG_TEST.plist; path = "/Users/Javen/Documents/MyProject/HDMall-iOS/YI_DI_GANG_TEST.plist"; sourceTree = "<absolute>"; };
 		8FED0FB21F38602F004916CC /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = "<group>"; };
@@ -708,8 +706,8 @@
 		8F973C041F21FB67003D3ADB /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				8FB1CCC51F96029B00B77E0F /* JSDropDownMenu */,
 				8F91A9D31F948B5E0032D201 /* UpdateAlert */,
-				8FC2BE901F39AC430023FA6B /* JSDropDownMenu */,
 				8FF9F6E71F37FF6C006B0EC0 /* CustomMMSpreadSheetView */,
 				8F4BFCF51F2F3238003EA16B /* PictureTableViewCell */,
 				8F6C923F1F2AE4AD0060E983 /* LocationHelper */,
@@ -886,12 +884,12 @@
 			path = ..;
 			sourceTree = "<group>";
 		};
-		8FC2BE901F39AC430023FA6B /* JSDropDownMenu */ = {
+		8FB1CCC51F96029B00B77E0F /* JSDropDownMenu */ = {
 			isa = PBXGroup;
 			children = (
-				8FC2BE911F39AC430023FA6B /* ico_make.png */,
-				8FC2BE921F39AC430023FA6B /* JSDropDownMenu.h */,
-				8FC2BE931F39AC430023FA6B /* JSDropDownMenu.m */,
+				8FB1CCC61F96029B00B77E0F /* JSDropDownMenu.m */,
+				8FB1CCC71F96029B00B77E0F /* ico_make.png */,
+				8FB1CCC81F96029B00B77E0F /* JSDropDownMenu.h */,
 			);
 			path = JSDropDownMenu;
 			sourceTree = "<group>";
@@ -1089,7 +1087,6 @@
 			files = (
 				8F91A9DA1F948B8D0032D201 /* UpdateAlertView.xib in Resources */,
 				8F973C251F21FD54003D3ADB /* LaunchScreen.storyboard in Resources */,
-				8FC2BE941F39AC430023FA6B /* ico_make.png in Resources */,
 				8F4BFCC71F2EDCD8003EA16B /* BusinessItems.plist in Resources */,
 				8F250D6C1F2981200031B4BC /* ZJShowLogView.xib in Resources */,
 				8F973C261F21FD54003D3ADB /* Assets.xcassets in Resources */,
@@ -1105,7 +1102,6 @@
 			files = (
 				8F91A9D71F948B7A0032D201 /* UpdateAlertView.xib in Resources */,
 				8FDC89C11F90CA5D00D0C442 /* LaunchScreen.storyboard in Resources */,
-				8FDC89C21F90CA5D00D0C442 /* ico_make.png in Resources */,
 				8FDC89C51F90CA5D00D0C442 /* BusinessItems.plist in Resources */,
 				8FDC89C61F90CA5D00D0C442 /* ZJShowLogView.xib in Resources */,
 				8FDC89C71F90CA5D00D0C442 /* Assets.xcassets in Resources */,
@@ -1215,6 +1211,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8FB1CCCA1F9602E900B77E0F /* JSDropDownMenu.m in Sources */,
 				8F91A9D91F948B880032D201 /* UpdateAlertView.m in Sources */,
 				8FEF5EB21F28612B001496E3 /* ZJBaseModel.m in Sources */,
 				8FF9F6E31F347517006B0EC0 /* SaleInputState.m in Sources */,
@@ -1271,7 +1268,6 @@
 				8FEF5E701F285E56001496E3 /* NSNumber+Addtions.m in Sources */,
 				8F4BFCD91F2EF6CF003EA16B /* HMSaleInputQuery.m in Sources */,
 				8FF9F7021F37FF6C006B0EC0 /* MMTopRowCell.m in Sources */,
-				8FC2BE951F39AC430023FA6B /* JSDropDownMenu.m in Sources */,
 				8FF9F7031F37FF6C006B0EC0 /* MMViewController.m in Sources */,
 				8F4BFCD61F2EF56A003EA16B /* SaleInputListTableViewCell.m in Sources */,
 				8FEF5E841F285F4F001496E3 /* CalculateHelper.m in Sources */,
@@ -1298,6 +1294,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8FB1CCC91F9602BD00B77E0F /* JSDropDownMenu.m in Sources */,
 				8F91A9D81F948B820032D201 /* UpdateAlertView.m in Sources */,
 				8FDC89591F90CA5D00D0C442 /* ZJBaseModel.m in Sources */,
 				8FDC895A1F90CA5D00D0C442 /* SaleInputState.m in Sources */,
@@ -1354,7 +1351,6 @@
 				8FDC899E1F90CA5D00D0C442 /* NSNumber+Addtions.m in Sources */,
 				8FDC899F1F90CA5D00D0C442 /* HMSaleInputQuery.m in Sources */,
 				8FDC89A01F90CA5D00D0C442 /* MMTopRowCell.m in Sources */,
-				8FDC89A31F90CA5D00D0C442 /* JSDropDownMenu.m in Sources */,
 				8FDC89A41F90CA5D00D0C442 /* MMViewController.m in Sources */,
 				8FDC89A61F90CA5D00D0C442 /* SaleInputListTableViewCell.m in Sources */,
 				8FDC89A71F90CA5D00D0C442 /* CalculateHelper.m in Sources */,

HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputListViewModel.m

@@ -17,7 +17,7 @@
     self = [super init];
     if (self) {
         self.arrDateTitles = @[KDateRangeTypeWeek, KDateRangeTypeOneMonth, KDateRangeTypeThreeMonth];
-        self.arrStateTitles = @[@"全部",@"未生效", @"已生效"];
+        self.arrStateTitles = @[@"全部",@"待审核", @"已审核"];
         self.arrDropMenu = @[self.arrDateTitles, self.arrStateTitles];
         
         //第一次请求，默认是最近一周

HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputState.m

@@ -13,10 +13,10 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        self.dicData = @{ kSaleInputStateTypeIneffect : @{@"text" : @"未生效",
-                                                          @"img" : @"StateIneffect"},
-                          kSaleInputStateTypeEffect : @{@"text" : @"已生效",
-                                                        @"img" : @"StateEffect"} };
+        self.dicData = @{ kSaleInputStateTypeIneffect : @{@"text" : @"待审核",
+                                                          @"img" : @"img_state_list_daishenhe"},
+                          kSaleInputStateTypeEffect : @{@"text" : @"已审核",
+                                                        @"img" : @"img_state_list_yishenhe"} };
     }
     return self;
 }

HDMall/CodeClass/Login/ViewControllers/LoginViewController.m

@@ -54,7 +54,7 @@
 
 - (void)checkUpdate {
     [self.update checkOnVC:self complete:^(BOOL isLatest) {
-        if (self.textFieldName.text.length > 0 && self.textFieldPWD.text.length >0) {
+        if (AppGlobal.savedName.length > 0 && AppGlobal.savedPWD.length >0) {
             [self ActionLogin:nil];
         }
     }];

HDMall/CodeClass/Mine/ViewControllers/MineTableViewController.m

@@ -45,6 +45,7 @@
 }
 
 - (IBAction)loginOut:(id)sender {
+    [AppGlobal loginOut];
     [self.viewModel openLogin];
 }
 

HDMall/Supporting Files/Assets.xcassets/AppIcon-test.appiconset/Contents.json

@@ -101,6 +101,11 @@
       "idiom" : "ipad",
       "filename" : "商地APPicon betaiPadProApp_83.5pt@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

HDMall/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -101,6 +101,11 @@
       "idiom" : "ipad",
       "filename" : "商地APPicon betaiPadProApp_83.5pt@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

HDMall/Supporting Files/Assets.xcassets/State/StateEffect.imageset/Contents.json → HDMall/Supporting Files/Assets.xcassets/State/img_state_list_daishenhe.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateEffect.png",
+      "filename" : "img_state_list_daishenhe.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateEffect@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateEffect@3x.png",
       "scale" : "3x"
     }
   ],

HDMall/Supporting Files/Assets.xcassets/State/StateIneffect.imageset/Contents.json → HDMall/Supporting Files/Assets.xcassets/State/img_state_list_yishenhe.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateIneffect.png",
+      "filename" : "img_state_list_yishenhe.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateIneffect@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ReadingStateIneffect@3x.png",
       "scale" : "3x"
     }
   ],

HDMall/Tools/JSDropDownMenu/JSDropDownMenu.m

@@ -307,6 +307,13 @@
         _rightTableView.separatorColor = [UIColor colorWithRed:220.f/255.0f green:220.f/255.0f blue:220.f/255.0f alpha:1.0];
         _rightTableView.dataSource = self;
         _rightTableView.delegate = self;
+        if (@available(iOS 11.0, *)) {
+            _leftTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+            _rightTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+//        _leftTableView.contentInset = UIEdgeInsetsMake(64, 0, 49, 0);
+//        _leftTableView.scrollIndicatorInsets = _leftTableView.contentInset;
+//        _rightTableView.scrollIndicatorInsets = _leftTableView.contentInset;
         
         UICollectionViewFlowLayout *flowLayout=[[UICollectionViewFlowLayout alloc] init];
         flowLayout.minimumInteritemSpacing = 0;
@@ -773,6 +780,14 @@
     return 0.1;
 }
 
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    return [UIView new];
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+    return [UIView new];
+}
+
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     return 0.1;
 }

HDMall/Tools/ZJAppInstance/ZJAppInstance.h

@@ -40,5 +40,6 @@
 
 /** 保存基础信息 */
 - (void)saveBaseInfo;
+- (void)loginOut;
 
 @end

HDMall/Tools/ZJAppInstance/ZJAppInstance.m

@@ -63,5 +63,23 @@ static NSString *const zj_saved_isMall = @"zj_saved_isMall";
     return contract;
 }
 
+- (void)loginOut {
+    [self saveInfoWithUserName:nil pwd:nil];
+}
+
+/**
+ *  保存登录信息以及用户名密码
+ *
+ *  @param name 用户名
+ *  @param pwd  密码
+ *
+ *  @return 是否成功
+ */
+- (void)saveInfoWithUserName:(NSString *)name pwd:(NSString *)pwd {
+    self.savedName = name;
+    self.savedPWD = pwd;
+    [self saveBaseInfo];
+}
+
 ZJLazy(ZJPermissionManager, permission)
 @end