diff --git a/Car.xcodeproj/project.pbxproj b/Car.xcodeproj/project.pbxproj index 3ebf55484f8ea51e427d9502468b6db78a8b86ff..92cd6876927c744ea00e6ad06a3ff9065077ad90 100644 --- a/Car.xcodeproj/project.pbxproj +++ b/Car.xcodeproj/project.pbxproj @@ -812,7 +812,7 @@ TargetAttributes = { 8F97C2B71E0CC4BE00D8A57D = { CreatedOnToolsVersion = 8.1; - DevelopmentTeam = 3KJ9G3LC6T; + DevelopmentTeam = W54V2VB863; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.BackgroundModes = { @@ -1264,7 +1264,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; - DEVELOPMENT_TEAM = 3KJ9G3LC6T; + DEVELOPMENT_TEAM = W54V2VB863; ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch"; @@ -1276,7 +1276,7 @@ INFOPLIST_FILE = Car/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.czt.car; + PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; }; @@ -1288,7 +1288,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; - DEVELOPMENT_TEAM = 3KJ9G3LC6T; + DEVELOPMENT_TEAM = W54V2VB863; ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch"; @@ -1300,7 +1300,7 @@ INFOPLIST_FILE = Car/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.czt.car; + PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; }; diff --git a/Car/Base.lproj/Main.storyboard b/Car/Base.lproj/Main.storyboard index 55252154c2dcde241e8db936b6d2d630b03f1edc..4787defc1744cac279ce2d92cb89e3f70835b99c 100644 --- a/Car/Base.lproj/Main.storyboard +++ b/Car/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO"> <device id="retina4_7" orientation="portrait"> <adaptation id="fullscreen"/> </device> @@ -2031,7 +2031,7 @@ <action selector="actionLogin:" destination="BYZ-38-t0r" eventType="touchUpInside" id="PeF-P3-aUt"/> </connections> </button> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车æ—通æœåС平å°" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ng2-sr-A5u"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车æ—通油站平å°" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ng2-sr-A5u"> <rect key="frame" x="119.5" y="171" width="136" height="23"/> <fontDescription key="fontDescription" type="system" pointSize="19"/> <color key="textColor" red="0.8984733224" green="0.44295623899999997" blue="0.19516775010000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> diff --git a/Car/CodeClass/LeftView/ViewControllers/BillListViewController.m b/Car/CodeClass/LeftView/ViewControllers/BillListViewController.m index e9829b7380ae2ca05bc81b3e6110a3d840d26392..054c789d1ce5bc3cadaf4b6bbdc639b980d21196 100644 --- a/Car/CodeClass/LeftView/ViewControllers/BillListViewController.m +++ b/Car/CodeClass/LeftView/ViewControllers/BillListViewController.m @@ -21,6 +21,7 @@ - (void)viewDidLoad { [super viewDidLoad]; self.title = @"工分账å•"; + self.pageSize = 9999; [self httpRequest]; self.tableView.mj_header = nil; WS(weakSelf); diff --git a/Car/CodeClass/Main/ViewControllers/MainViewController.m b/Car/CodeClass/Main/ViewControllers/MainViewController.m index 680f7177b5d5f18fbfa8169d5334a7f08ec2b10a..a45c0bbd32e6d9819893c07e7da8b0dbe609be44 100644 --- a/Car/CodeClass/Main/ViewControllers/MainViewController.m +++ b/Car/CodeClass/Main/ViewControllers/MainViewController.m @@ -159,9 +159,14 @@ @param isAll 是å¦å…¨é€‰ */ - (void)configSelectData:(BOOL)isAll { + [self.setBillToCheck removeAllObjects]; for (OrderListModel *model in self.arrData) { if (![model.checkState isEqualToString:@"checked"]) { + [self.setBillToCheck addObject:model]; model.isSelected = isAll; + if (isAll) { + [self.setBillToCheck addObject:model]; + } } } [self.tableView reloadData]; @@ -185,6 +190,7 @@ [self.view layoutIfNeeded]; }]; self.btnCheck.selected = NO; + self.btnSelectAll.selected = NO; [self.tableView reloadData]; } diff --git a/Car/Info.plist b/Car/Info.plist index 92227107a92970d2866176ab1eb6c3b9e8656fdb..23c507e7dddcd17b0acb7d18c5aeb6c6e2c7b344 100644 --- a/Car/Info.plist +++ b/Car/Info.plist @@ -5,7 +5,7 @@ <key>CFBundleDevelopmentRegion</key> <string>en</string> <key>CFBundleDisplayName</key> - <string>车æ—通</string> + <string>车æ—通油站版</string> <key>CFBundleExecutable</key> <string>$(EXECUTABLE_NAME)</string> <key>CFBundleIdentifier</key> @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0.3</string> + <string>1.0.4</string> <key>CFBundleURLTypes</key> <array> <dict> @@ -30,7 +30,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.0.3</string> + <string>1.0.4</string> <key>LSApplicationQueriesSchemes</key> <array> <string>wechat</string>