Skip to content

C
Car-iOS-Merchant
Commit e6bc26cb authored by Sandy's avatar Sandy
Browse files
Options

Merge branch 'customerVersion' 

""
parents 109ae142 e2381724
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 297 deletions
Car Customer-Info.plist 0 → 100644
View file @ e6bc26cb
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>车族通</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>wx39e5b31bb7b479c7</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
<string>weixin</string>
<string>sinaweibohd</string>
<string>sinaweibo</string>
<string>sinaweibosso</string>
<string>weibosdk</string>
<string>weibosdk2.5</string>
<string>mqqapi</string>
<string>mqq</string>
<string>mqqOpensdkSSoLogin</string>
<string>mqqconnect</string>
<string>mqqopensdkdataline</string>
<string>mqqopensdkgrouptribeshare</string>
<string>mqqopensdkfriend</string>
<string>mqqopensdkapi</string>
<string>mqqopensdkapiV2</string>
<string>mqqopensdkapiV3</string>
<string>mqqopensdkapiV4</string>
<string>mqzoneopensdk</string>
<string>wtloginmqq</string>
<string>wtloginmqq2</string>
<string>mqqwpa</string>
<string>mqzone</string>
<string>mqzonev2</string>
<string>mqzoneshare</string>
<string>wtloginqzone</string>
<string>mqzonewx</string>
<string>mqzoneopensdkapiV2</string>
<string>mqzoneopensdkapi19</string>
<string>mqzoneopensdkapi</string>
<string>mqqbrowser</string>
<string>mttbrowser</string>
<string>alipay</string>
<string>alipayshare</string>
<string>dingtalk</string>
<string>dingtalk-open</string>
<string>laiwangsso</string>
<string>yixin</string>
<string>yixinopenapi</string>
<string>instagram</string>
<string>whatsapp</string>
<string>line</string>
<string>fbapi</string>
<string>fb-messenger-api</string>
<string>fbauth2</string>
<string>fbshareextension</string>
<string>kakaofa63a0b2356e923f3edd6512d531f546</string>
<string>kakaokompassauth</string>
<string>storykompassauth</string>
<string>kakaolink</string>
<string>kakaotalk-4.5.0</string>
<string>kakaostory-2.9.0</string>
<string>pinterestsdk.v1</string>
<string>tumblr</string>
<string>evernote</string>
<string>en</string>
<string>enx</string>
<string>evernotecid</string>
<string>evernotemsg</string>
<string>youdaonote</string>
<string>ynotedictfav</string>
<string>com.youdao.note.todayViewNote</string>
<string>ynotesharesdk</string>
<string>gplus</string>
<string>pocket</string>
<string>readitlater</string>
<string>pocket-oauth-v1</string>
<string>fb131450656879143</string>
<string>en-readitlater-5776</string>
<string>com.ideashower.ReadItLaterPro3</string>
<string>com.ideashower.ReadItLaterPro</string>
<string>com.ideashower.ReadItLaterProAlpha</string>
<string>com.ideashower.ReadItLaterProEnterprise</string>
<string>vk</string>
<string>vk-share</string>
<string>vkauthorize</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>App需要您的同意,才能访问媒体资料库</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>App需要您的同意,才能访问蓝牙</string>
<key>NSCalendarsUsageDescription</key>
<string>App需要您的同意,才能访问日历</string>
<key>NSCameraUsageDescription</key>
<string>App需要您的同意,才能访问相机</string>
<key>NSHealthShareUsageDescription</key>
<string>App需要您的同意,才能访问健康分享</string>
<key>NSHealthUpdateUsageDescription</key>
<string>App需要您的同意,才能访问健康更新 </string>
<key>NSLocationAlwaysUsageDescription</key>
<string>App需要您的同意,才能始终访问位置</string>
<key>NSLocationUsageDescription</key>
<string>App需要您的同意,才能访问位置</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App需要您的同意,才能在使用期间访问位置</string>
<key>NSMicrophoneUsageDescription</key>
<string>App需要您的同意,才能访问麦克风</string>
<key>NSMotionUsageDescription</key>
<string>App需要您的同意,才能访问运动与健身</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>NSRemindersUsageDescription</key>
<string>App需要您的同意,才能访问提醒事项</string>
<key>UIBackgroundModes</key>
<array>
<string>location</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
</dict>
</plist>
Car.xcodeproj/project.pbxproj
View file @ e6bc26cb
......@@ -151,6 +151,7 @@
1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.release.xcconfig"; sourceTree = "<group>"; };
34B91CD599A3C8265AB0C96C /* Pods-car_base-Car.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.debug.xcconfig"; sourceTree = "<group>"; };
59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.debug.xcconfig"; sourceTree = "<group>"; };
8F0014D61E824650007612D8 /* Car Customer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Car Customer-Info.plist"; path = "/Users/Javen/Documents/MyProject/Car-iOS/Car Customer-Info.plist"; sourceTree = "<absolute>"; };
8F20954F1E15171600FBED74 /* UMengHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMengHelper.h; sourceTree = "<group>"; };
8F2095501E15171600FBED74 /* UMengHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UMengHelper.m; sourceTree = "<group>"; };
8F2095531E15188500FBED74 /* JPushHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPushHelper.h; sourceTree = "<group>"; };
......@@ -198,7 +199,7 @@
8F8105701E1101E4009A2AB3 /* NSDate+FormatterAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+FormatterAdditions.h"; sourceTree = "<group>"; };
8F8105721E1117D2009A2AB3 /* ModifyPswTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPswTableViewController.h; sourceTree = "<group>"; };
8F8105731E1117D2009A2AB3 /* ModifyPswTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPswTableViewController.m; sourceTree = "<group>"; };
8F97C2B81E0CC4BE00D8A57D /* Car.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Car.app; sourceTree = BUILT_PRODUCTS_DIR; };
8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car-Customer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8F97C2BC1E0CC4BE00D8A57D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8F97C2BE1E0CC4BE00D8A57D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8F97C2BF1E0CC4BE00D8A57D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
......@@ -280,7 +281,7 @@
8FFE3D961E139D9F00BEB6A6 /* CardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardModel.m; sourceTree = "<group>"; };
8FFE3D981E13A8AA00BEB6A6 /* car_objc_json_client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = car_objc_json_client.m; sourceTree = "<group>"; };
8FFE3D991E13A8AA00BEB6A6 /* car_objc_json_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = car_objc_json_client.h; sourceTree = "<group>"; };
8FFE3E141E14AC6700BEB6A6 /* Car Release.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car Release.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car-Customer Release.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Car Release.plist"; path = "/Users/Javen/Documents/MyProject/Car-iOS/Car Release.plist"; sourceTree = "<absolute>"; };
D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.release.xcconfig"; sourceTree = "<group>"; };
E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car Release.a"; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -441,16 +442,17 @@
7DD06E672CBD615874B5F18D /* Pods */,
1C9665B4D157E0C4E18F9BC0 /* Frameworks */,
8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */,
8F0014D61E824650007612D8 /* Car Customer-Info.plist */,
);
sourceTree = "<group>";
};
8F97C2B91E0CC4BE00D8A57D /* Products */ = {
isa = PBXGroup;
children = (
8F97C2B81E0CC4BE00D8A57D /* Car.app */,
8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */,
8F97C2D11E0CC4BE00D8A57D /* CarTests.xctest */,
8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */,
8FFE3E141E14AC6700BEB6A6 /* Car Release.app */,
8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -725,9 +727,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
8F97C2B71E0CC4BE00D8A57D /* Car */ = {
8F97C2B71E0CC4BE00D8A57D /* Car-Customer */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car" */;
buildConfigurationList = 8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car-Customer" */;
buildPhases = (
2A23047584C11A2CB7DD7D44 /* [CP] Check Pods Manifest.lock */,
8F97C2B41E0CC4BE00D8A57D /* Sources */,
......@@ -740,9 +742,9 @@
);
dependencies = (
);
name = Car;
name = "Car-Customer";
productName = Car;
productReference = 8F97C2B81E0CC4BE00D8A57D /* Car.app */;
productReference = 8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */;
productType = "com.apple.product-type.application";
};
8F97C2D01E0CC4BE00D8A57D /* CarTests */ = {
......@@ -781,9 +783,9 @@
productReference = 8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */ = {
8FFE3DDA1E14AC6700BEB6A6 /* Car-Customer Release */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */;
buildConfigurationList = 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car-Customer Release" */;
buildPhases = (
0D6C8DD9315DBA6E6DC2B066 /* [CP] Check Pods Manifest.lock */,
8FFE3DDC1E14AC6700BEB6A6 /* Sources */,
......@@ -796,9 +798,9 @@
);
dependencies = (
);
name = "Car Release";
name = "Car-Customer Release";
productName = Car;
productReference = 8FFE3E141E14AC6700BEB6A6 /* Car Release.app */;
productReference = 8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
......@@ -853,10 +855,10 @@
projectDirPath = "";
projectRoot = "";
targets = (
8F97C2B71E0CC4BE00D8A57D /* Car */,
8F97C2B71E0CC4BE00D8A57D /* Car-Customer */,
8F97C2D01E0CC4BE00D8A57D /* CarTests */,
8F97C2DB1E0CC4BE00D8A57D /* CarUITests */,
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */,
8FFE3DDA1E14AC6700BEB6A6 /* Car-Customer Release */,
);
};
/* End PBXProject section */
......@@ -1138,12 +1140,12 @@
/* Begin PBXTargetDependency section */
8F97C2D31E0CC4BE00D8A57D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8F97C2B71E0CC4BE00D8A57D /* Car */;
target = 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */;
targetProxy = 8F97C2D21E0CC4BE00D8A57D /* PBXContainerItemProxy */;
};
8F97C2DE1E0CC4BE00D8A57D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8F97C2B71E0CC4BE00D8A57D /* Car */;
target = 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */;
targetProxy = 8F97C2DD1E0CC4BE00D8A57D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
......@@ -1428,7 +1430,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car" */ = {
8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car-Customer" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8F97C2E61E0CC4BE00D8A57D /* Debug */,
......@@ -1455,7 +1457,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */ = {
8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car-Customer Release" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8FFE3E121E14AC6700BEB6A6 /* Debug */,
......
Car/Base.lproj/Main.storyboard
View file @ e6bc26cb
......@@ -6,7 +6,6 @@
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -62,75 +61,15 @@
</constraints>
</view>
<view key="tableFooterView" contentMode="scaleToFill" id="rqg-Fl-VWf" userLabel="footerView">
<rect key="frame" x="0.0" y="550" width="375" height="44"/>
<rect key="frame" x="0.0" y="385" width="375" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<sections>
<tableViewSection id="2v7-iq-Gdb">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="xtB-Sd-Tl7">
<rect key="frame" x="0.0" y="220" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xtB-Sd-Tl7" id="d1z-wx-30x">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="leftvc_bill" translatesAutoresizingMaskIntoConstraints="NO" id="CVf-U4-Rmo">
<rect key="frame" x="30" y="12" width="26" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="26" id="VdU-zO-cck"/>
<constraint firstAttribute="height" constant="30" id="odJ-4i-ouC"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分账单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Noo-3c-Ahc">
<rect key="frame" x="76" y="16" width="73.5" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="CVf-U4-Rmo" firstAttribute="centerY" secondItem="d1z-wx-30x" secondAttribute="centerY" id="03e-2C-Ks8"/>
<constraint firstItem="Noo-3c-Ahc" firstAttribute="centerY" secondItem="CVf-U4-Rmo" secondAttribute="centerY" id="qsS-cY-kta"/>
<constraint firstItem="Noo-3c-Ahc" firstAttribute="leading" secondItem="CVf-U4-Rmo" secondAttribute="trailing" constant="20" id="uws-Wm-eHk"/>
<constraint firstItem="CVf-U4-Rmo" firstAttribute="leading" secondItem="d1z-wx-30x" secondAttribute="leading" constant="30" id="zQz-v5-yNk"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="6Sk-Ey-xFt">
<rect key="frame" x="0.0" y="275" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Sk-Ey-xFt" id="5c3-OT-oYJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="leftvc_cash" translatesAutoresizingMaskIntoConstraints="NO" id="6I4-Ls-MTB">
<rect key="frame" x="30" y="12" width="26" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="26" id="4m5-Fk-eD4"/>
<constraint firstAttribute="height" constant="30" id="Nvw-nI-6cM"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分提现" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJu-eo-Y8d">
<rect key="frame" x="76" y="16" width="74" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="6I4-Ls-MTB" firstAttribute="leading" secondItem="5c3-OT-oYJ" secondAttribute="leading" constant="30" id="Q4v-Ve-YeG"/>
<constraint firstItem="6I4-Ls-MTB" firstAttribute="centerY" secondItem="5c3-OT-oYJ" secondAttribute="centerY" id="kMW-c9-JFw"/>
<constraint firstItem="fJu-eo-Y8d" firstAttribute="leading" secondItem="6I4-Ls-MTB" secondAttribute="trailing" constant="20" id="xIP-qy-eFG"/>
<constraint firstItem="fJu-eo-Y8d" firstAttribute="centerY" secondItem="6I4-Ls-MTB" secondAttribute="centerY" id="zMl-F1-Usx"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="MNb-b0-8ld">
<rect key="frame" x="0.0" y="330" width="375" height="55"/>
<rect key="frame" x="0.0" y="220" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MNb-b0-8ld" id="e2Y-0h-fwq">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
......@@ -143,7 +82,7 @@
<constraint firstAttribute="width" constant="26" id="zx6-eJ-XOJ"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="核销卡券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XSb-SN-PUD">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="核销订单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XSb-SN-PUD">
<rect key="frame" x="76" y="16" width="74" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
......@@ -159,38 +98,8 @@
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="LRW-MG-MZh">
<rect key="frame" x="0.0" y="385" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LRW-MG-MZh" id="Yof-kK-iYx">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="left_scan" translatesAutoresizingMaskIntoConstraints="NO" id="ZtB-GK-Ea9">
<rect key="frame" x="30" y="12" width="26" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="P7w-O0-nxT"/>
<constraint firstAttribute="width" constant="26" id="haV-yN-QNV"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="扫一扫" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cHh-l7-Mcc">
<rect key="frame" x="76" y="16" width="56" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="cHh-l7-Mcc" firstAttribute="centerY" secondItem="ZtB-GK-Ea9" secondAttribute="centerY" id="0eU-NZ-ip6"/>
<constraint firstItem="ZtB-GK-Ea9" firstAttribute="leading" secondItem="Yof-kK-iYx" secondAttribute="leading" constant="30" id="bJU-M4-9hO"/>
<constraint firstItem="cHh-l7-Mcc" firstAttribute="leading" secondItem="ZtB-GK-Ea9" secondAttribute="trailing" constant="20" id="dJE-Pl-J8d"/>
<constraint firstItem="ZtB-GK-Ea9" firstAttribute="centerY" secondItem="Yof-kK-iYx" secondAttribute="centerY" id="eF1-Fl-5Fg"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="55" id="9kl-2z-IJU">
<rect key="frame" x="0.0" y="440" width="375" height="55"/>
<rect key="frame" x="0.0" y="275" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9kl-2z-IJU" id="FuF-Rg-4nb">
<rect key="frame" x="0.0" y="0.0" width="342" height="55"/>
......@@ -220,7 +129,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="iSx-hH-F0d">
<rect key="frame" x="0.0" y="495" width="375" height="55"/>
<rect key="frame" x="0.0" y="330" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iSx-hH-F0d" id="9Lp-9Y-OgP">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
......@@ -307,89 +216,113 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A4G-MF-BfU" customClass="CardView">
<rect key="frame" x="16" y="159" width="343" height="100"/>
<rect key="frame" x="0.0" y="159" width="375" height="127"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="orange_card_bg" translatesAutoresizingMaskIntoConstraints="NO" id="d8f-n1-R4G">
<rect key="frame" x="0.0" y="0.0" width="120" height="100"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="J5O-UN-YD8">
<rect key="frame" x="16" y="8" width="90" height="111"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="tRm-af-iSA"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="车族通·优惠抵用券" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="etR-yz-Sdx">
<rect key="frame" x="128" y="8" width="207" height="22"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="美年体验" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9RQ-zc-tgY">
<rect key="frame" x="114" y="8" width="245" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="AwN-vG-cBk"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0bV-AN-5uI">
<rect key="frame" x="12" y="40" width="18" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.9959705472" green="0.99614065890000003" blue="0.99595981840000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mA5-Kq-bqR">
<rect key="frame" x="114" y="37" width="170" height="33.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="满10元可用" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kfg-k7-fnQ">
<rect key="frame" x="0.0" y="72" width="120" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.9959705472" green="0.99614065890000003" blue="0.99595981840000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="单号:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dak-2V-HiQ">
<rect key="frame" x="114" y="78.5" width="35" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="YKx-iL-K5R"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="15" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AxQ-ni-osZ">
<rect key="frame" x="40" y="14" width="47" height="54"/>
<fontDescription key="fontDescription" type="system" pointSize="45"/>
<color key="textColor" red="0.9959705472" green="0.99614065890000003" blue="0.99595981840000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2110000888" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t0I-7e-zXg">
<rect key="frame" x="149" y="78.5" width="121" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016.11.11-2016.12.12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IGU-bB-7Rq">
<rect key="frame" x="128" y="41.5" width="207" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="有效日期:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r76-rY-QY7">
<rect key="frame" x="114" y="99.5" width="68" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="68" id="2hd-CQ-fqj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="券号：4444444" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KF3-RI-YMK">
<rect key="frame" x="128" y="63.5" width="207" height="18"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="满500元可用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fds-K4-nOp">
<rect key="frame" x="270" y="81" width="89" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="Kbg-H8-Qok"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="state_used" translatesAutoresizingMaskIntoConstraints="NO" id="xAB-ni-LA4">
<rect key="frame" x="277" y="7" width="57" height="57"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UTS-5m-4en">
<rect key="frame" x="287" y="50" width="18" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="57" id="3x8-vY-8FI"/>
<constraint firstAttribute="width" constant="57" id="FJP-x4-OUf"/>
<constraint firstAttribute="width" constant="18" id="NxX-ey-1Tv"/>
</constraints>
</imageView>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.95902961490000005" green="0.67940151689999995" blue="0.52041810749999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="150" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vGs-5Q-2Ha">
<rect key="frame" x="309" y="38" width="50" height="35"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="29"/>
<color key="textColor" red="0.95902961492538452" green="0.67940151691436768" blue="0.52041810750961304" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2018.1.7-2018.3.7" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NFE-En-JUU">
<rect key="frame" x="182" y="99.5" width="177" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="xAB-ni-LA4" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="7" id="2aP-KL-Pwg"/>
<constraint firstItem="d8f-n1-R4G" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" id="2fw-LC-5MV"/>
<constraint firstAttribute="trailing" secondItem="etR-yz-Sdx" secondAttribute="trailing" constant="8" id="3iC-Ex-qn0"/>
<constraint firstAttribute="bottom" secondItem="Kfg-k7-fnQ" secondAttribute="bottom" constant="8" id="6me-BC-v7J"/>
<constraint firstItem="Kfg-k7-fnQ" firstAttribute="trailing" secondItem="d8f-n1-R4G" secondAttribute="trailing" id="7fn-h8-t1Q"/>
<constraint firstItem="AxQ-ni-osZ" firstAttribute="centerY" secondItem="d8f-n1-R4G" secondAttribute="centerY" constant="-9" id="CGX-mg-lBm"/>
<constraint firstAttribute="height" constant="100" id="LcK-Rn-fzj"/>
<constraint firstAttribute="trailing" secondItem="xAB-ni-LA4" secondAttribute="trailing" constant="9" id="S7d-lV-PSU"/>
<constraint firstItem="Kfg-k7-fnQ" firstAttribute="leading" secondItem="d8f-n1-R4G" secondAttribute="leading" id="YCJ-c6-YEz"/>
<constraint firstAttribute="trailing" secondItem="IGU-bB-7Rq" secondAttribute="trailing" constant="8" id="ZCI-GM-mxx"/>
<constraint firstItem="etR-yz-Sdx" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="cOD-6Y-J7W"/>
<constraint firstItem="IGU-bB-7Rq" firstAttribute="centerY" secondItem="A4G-MF-BfU" secondAttribute="centerY" id="ehD-gD-7Y9"/>
<constraint firstItem="d8f-n1-R4G" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" id="eoT-Wl-j0T"/>
<constraint firstItem="0bV-AN-5uI" firstAttribute="centerY" secondItem="d8f-n1-R4G" secondAttribute="centerY" id="fIh-jZ-Un4"/>
<constraint firstItem="KF3-RI-YMK" firstAttribute="leading" secondItem="Kfg-k7-fnQ" secondAttribute="trailing" constant="8" id="gTu-ce-IjK"/>
<constraint firstItem="AxQ-ni-osZ" firstAttribute="centerX" secondItem="d8f-n1-R4G" secondAttribute="centerX" constant="3" id="god-d1-l0l"/>
<constraint firstItem="etR-yz-Sdx" firstAttribute="leading" secondItem="d8f-n1-R4G" secondAttribute="trailing" constant="8" id="iYr-ad-WUv"/>
<constraint firstItem="IGU-bB-7Rq" firstAttribute="leading" secondItem="d8f-n1-R4G" secondAttribute="trailing" constant="8" id="iqZ-n3-5Sl"/>
<constraint firstAttribute="trailing" secondItem="KF3-RI-YMK" secondAttribute="trailing" constant="8" id="rfa-qn-l3l"/>
<constraint firstItem="0bV-AN-5uI" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" constant="12" id="sov-aI-I36"/>
<constraint firstItem="KF3-RI-YMK" firstAttribute="top" secondItem="IGU-bB-7Rq" secondAttribute="bottom" constant="4" id="wqV-yQ-esk"/>
<constraint firstAttribute="bottom" secondItem="d8f-n1-R4G" secondAttribute="bottom" id="yTh-UY-Ebz"/>
<constraint firstItem="mA5-Kq-bqR" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="2ZV-qG-ajn"/>
<constraint firstAttribute="trailing" secondItem="9RQ-zc-tgY" secondAttribute="trailing" constant="16" id="5Mp-9S-tFT"/>
<constraint firstItem="J5O-UN-YD8" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="81E-XF-jYY"/>
<constraint firstItem="vGs-5Q-2Ha" firstAttribute="leading" secondItem="UTS-5m-4en" secondAttribute="trailing" constant="4" id="BBr-d5-J4y"/>
<constraint firstItem="UTS-5m-4en" firstAttribute="bottom" secondItem="vGs-5Q-2Ha" secondAttribute="bottom" constant="-2" id="HW1-HP-Zk5"/>
<constraint firstItem="NFE-En-JUU" firstAttribute="top" secondItem="t0I-7e-zXg" secondAttribute="bottom" constant="4" id="HyS-me-IxB"/>
<constraint firstItem="mA5-Kq-bqR" firstAttribute="top" secondItem="9RQ-zc-tgY" secondAttribute="bottom" constant="8" id="KAZ-2g-CP2"/>
<constraint firstItem="Fds-K4-nOp" firstAttribute="leading" secondItem="t0I-7e-zXg" secondAttribute="trailing" id="KQB-AF-I7g"/>
<constraint firstItem="NFE-En-JUU" firstAttribute="leading" secondItem="r76-rY-QY7" secondAttribute="trailing" id="LiZ-uf-e99"/>
<constraint firstAttribute="trailing" secondItem="Fds-K4-nOp" secondAttribute="trailing" constant="16" id="MKp-1y-KBz"/>
<constraint firstItem="r76-rY-QY7" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="Nds-oD-j7z"/>
<constraint firstAttribute="bottom" secondItem="J5O-UN-YD8" secondAttribute="bottom" constant="8" id="QLC-Sj-zc2"/>
<constraint firstAttribute="trailing" secondItem="vGs-5Q-2Ha" secondAttribute="trailing" constant="16" id="T1O-ze-Wmc"/>
<constraint firstItem="t0I-7e-zXg" firstAttribute="top" secondItem="mA5-Kq-bqR" secondAttribute="bottom" constant="8" id="U2j-o7-fHp"/>
<constraint firstItem="vGs-5Q-2Ha" firstAttribute="centerY" secondItem="A4G-MF-BfU" secondAttribute="centerY" constant="-8" id="Uun-tF-BXb"/>
<constraint firstItem="r76-rY-QY7" firstAttribute="top" secondItem="t0I-7e-zXg" secondAttribute="bottom" constant="4" id="V4l-Wu-uev"/>
<constraint firstAttribute="bottom" secondItem="r76-rY-QY7" secondAttribute="bottom" constant="10.5" id="VG7-Jd-u98"/>
<constraint firstItem="dak-2V-HiQ" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="VNq-Zt-RVv"/>
<constraint firstItem="Fds-K4-nOp" firstAttribute="top" secondItem="vGs-5Q-2Ha" secondAttribute="bottom" constant="8" id="fEb-fb-8Aj"/>
<constraint firstAttribute="trailing" secondItem="NFE-En-JUU" secondAttribute="trailing" constant="16" id="h5q-3L-9lx"/>
<constraint firstItem="dak-2V-HiQ" firstAttribute="centerY" secondItem="t0I-7e-zXg" secondAttribute="centerY" id="j2p-uo-U43"/>
<constraint firstItem="9RQ-zc-tgY" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="lue-r8-cxO"/>
<constraint firstItem="UTS-5m-4en" firstAttribute="leading" secondItem="mA5-Kq-bqR" secondAttribute="trailing" constant="3" id="r0r-5K-LjA"/>
<constraint firstItem="t0I-7e-zXg" firstAttribute="leading" secondItem="dak-2V-HiQ" secondAttribute="trailing" id="twS-E1-tNY"/>
<constraint firstItem="9RQ-zc-tgY" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="vwi-3d-YyO"/>
<constraint firstItem="J5O-UN-YD8" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" constant="16" id="y0C-D4-QpZ"/>
</constraints>
<connections>
<outlet property="imgBg" destination="d8f-n1-R4G" id="hfd-3t-5L0"/>
<outlet property="imgState" destination="xAB-ni-LA4" id="XKI-DY-JJ5"/>
<outlet property="labelCardNumber" destination="KF3-RI-YMK" id="sSP-CZ-yGa"/>
<outlet property="labelCondition" destination="Kfg-k7-fnQ" id="WhD-gp-auo"/>
<outlet property="labelDuration" destination="IGU-bB-7Rq" id="M64-XJ-sv5"/>
<outlet property="labelPrice" destination="AxQ-ni-osZ" id="fjw-fQ-Mrh"/>
<outlet property="labelTitle" destination="etR-yz-Sdx" id="XvZ-zx-IcT"/>
</connections>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E5Q-ft-44g">
<rect key="frame" x="16" y="597" width="343" height="50"/>
......@@ -424,12 +357,11 @@
<constraint firstItem="A4G-MF-BfU" firstAttribute="top" secondItem="XPN-nu-wqZ" secondAttribute="bottom" constant="16" id="7pw-6A-Uzl"/>
<constraint firstItem="sR4-GT-KZ6" firstAttribute="top" secondItem="Wal-KO-fi9" secondAttribute="top" constant="140" id="8BC-NL-e8A"/>
<constraint firstItem="03m-hC-idC" firstAttribute="leading" secondItem="Wal-KO-fi9" secondAttribute="leading" constant="16" id="8Ob-RX-GuM"/>
<constraint firstItem="A4G-MF-BfU" firstAttribute="leading" secondItem="Wal-KO-fi9" secondAttribute="leading" constant="16" id="A3l-ye-NWG"/>
<constraint firstAttribute="trailing" secondItem="A4G-MF-BfU" secondAttribute="trailing" constant="16" id="AEm-wR-4e9"/>
<constraint firstItem="A4G-MF-BfU" firstAttribute="leading" secondItem="Wal-KO-fi9" secondAttribute="leading" id="A3l-ye-NWG"/>
<constraint firstAttribute="trailing" secondItem="A4G-MF-BfU" secondAttribute="trailing" id="AEm-wR-4e9"/>
<constraint firstAttribute="trailing" secondItem="03m-hC-idC" secondAttribute="trailing" constant="16" id="DUg-A7-qLA"/>
<constraint firstItem="E5Q-ft-44g" firstAttribute="leading" secondItem="Wal-KO-fi9" secondAttribute="leading" constant="16" id="NpH-5C-kXg"/>
<constraint firstItem="03m-hC-idC" firstAttribute="top" secondItem="qlx-J4-9qZ" secondAttribute="bottom" constant="8" id="PVM-nu-bUO"/>
<constraint firstItem="d8f-n1-R4G" firstAttribute="width" secondItem="Wal-KO-fi9" secondAttribute="height" multiplier="120:667" id="Ptl-Ri-69B"/>
<constraint firstItem="XPN-nu-wqZ" firstAttribute="leading" secondItem="Wal-KO-fi9" secondAttribute="leading" constant="16" id="RhX-tC-xPW"/>
<constraint firstItem="vMO-Gq-Z2n" firstAttribute="leading" secondItem="03m-hC-idC" secondAttribute="trailing" constant="-40" id="V9u-A4-dQG"/>
<constraint firstItem="XPN-nu-wqZ" firstAttribute="top" secondItem="03m-hC-idC" secondAttribute="bottom" constant="50" id="VCL-1V-hXS"/>
......@@ -1091,50 +1023,11 @@
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lAH-tC-jlD">
<rect key="frame" x="0.0" y="20" width="375" height="320"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ged-0k-OzE">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否对账：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5vl-v1-juQ">
<rect key="frame" x="16" y="15" width="87" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7aY-Ll-xGX">
<rect key="frame" x="111" y="5" width="248" height="40"/>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="xkV-9B-iJ9"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="全部">
<color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="actionChooseIsChecked:" destination="DJ0-jV-4Ff" eventType="touchUpInside" id="M6L-jo-hd6"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="7aY-Ll-xGX" firstAttribute="leading" secondItem="5vl-v1-juQ" secondAttribute="trailing" constant="8" id="Fgj-7Y-1hS"/>
<constraint firstAttribute="height" constant="50" id="Ru9-ja-JLP"/>
<constraint firstItem="7aY-Ll-xGX" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="sUf-t2-EV4"/>
<constraint firstAttribute="trailing" secondItem="7aY-Ll-xGX" secondAttribute="trailing" constant="16" id="uWv-xz-INz"/>
<constraint firstItem="5vl-v1-juQ" firstAttribute="leading" secondItem="ged-0k-OzE" secondAttribute="leading" constant="16" id="v60-0w-wNk"/>
<constraint firstItem="5vl-v1-juQ" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="yx7-gN-O9O"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kvi-vx-bzY">
<rect key="frame" x="0.0" y="50" width="375" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="加油单号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfj-LU-gpy">
<rect key="frame" x="16" y="15" width="87" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单 号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfj-LU-gpy">
<rect key="frame" x="16" y="15" width="88" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -1161,7 +1054,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6PD-JU-six">
<rect key="frame" x="0.0" y="100" width="375" height="50"/>
<rect key="frame" x="0.0" y="50" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开始时间：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rgO-Mt-cU5">
<rect key="frame" x="16" y="15" width="87" height="21"/>
......@@ -1191,7 +1084,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0V-Ps-aaS">
<rect key="frame" x="0.0" y="150" width="375" height="50"/>
<rect key="frame" x="0.0" y="100" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结束时间：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cLn-Yp-sQy">
<rect key="frame" x="16" y="15" width="87" height="21"/>
......@@ -1220,38 +1113,8 @@
<constraint firstItem="w8b-63-OjZ" firstAttribute="centerY" secondItem="f0V-Ps-aaS" secondAttribute="centerY" id="rES-3g-lgM"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BPU-oD-DwI">
<rect key="frame" x="0.0" y="200" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="加油员：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8mT-ZO-pVl">
<rect key="frame" x="16" y="15" width="70" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PuF-Hr-KGB">
<rect key="frame" x="110" y="5" width="249" height="40"/>
<color key="backgroundColor" red="0.93323183060000003" green="0.93339174989999996" blue="0.93322181699999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="kwO-Zw-GWs"/>
</constraints>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="PuF-Hr-KGB" firstAttribute="leading" secondItem="BPU-oD-DwI" secondAttribute="leading" constant="110" id="A8T-wN-fTj"/>
<constraint firstAttribute="height" constant="50" id="KJR-El-79f"/>
<constraint firstItem="8mT-ZO-pVl" firstAttribute="leading" secondItem="BPU-oD-DwI" secondAttribute="leading" constant="16" id="OGs-E5-D3o"/>
<constraint firstItem="8mT-ZO-pVl" firstAttribute="centerY" secondItem="BPU-oD-DwI" secondAttribute="centerY" id="Pbv-CC-SyT"/>
<constraint firstAttribute="trailing" secondItem="PuF-Hr-KGB" secondAttribute="trailing" constant="16" id="jnD-Kf-eup"/>
<constraint firstItem="PuF-Hr-KGB" firstAttribute="centerY" secondItem="BPU-oD-DwI" secondAttribute="centerY" id="mCa-gy-14w"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dzD-bu-N4P">
<rect key="frame" x="0.0" y="250" width="375" height="70"/>
<rect key="frame" x="0.0" y="150" width="375" height="70"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K9Z-iZ-JBi">
<rect key="frame" x="16" y="19" width="163.5" height="32"/>
......@@ -1297,27 +1160,20 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="ged-0k-OzE" firstAttribute="top" secondItem="lAH-tC-jlD" secondAttribute="top" id="3gF-k9-Ciw"/>
<constraint firstItem="6PD-JU-six" firstAttribute="top" secondItem="kvi-vx-bzY" secondAttribute="bottom" id="4NK-Au-vVX"/>
<constraint firstItem="6PD-JU-six" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="6TY-Gy-5br"/>
<constraint firstItem="kvi-vx-bzY" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="9yR-Ua-rzh"/>
<constraint firstAttribute="trailing" secondItem="ged-0k-OzE" secondAttribute="trailing" id="AdS-XF-2sw"/>
<constraint firstItem="BPU-oD-DwI" firstAttribute="top" secondItem="f0V-Ps-aaS" secondAttribute="bottom" id="BJd-9v-RLl"/>
<constraint firstItem="dzD-bu-N4P" firstAttribute="top" secondItem="f0V-Ps-aaS" secondAttribute="bottom" id="H1l-5X-lIu"/>
<constraint firstItem="f0V-Ps-aaS" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="I2D-MO-33V"/>
<constraint firstItem="6PD-JU-six" firstAttribute="top" secondItem="kvi-vx-bzY" secondAttribute="bottom" id="KzD-6k-eGc"/>
<constraint firstAttribute="trailing" secondItem="f0V-Ps-aaS" secondAttribute="trailing" id="R1g-os-gHC"/>
<constraint firstItem="dzD-bu-N4P" firstAttribute="top" secondItem="BPU-oD-DwI" secondAttribute="bottom" id="U68-Pu-anq"/>
<constraint firstAttribute="trailing" secondItem="BPU-oD-DwI" secondAttribute="trailing" id="VHR-nN-4mz"/>
<constraint firstItem="ged-0k-OzE" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="YPF-ms-r5a"/>
<constraint firstItem="BPU-oD-DwI" firstAttribute="top" secondItem="f0V-Ps-aaS" secondAttribute="bottom" id="YRB-WU-GoJ"/>
<constraint firstItem="kvi-vx-bzY" firstAttribute="top" secondItem="lAH-tC-jlD" secondAttribute="top" id="XYl-WX-a0d"/>
<constraint firstItem="dzD-bu-N4P" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="atm-5P-9NJ"/>
<constraint firstAttribute="trailing" secondItem="kvi-vx-bzY" secondAttribute="trailing" id="drA-oo-Uwx"/>
<constraint firstAttribute="trailing" secondItem="6PD-JU-six" secondAttribute="trailing" id="fdZ-0D-tbA"/>
<constraint firstItem="kvi-vx-bzY" firstAttribute="top" secondItem="ged-0k-OzE" secondAttribute="bottom" id="nrq-Se-dTu"/>
<constraint firstAttribute="trailing" secondItem="dzD-bu-N4P" secondAttribute="trailing" id="s25-WP-2uI"/>
<constraint firstItem="f0V-Ps-aaS" firstAttribute="top" secondItem="6PD-JU-six" secondAttribute="bottom" id="tTw-13-E9v"/>
<constraint firstAttribute="height" constant="320" id="uYs-JL-rMh"/>
<constraint firstItem="BPU-oD-DwI" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="wjM-e8-HRK"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xux-8l-yBw">
......@@ -1347,7 +1203,6 @@
<outlet property="textFieldBillNumber" destination="Tyc-ZF-j7b" id="gHO-Dg-N6B"/>
<outlet property="textFieldDate" destination="Wcq-oX-Vzb" id="cid-3S-Omf"/>
<outlet property="textFieldEndDate" destination="w8b-63-OjZ" id="FuU-8A-NEG"/>
<outlet property="textFieldStationUser" destination="PuF-Hr-KGB" id="N7h-Xp-Rof"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="BKy-20-3f2" userLabel="First Responder" sceneMemberID="firstResponder"/>
......@@ -2742,8 +2597,6 @@
<image name="btn_abled" width="326" height="46"/>
<image name="btn_disabled" width="490" height="70"/>
<image name="card_input_Bg" width="327" height="149"/>
<image name="left_scan" width="20" height="20"/>
<image name="leftvc_bill" width="19" height="20"/>
<image name="leftvc_cash" width="21" height="21"/>
<image name="leftvc_login_out" width="20" height="22"/>
<image name="leftvc_modify_psw" width="21" height="20"/>
......@@ -2758,13 +2611,11 @@
<image name="oil_detail_car" width="24" height="18"/>
<image name="oil_detail_station" width="24" height="24"/>
<image name="oil_detail_top" width="360" height="57"/>
<image name="orange_card_bg" width="116" height="101"/>
<image name="radious_select" width="13" height="14"/>
<image name="radious_unselect" width="13" height="13"/>
<image name="right_arrow" width="32" height="32"/>
<image name="scan_icon" width="25" height="23"/>
<image name="state_audit" width="50" height="47"/>
<image name="state_used" width="57" height="57"/>
<image name="wechat" width="100" height="81"/>
<image name="工分提现图标" width="20" height="28"/>
<image name="引导页1" width="360" height="640"/>
......
Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
View file @ e6bc26cb
......@@ -53,27 +53,13 @@
[tableView deselectRowAtIndexPath:indexPath animated:YES];
[kGlobal.sideSlipVC showMainView];
if (indexPath.row == 0) {//工分账单
BillListViewController *billVC = [BillListViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:billVC animated:YES];
}else if (indexPath.row == 1) {//账户
AccountViewController *accoutVC = [AccountViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
CLog(@"--------->%@",kUser.wxOpenId);
if (kUser.wxOpenId.length > 0) {
accoutVC.type = AccountViewControllerTypeBinding;
}else{
accoutVC.type = AccountViewControllerTypeUnBing;
}
[kGlobal.mainNaVC pushViewController:accoutVC animated:YES];
}else if (indexPath.row == 2) {//核销卡券
if (indexPath.row == 0) {//核销订单
[self scanCard];
}else if (indexPath.row == 3){
[self scanWatchCode];
}else if (indexPath.row == 4) {//修改密码
}else if (indexPath.row == 1) {//修改密码
ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:modifyVC animated:YES];
}else if (indexPath.row == 5) {//退出登录
}else if (indexPath.row == 2) {//退出登录
[kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
}
......
Car/CodeClass/Login/ViewControllers/LoginViewController.m
View file @ e6bc26cb
......@@ -77,13 +77,10 @@
kCanNotBeNil(self.textFieldUser.text, @"工号不能为空！");
kCanNotBeNil(self.textFieldPsw.text, @"密码不能为空！");
kCanNotBeNil(self.longtitude, @"未获取位置信息！");
NSDictionary *myDictionary = @{
@"userName" : self.textFieldUser.text,
@"password" : self.textFieldPsw.text,
@"longitude" : self.longtitude,
@"latitude" : self.latitute
@"password" : self.textFieldPsw.text
};
WS(weakSelf);
[MBProgressHUD j_loading:@"登录中…"];
......
Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m
View file @ e6bc26cb
......@@ -123,15 +123,16 @@
- (void)hideFilterView {
HIDE_KEYBOARD;
self.isOpen = NO;
self.constraintHeight.constant = 0;
// self.constraintHeight.constant = 0;
[UIView animateWithDuration:0.7
delay:0
usingSpringWithDamping:0.9
initialSpringVelocity:1.0
options:UIViewAnimationOptionCurveLinear
animations:^{
self.board.transform = CGAffineTransformMakeScale(1, 0);
self.shadow.backgroundColor = [UIColor clearColor];
[self.view layoutIfNeeded];
// [self.view layoutIfNeeded];
}
completion:^(BOOL finished) {
[self.view removeFromSuperview];
......@@ -140,7 +141,7 @@
- (void)showFilterView {
self.isOpen = YES;
self.constraintHeight.constant = 320;
// self.constraintHeight.constant = 320;
[UIView animateWithDuration:0.7
delay:0
usingSpringWithDamping:0.9
......@@ -148,7 +149,8 @@
options:UIViewAnimationOptionCurveLinear
animations:^{
self.shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
[self.view layoutIfNeeded];
// [self.view layoutIfNeeded];
self.board.transform = CGAffineTransformMakeScale(1, 0);
}
completion:nil];
}
......
Car/URL.h
View file @ e6bc26cb
......@@ -10,18 +10,18 @@
#define URL_h
#ifdef test
static NSString *const VersionName = @"车族通测试版";
static NSString *const VersionName = @"车族通客户版测试版";
static NSString *const BASE_IP = @"http://cartest.gomoretech.com";
#else
static NSString *const VersionName = @"车族通正式版";
static NSString *const VersionName = @"车族通客户版正式版";
static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
#endif
/** 请求基准地址 */
#define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP]
static NSString *const kLoginUrl = @"stationUser/login";
static NSString *const kUpgradeUrl = @"stationUser/getUpgrade";
static NSString *const kLoginUrl = @"merchantUser/login";
static NSString *const kUpgradeUrl = @"merchantUser/getUpgrade";
static NSString *const kModifyPswUrl = @"stationUser/modifyPassword";
static NSString *const kResetPswUrl = @"stationUser/resetPassword";
......
Car/tools/HttpCilent.m
View file @ e6bc26cb
......@@ -121,7 +121,7 @@
//版本号 取的是build
NSString *version = APP_VERSION;
NSDictionary *myDictionary = @{@"apptype" : @"ipa",
NSDictionary *myDictionary = @{@"apptype" : @"merchant_ios",
@"version" : version};
__weak typeof(vc) weakVC = vc;
[[[self class] shareCilent]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment