Skip to content

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

核销订单等功能完成

parent 4f34f0e9
Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 369 deletions
Car.xcodeproj/project.pbxproj
View file @ cd5f8851
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */; }; 19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */; };
3ACF93FF5CBBDE59C28DC356 /* libPods-car_base-Car-Customer Release.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C54D3C7AD614F01AAF598ED8 /* libPods-car_base-Car-Customer Release.a */; };
53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */; }; 53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */; };
8F2095511E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; }; 8F2095511E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
8F2095521E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; }; 8F2095521E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
...@@ -118,6 +119,7 @@ ...@@ -118,6 +119,7 @@
8FFE3E0C1E14AC6700BEB6A6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C71E0CC4BE00D8A57D /* Assets.xcassets */; }; 8FFE3E0C1E14AC6700BEB6A6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C71E0CC4BE00D8A57D /* Assets.xcassets */; };
8FFE3E0D1E14AC6700BEB6A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C41E0CC4BE00D8A57D /* Main.storyboard */; }; 8FFE3E0D1E14AC6700BEB6A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C41E0CC4BE00D8A57D /* Main.storyboard */; };
8FFE3E0E1E14AC6700BEB6A6 /* CodeScan.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC21E1285F700A879C1 /* CodeScan.bundle */; }; 8FFE3E0E1E14AC6700BEB6A6 /* CodeScan.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC21E1285F700A879C1 /* CodeScan.bundle */; };
F16EFE19711BD2F266C2D5A4 /* libPods-car_base-Car-Customer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B728771192ABAD4E95A586F /* libPods-car_base-Car-Customer.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
...@@ -263,8 +265,14 @@ ...@@ -263,8 +265,14 @@
8FFE3D991E13A8AA00BEB6A6 /* car_objc_json_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = car_objc_json_client.h; 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-Customer Release.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car-Customer 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>"; }; 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>"; };
9B728771192ABAD4E95A586F /* libPods-car_base-Car-Customer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car-Customer.a"; sourceTree = BUILT_PRODUCTS_DIR; };
A5E2324AC29CF797BD9B1963 /* Pods-car_base-Car-Customer Release.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car-Customer Release.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car-Customer Release/Pods-car_base-Car-Customer Release.release.xcconfig"; sourceTree = "<group>"; };
C54D3C7AD614F01AAF598ED8 /* libPods-car_base-Car-Customer Release.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car-Customer Release.a"; sourceTree = BUILT_PRODUCTS_DIR; };
D18C257D0E5B93CEB8753920 /* Pods-car_base-Car-Customer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car-Customer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car-Customer/Pods-car_base-Car-Customer.debug.xcconfig"; sourceTree = "<group>"; };
D4BC599BDCE4593FFA63789C /* Pods-car_base-Car-Customer Release.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car-Customer Release.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car-Customer Release/Pods-car_base-Car-Customer Release.debug.xcconfig"; sourceTree = "<group>"; };
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>"; }; 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; }; 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; };
F405B1E31F164E40648DEDA9 /* Pods-car_base-Car-Customer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car-Customer.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car-Customer/Pods-car_base-Car-Customer.release.xcconfig"; sourceTree = "<group>"; };
F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -274,6 +282,7 @@ ...@@ -274,6 +282,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */, 19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */,
F16EFE19711BD2F266C2D5A4 /* libPods-car_base-Car-Customer.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -296,6 +305,7 @@ ...@@ -296,6 +305,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */, 53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */,
3ACF93FF5CBBDE59C28DC356 /* libPods-car_base-Car-Customer Release.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -315,6 +325,8 @@ ...@@ -315,6 +325,8 @@
8F21E8FF1E0D05BE0066533F /* libSDWebImage.a */, 8F21E8FF1E0D05BE0066533F /* libSDWebImage.a */,
F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */, F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */,
E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */, E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */,
9B728771192ABAD4E95A586F /* libPods-car_base-Car-Customer.a */,
C54D3C7AD614F01AAF598ED8 /* libPods-car_base-Car-Customer Release.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -326,6 +338,10 @@ ...@@ -326,6 +338,10 @@
1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */, 1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */,
59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */, 59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */,
D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */, D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */,
D18C257D0E5B93CEB8753920 /* Pods-car_base-Car-Customer.debug.xcconfig */,
F405B1E31F164E40648DEDA9 /* Pods-car_base-Car-Customer.release.xcconfig */,
D4BC599BDCE4593FFA63789C /* Pods-car_base-Car-Customer Release.debug.xcconfig */,
A5E2324AC29CF797BD9B1963 /* Pods-car_base-Car-Customer Release.release.xcconfig */,
); );
name = Pods; name = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -866,7 +882,7 @@ ...@@ -866,7 +882,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car-resources.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car-Customer/Pods-car_base-Car-Customer-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
802307BB0542BA9258708321 /* [CP] Embed Pods Frameworks */ = { 802307BB0542BA9258708321 /* [CP] Embed Pods Frameworks */ = {
...@@ -881,7 +897,7 @@ ...@@ -881,7 +897,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car-frameworks.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car-Customer/Pods-car_base-Car-Customer-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
CAC7AF49CE02CC356ECE68F0 /* [CP] Embed Pods Frameworks */ = { CAC7AF49CE02CC356ECE68F0 /* [CP] Embed Pods Frameworks */ = {
...@@ -896,7 +912,7 @@ ...@@ -896,7 +912,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release-frameworks.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car-Customer Release/Pods-car_base-Car-Customer Release-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
FCA34B475FB586740CBE6248 /* [CP] Copy Pods Resources */ = { FCA34B475FB586740CBE6248 /* [CP] Copy Pods Resources */ = {
...@@ -911,7 +927,7 @@ ...@@ -911,7 +927,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release-resources.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car-Customer Release/Pods-car_base-Car-Customer Release-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
...@@ -1173,7 +1189,7 @@ ...@@ -1173,7 +1189,7 @@
}; };
8F97C2E61E0CC4BE00D8A57D /* Debug */ = { 8F97C2E61E0CC4BE00D8A57D /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 34B91CD599A3C8265AB0C96C /* Pods-car_base-Car.debug.xcconfig */; baseConfigurationReference = D18C257D0E5B93CEB8753920 /* Pods-car_base-Car-Customer.debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
...@@ -1197,7 +1213,7 @@ ...@@ -1197,7 +1213,7 @@
}; };
8F97C2E71E0CC4BE00D8A57D /* Release */ = { 8F97C2E71E0CC4BE00D8A57D /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */; baseConfigurationReference = F405B1E31F164E40648DEDA9 /* Pods-car_base-Car-Customer.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
...@@ -1285,7 +1301,7 @@ ...@@ -1285,7 +1301,7 @@
}; };
8FFE3E121E14AC6700BEB6A6 /* Debug */ = { 8FFE3E121E14AC6700BEB6A6 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */; baseConfigurationReference = D4BC599BDCE4593FFA63789C /* Pods-car_base-Car-Customer Release.debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
...@@ -1308,7 +1324,7 @@ ...@@ -1308,7 +1324,7 @@
}; };
8FFE3E131E14AC6700BEB6A6 /* Release */ = { 8FFE3E131E14AC6700BEB6A6 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */; baseConfigurationReference = A5E2324AC29CF797BD9B1963 /* Pods-car_base-Car-Customer Release.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements; CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
......
Car/Assets.xcassets/status_checked.imageset/Contents.json 0 → 100644
View file @ cd5f8851
{
"images" : [
{
"idiom" : "universal",
"filename" : "status_checked.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "status_checked@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "status_checked@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Car/Base.lproj/Main.storyboard
View file @ cd5f8851
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<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"> <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"/> <rect key="frame" x="149" y="78.5" width="82.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -263,15 +263,6 @@ ...@@ -263,15 +263,6 @@
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<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" 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="UTS-5m-4en"> <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"/> <rect key="frame" x="287" y="50" width="18" height="21"/>
<constraints> <constraints>
...@@ -293,6 +284,13 @@ ...@@ -293,6 +284,13 @@
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status_checked" translatesAutoresizingMaskIntoConstraints="NO" id="4lK-Hc-wVy">
<rect key="frame" x="295" y="0.0" width="80" height="80"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="67C-mJ-nBN"/>
<constraint firstAttribute="height" constant="80" id="Hx3-1C-2oU"/>
</constraints>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
...@@ -300,21 +298,21 @@ ...@@ -300,21 +298,21 @@
<constraint firstAttribute="trailing" secondItem="9RQ-zc-tgY" secondAttribute="trailing" constant="16" id="5Mp-9S-tFT"/> <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="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="vGs-5Q-2Ha" firstAttribute="leading" secondItem="UTS-5m-4en" secondAttribute="trailing" constant="4" id="BBr-d5-J4y"/>
<constraint firstAttribute="trailing" secondItem="4lK-Hc-wVy" secondAttribute="trailing" id="BLt-Vq-QIh"/>
<constraint firstItem="UTS-5m-4en" firstAttribute="bottom" secondItem="vGs-5Q-2Ha" secondAttribute="bottom" constant="-2" id="HW1-HP-Zk5"/> <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="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="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 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 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="bottom" secondItem="J5O-UN-YD8" secondAttribute="bottom" constant="8" id="QLC-Sj-zc2"/>
<constraint firstAttribute="height" constant="127" id="SiL-ge-fNE"/>
<constraint firstAttribute="trailing" secondItem="vGs-5Q-2Ha" secondAttribute="trailing" constant="16" id="T1O-ze-Wmc"/> <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="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="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 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 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="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 firstItem="4lK-Hc-wVy" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" id="Yfv-J9-HBS"/>
<constraint firstAttribute="trailing" secondItem="NFE-En-JUU" secondAttribute="trailing" constant="16" id="h5q-3L-9lx"/> <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="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="9RQ-zc-tgY" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="lue-r8-cxO"/>
...@@ -323,6 +321,15 @@ ...@@ -323,6 +321,15 @@
<constraint firstItem="9RQ-zc-tgY" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="vwi-3d-YyO"/> <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"/> <constraint firstItem="J5O-UN-YD8" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" constant="16" id="y0C-D4-QpZ"/>
</constraints> </constraints>
<connections>
<outlet property="imgLogo" destination="J5O-UN-YD8" id="Mzw-hd-M5T"/>
<outlet property="imgState" destination="4lK-Hc-wVy" id="6ay-QY-Ogg"/>
<outlet property="labelBillNumber" destination="t0I-7e-zXg" id="Fcu-ee-uSi"/>
<outlet property="labelDuring" destination="NFE-En-JUU" id="YII-6Y-oym"/>
<outlet property="labelMoney" destination="vGs-5Q-2Ha" id="eDx-Re-wk2"/>
<outlet property="labelSubtitle" destination="mA5-Kq-bqR" id="AOB-aI-A9D"/>
<outlet property="labelTitle" destination="9RQ-zc-tgY" id="Xsy-Mt-LFZ"/>
</connections>
</view> </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E5Q-ft-44g"> <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"/> <rect key="frame" x="16" y="597" width="343" height="50"/>
...@@ -669,157 +676,139 @@ ...@@ -669,157 +676,139 @@
<rect key="frame" x="0.0" y="64" width="375" height="603"/> <rect key="frame" x="0.0" y="64" width="375" height="603"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="166" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fte-kF-PCY"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="128" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fte-kF-PCY">
<rect key="frame" x="0.0" y="0.0" width="375" height="603"/> <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderListTableViewCell" rowHeight="166" id="tpV-M9-l1S" customClass="OrderListTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderListTableViewCell" rowHeight="128" id="tpV-M9-l1S" customClass="OrderListTableViewCell">
<rect key="frame" x="0.0" y="28" width="375" height="166"/> <rect key="frame" x="0.0" y="28" width="375" height="128"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" tag="11112222" contentMode="center" tableViewCell="tpV-M9-l1S" id="hzT-UH-DPk"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" tag="11112222" contentMode="center" tableViewCell="tpV-M9-l1S" id="hzT-UH-DPk">
<rect key="frame" x="0.0" y="0.0" width="375" height="166"/> <rect key="frame" x="0.0" y="0.0" width="375" height="128"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-04-23 12:21" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PI0-yO-xgv"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EMk-Xg-ghT" customClass="CardView">
<rect key="frame" x="50" y="16" width="154" height="23"/> <rect key="frame" x="0.0" y="0.0" width="375" height="127"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<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="1pn-6m-cer">
<rect key="frame" x="341" y="17" width="18" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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="G9f-Lv-F9O">
<rect key="frame" x="50" y="47" width="106" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="0.39995324611663818" green="0.40002685785293579" blue="0.39994865655899048" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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="roe-Vr-AS8">
<rect key="frame" x="50" y="74" width="86" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list_line" translatesAutoresizingMaskIntoConstraints="NO" id="Mdj-mP-15I">
<rect key="frame" x="16" y="115" width="343" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="SFh-fG-Nt6"/>
</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="kGS-C0-cNE">
<rect key="frame" x="16" y="116" width="52" height="40"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="80000000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m7p-3S-SOZ">
<rect key="frame" x="67" y="116" width="83" height="40"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C7n-Ft-15k">
<rect key="frame" x="297" y="125" width="62" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22.5" id="VEh-ic-B9A"/>
<constraint firstAttribute="width" constant="62" id="clM-k3-hFc"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<inset key="titleEdgeInsets" minX="-40" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="40" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="查看" image="right_arrow">
<color key="titleColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xdf-p8-5An">
<rect key="frame" x="0.0" y="156" width="375" height="10"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fcJ-bN-a8D"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CHD-Pe-WEP">
<rect key="frame" x="0.0" y="0.0" width="375" height="1"/> <rect key="frame" x="16" y="8" width="90" height="111"/>
<color key="backgroundColor" red="0.80000001190000003" green="0.80000001190000003" blue="0.80000001190000003" alpha="1" colorSpace="calibratedRGB"/> <constraints>
<constraint firstAttribute="width" constant="90" id="YaF-LN-zRs"/>
</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="3b2-8b-QTU">
<rect key="frame" x="114" y="8" width="245" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="2o1-le-bjo"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<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" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F66-us-Om2">
<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" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="单号:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4gE-Tw-xPl">
<rect key="frame" x="114" y="78.5" width="35" height="17"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="d5V-8z-4hB"/> <constraint firstAttribute="width" constant="35" id="96g-yB-u6d"/>
</constraints> </constraints>
</view> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2GA-K3-xLG"> <color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="0.0" y="9" width="375" height="1"/> <nil key="highlightedColor"/>
<color key="backgroundColor" red="0.80000001190000003" green="0.80000001190000003" blue="0.80000001190000003" alpha="1" colorSpace="calibratedRGB"/> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2110000888" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wKO-ji-8eT">
<rect key="frame" x="149" y="78.5" width="82.5" 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" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="有效日期:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ybf-JI-v6z">
<rect key="frame" x="114" y="99.5" width="68" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="68" id="7pM-Bi-l9D"/>
</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="￥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WJt-FQ-BuY">
<rect key="frame" x="287" y="50" width="18" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="v2I-JV-PX6"/> <constraint firstAttribute="width" constant="18" id="U5b-bC-oec"/>
</constraints> </constraints>
</view> <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="c3Y-ie-Xav">
<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.95902961490000005" green="0.67940151689999995" blue="0.52041810749999995" 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="ntz-3c-WfB">
<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>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status_checked" translatesAutoresizingMaskIntoConstraints="NO" id="Xuc-hU-rho">
<rect key="frame" x="295" y="0.0" width="80" height="80"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="5lv-KO-KQN"/>
<constraint firstAttribute="height" constant="80" id="udr-aW-IhI"/>
</constraints>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="2GA-K3-xLG" firstAttribute="leading" secondItem="Xdf-p8-5An" secondAttribute="leading" id="2YX-aX-Zeh"/> <constraint firstItem="Xuc-hU-rho" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" id="07L-1E-8u2"/>
<constraint firstAttribute="trailing" secondItem="2GA-K3-xLG" secondAttribute="trailing" id="CzX-a2-hE4"/> <constraint firstItem="wKO-ji-8eT" firstAttribute="leading" secondItem="4gE-Tw-xPl" secondAttribute="trailing" id="33k-eP-cNh"/>
<constraint firstItem="fcJ-bN-a8D" firstAttribute="top" secondItem="Xdf-p8-5An" secondAttribute="top" id="KWY-gG-PxH"/> <constraint firstAttribute="trailing" secondItem="3b2-8b-QTU" secondAttribute="trailing" constant="16" id="8a9-hG-Bya"/>
<constraint firstAttribute="bottom" secondItem="2GA-K3-xLG" secondAttribute="bottom" id="Lo6-fq-TUg"/> <constraint firstItem="WJt-FQ-BuY" firstAttribute="bottom" secondItem="c3Y-ie-Xav" secondAttribute="bottom" constant="-2" id="C1j-EF-AbX"/>
<constraint firstItem="fcJ-bN-a8D" firstAttribute="leading" secondItem="Xdf-p8-5An" secondAttribute="leading" id="gv6-N3-Wje"/> <constraint firstAttribute="trailing" secondItem="Xuc-hU-rho" secondAttribute="trailing" id="CHC-jN-lbp"/>
<constraint firstAttribute="height" constant="10" id="nFT-CC-sD3"/> <constraint firstItem="c3Y-ie-Xav" firstAttribute="centerY" secondItem="EMk-Xg-ghT" secondAttribute="centerY" constant="-8" id="CK1-cJ-E8D"/>
<constraint firstAttribute="trailing" secondItem="fcJ-bN-a8D" secondAttribute="trailing" id="yjF-5j-cdk"/> <constraint firstAttribute="bottom" secondItem="CHD-Pe-WEP" secondAttribute="bottom" constant="8" id="FOa-PD-r8N"/>
<constraint firstAttribute="trailing" secondItem="ntz-3c-WfB" secondAttribute="trailing" constant="16" id="KtI-Sh-44Z"/>
<constraint firstItem="3b2-8b-QTU" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="LXU-H4-Xlu"/>
<constraint firstItem="CHD-Pe-WEP" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" constant="8" id="LbE-Ve-fWE"/>
<constraint firstAttribute="bottom" secondItem="ybf-JI-v6z" secondAttribute="bottom" constant="10.5" id="QGP-aC-M1z"/>
<constraint firstItem="ntz-3c-WfB" firstAttribute="top" secondItem="wKO-ji-8eT" secondAttribute="bottom" constant="4" id="QIZ-Kq-Dnu"/>
<constraint firstItem="F66-us-Om2" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="TaH-pf-tsW"/>
<constraint firstItem="4gE-Tw-xPl" firstAttribute="centerY" secondItem="wKO-ji-8eT" secondAttribute="centerY" id="Y9W-gl-SYx"/>
<constraint firstAttribute="trailing" secondItem="c3Y-ie-Xav" secondAttribute="trailing" constant="16" id="ZJN-Fj-p5Y"/>
<constraint firstItem="3b2-8b-QTU" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" constant="8" id="Zdc-0g-flc"/>
<constraint firstItem="ybf-JI-v6z" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="ZvU-46-gM0"/>
<constraint firstItem="4gE-Tw-xPl" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="ddr-zJ-GDg"/>
<constraint firstItem="F66-us-Om2" firstAttribute="top" secondItem="3b2-8b-QTU" secondAttribute="bottom" constant="8" id="ePZ-NN-4qX"/>
<constraint firstItem="ybf-JI-v6z" firstAttribute="top" secondItem="wKO-ji-8eT" secondAttribute="bottom" constant="4" id="gyD-BS-RBL"/>
<constraint firstItem="WJt-FQ-BuY" firstAttribute="leading" secondItem="F66-us-Om2" secondAttribute="trailing" constant="3" id="hcF-gF-J2n"/>
<constraint firstItem="c3Y-ie-Xav" firstAttribute="leading" secondItem="WJt-FQ-BuY" secondAttribute="trailing" constant="4" id="hgW-Wt-QhQ"/>
<constraint firstItem="CHD-Pe-WEP" firstAttribute="leading" secondItem="EMk-Xg-ghT" secondAttribute="leading" constant="16" id="iAM-6r-hA7"/>
<constraint firstItem="ntz-3c-WfB" firstAttribute="leading" secondItem="ybf-JI-v6z" secondAttribute="trailing" id="jmE-9N-feV"/>
<constraint firstItem="wKO-ji-8eT" firstAttribute="top" secondItem="F66-us-Om2" secondAttribute="bottom" constant="8" id="kxZ-Az-Jd8"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="199" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M6y-YA-WBW">
<rect key="frame" x="303" y="14" width="34" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G0Z-or-Mw8">
<rect key="frame" x="16" y="14.5" width="25" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="DPS-Jr-lRv"/>
<constraint firstAttribute="width" constant="25" id="eZ3-fE-nyu"/>
</constraints>
<state key="normal" backgroundImage="radious_unselect"/>
<state key="disabled" backgroundImage="radious_select"/>
<state key="selected" backgroundImage="radious_select"/>
<connections>
<action selector="actionCheck:" destination="tpV-M9-l1S" eventType="touchUpInside" id="z5n-j4-kon"/>
</connections>
</button>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="Mdj-mP-15I" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="3jX-Oi-TBY"/> <constraint firstItem="EMk-Xg-ghT" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" id="6bg-Vi-wfe"/>
<constraint firstItem="roe-Vr-AS8" firstAttribute="top" secondItem="G9f-Lv-F9O" secondAttribute="bottom" constant="4" id="44O-1K-Qly"/> <constraint firstItem="EMk-Xg-ghT" firstAttribute="top" secondItem="hzT-UH-DPk" secondAttribute="top" id="Nnt-JW-4oM"/>
<constraint firstItem="G9f-Lv-F9O" firstAttribute="leading" secondItem="PI0-yO-xgv" secondAttribute="leading" id="4xb-ht-mIE"/> <constraint firstAttribute="trailing" secondItem="EMk-Xg-ghT" secondAttribute="trailing" id="iIZ-RA-gyx"/>
<constraint firstItem="PI0-yO-xgv" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="50" id="5zf-od-CeG"/> <constraint firstAttribute="bottom" secondItem="EMk-Xg-ghT" secondAttribute="bottom" constant="1" id="mCd-Px-Iad"/>
<constraint firstItem="Xdf-p8-5An" firstAttribute="top" secondItem="kGS-C0-cNE" secondAttribute="bottom" id="COz-g8-1hy"/>
<constraint firstAttribute="trailing" secondItem="C7n-Ft-15k" secondAttribute="trailing" constant="16" id="Dwe-zG-dax"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="height" secondItem="kGS-C0-cNE" secondAttribute="height" id="FuE-xr-O73"/>
<constraint firstItem="M6y-YA-WBW" firstAttribute="bottom" secondItem="1pn-6m-cer" secondAttribute="bottom" id="Fvx-pS-XxN"/>
<constraint firstItem="1pn-6m-cer" firstAttribute="centerY" secondItem="PI0-yO-xgv" secondAttribute="centerY" id="HjM-ux-o8u"/>
<constraint firstAttribute="trailing" secondItem="Xdf-p8-5An" secondAttribute="trailing" id="LCt-ow-Hdy"/>
<constraint firstItem="C7n-Ft-15k" firstAttribute="centerY" secondItem="m7p-3S-SOZ" secondAttribute="centerY" id="LgE-bQ-eMC"/>
<constraint firstItem="PI0-yO-xgv" firstAttribute="top" secondItem="hzT-UH-DPk" secondAttribute="top" constant="16" id="R4y-wx-jz3"/>
<constraint firstItem="Xdf-p8-5An" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" id="cl6-IX-PnS"/>
<constraint firstAttribute="bottom" secondItem="Xdf-p8-5An" secondAttribute="bottom" id="csy-AE-1fa"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="top" secondItem="Mdj-mP-15I" secondAttribute="bottom" id="dcZ-H6-mrD"/>
<constraint firstItem="G0Z-or-Mw8" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="drS-LW-E3E"/>
<constraint firstItem="roe-Vr-AS8" firstAttribute="leading" secondItem="G9f-Lv-F9O" secondAttribute="leading" id="epS-Hm-gw7"/>
<constraint firstItem="kGS-C0-cNE" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="fuD-Bk-D0Q"/>
<constraint firstAttribute="trailing" secondItem="Mdj-mP-15I" secondAttribute="trailing" constant="16" id="gkS-fp-Kpu"/>
<constraint firstItem="G0Z-or-Mw8" firstAttribute="centerY" secondItem="PI0-yO-xgv" secondAttribute="centerY" id="jBv-9V-kct"/>
<constraint firstItem="1pn-6m-cer" firstAttribute="leading" secondItem="M6y-YA-WBW" secondAttribute="trailing" constant="4" id="nEa-Nb-LeI"/>
<constraint firstItem="kGS-C0-cNE" firstAttribute="top" secondItem="Mdj-mP-15I" secondAttribute="bottom" id="s4w-SJ-q21"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="leading" secondItem="kGS-C0-cNE" secondAttribute="trailing" constant="-1" id="tAF-92-N0O"/>
<constraint firstAttribute="trailing" secondItem="1pn-6m-cer" secondAttribute="trailing" constant="16" id="vkN-ec-xiD"/>
<constraint firstAttribute="bottom" secondItem="Mdj-mP-15I" secondAttribute="bottom" constant="50" id="vpV-al-m9m"/>
<constraint firstItem="G9f-Lv-F9O" firstAttribute="top" secondItem="PI0-yO-xgv" secondAttribute="bottom" constant="8" id="xNC-YW-2hk"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<connections> <connections>
<outlet property="btnIsChecked" destination="G0Z-or-Mw8" id="1n3-Rn-Z58"/> <outlet property="imgLogo" destination="CHD-Pe-WEP" id="hnn-Di-4MR"/>
<outlet property="labelBillNumber" destination="m7p-3S-SOZ" id="qtj-m8-kor"/> <outlet property="imgState" destination="Xuc-hU-rho" id="NuI-bD-q5V"/>
<outlet property="labelOil" destination="roe-Vr-AS8" id="sWe-2m-pNR"/> <outlet property="labelBillNumber" destination="wKO-ji-8eT" id="twD-Zl-BAT"/>
<outlet property="labelPrice" destination="M6y-YA-WBW" id="Nfg-Dq-GhG"/> <outlet property="labelDuring" destination="ntz-3c-WfB" id="Web-xh-JfD"/>
<outlet property="labelStation" destination="G9f-Lv-F9O" id="bOW-Sf-9Co"/> <outlet property="labelMoney" destination="c3Y-ie-Xav" id="Xl2-SF-dra"/>
<outlet property="labelTime" destination="PI0-yO-xgv" id="CWQ-mQ-g4I"/> <outlet property="labelSubtitle" destination="F66-us-Om2" id="YUX-pS-nHl"/>
<outlet property="labelTitle" destination="3b2-8b-QTU" id="9B1-dk-Ngf"/>
</connections> </connections>
</tableViewCell> </tableViewCell>
</prototypes> </prototypes>
...@@ -2435,7 +2424,6 @@ ...@@ -2435,7 +2424,6 @@
<image name="leftvc_login_out" width="20" height="22"/> <image name="leftvc_login_out" width="20" height="22"/>
<image name="leftvc_modify_psw" width="21" height="20"/> <image name="leftvc_modify_psw" width="21" height="20"/>
<image name="leftvc_user_placeholder" width="58" height="58"/> <image name="leftvc_user_placeholder" width="58" height="58"/>
<image name="list_line" width="4" height="2"/>
<image name="login_bg" width="360" height="113"/> <image name="login_bg" width="360" height="113"/>
<image name="login_input_psw" width="16" height="20"/> <image name="login_input_psw" width="16" height="20"/>
<image name="login_top_icon" width="69" height="69"/> <image name="login_top_icon" width="69" height="69"/>
...@@ -2445,11 +2433,9 @@ ...@@ -2445,11 +2433,9 @@
<image name="oil_detail_car" width="24" height="18"/> <image name="oil_detail_car" width="24" height="18"/>
<image name="oil_detail_station" width="24" height="24"/> <image name="oil_detail_station" width="24" height="24"/>
<image name="oil_detail_top" width="360" height="57"/> <image name="oil_detail_top" width="360" height="57"/>
<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="scan_icon" width="25" height="23"/>
<image name="state_audit" width="50" height="47"/> <image name="state_audit" width="50" height="47"/>
<image name="status_checked" width="56" height="56"/>
<image name="wechat" width="100" height="81"/> <image name="wechat" width="100" height="81"/>
<image name="工分提现图标" width="20" height="28"/> <image name="工分提现图标" width="20" height="28"/>
<image name="引导页1" width="360" height="640"/> <image name="引导页1" width="360" height="640"/>
......
Car/CodeClass/LeftView/Models/CardModel.h
View file @ cd5f8851
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface CardModel : OtherTicketEntity @interface CardModel : ProductOrderEntity
@end @end
Car/CodeClass/LeftView/ViewControllers/CardViewController.m
View file @ cd5f8851
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#import "CardView.h" #import "CardView.h"
#import "CardModel.h" #import "CardModel.h"
@interface CardViewController () @interface CardViewController ()
@property(weak, nonatomic) IBOutlet UITextField *textFieldCardNumber; @property (weak, nonatomic) IBOutlet UITextField *textFieldCardNumber;
@property(weak, nonatomic) IBOutlet CardView *cardView; @property (weak, nonatomic) IBOutlet CardView *cardView;
@property(weak, nonatomic) IBOutlet UIImageView *imgNoCardBg; @property (weak, nonatomic) IBOutlet UIImageView *imgNoCardBg;
@property(weak, nonatomic) IBOutlet UILabel *labelFindCard; @property (weak, nonatomic) IBOutlet UILabel *labelFindCard;
@property(weak, nonatomic) IBOutlet UIButton *btnConfirm; @property (weak, nonatomic) IBOutlet UIButton *btnConfirm;
@property (strong, nonatomic) CardModel *card; @property (strong, nonatomic) CardModel *card;
@end @end
...@@ -23,112 +23,114 @@ ...@@ -23,112 +23,114 @@
@implementation CardViewController @implementation CardViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
[self configUI]; [self configUI];
[self noCard]; [self noCard];
if (self.cardNumber) { if (self.cardNumber) {
self.textFieldCardNumber.text = self.cardNumber; self.textFieldCardNumber.text = self.cardNumber;
[self httpCardWithNumber:self.cardNumber]; [self httpCardWithNumber:self.cardNumber];
} }
} }
- (void)noCard { - (void)noCard {
self.cardView.hidden = YES; self.cardView.hidden = YES;
self.labelFindCard.hidden = YES; self.labelFindCard.hidden = YES;
self.imgNoCardBg.hidden = NO; self.imgNoCardBg.hidden = NO;
self.btnConfirm.hidden = YES; self.btnConfirm.hidden = YES;
} }
- (void)findCard { - (void)findCard {
self.cardView.hidden = NO; self.cardView.hidden = NO;
self.labelFindCard.hidden = NO; self.labelFindCard.hidden = NO;
self.imgNoCardBg.hidden = YES; self.imgNoCardBg.hidden = YES;
self.btnConfirm.hidden = NO; self.btnConfirm.hidden = NO;
} }
- (void)configUIWithCard { - (void)configUIWithCard {
[self findCard]; [self findCard];
self.cardView.model = self.card; self.cardView.model = self.card;
if ([self.card.state isEqualToString:@"used"]) { self.btnConfirm.enabled = ![self.card.state isEqualToString:@"checked"];
self.btnConfirm.enabled = NO;
}
} }
- (void)configUI { - (void)configUI {
self.title = @"核销订单"; self.title = @"核销订单";
UIBarButtonItem *rightBtn = UIBarButtonItem *rightBtn =
[[UIBarButtonItem alloc] initWithTitle:@"确认查询" [[UIBarButtonItem alloc] initWithTitle:@"确认查询"
style:UIBarButtonItemStyleDone style:UIBarButtonItemStyleDone
target:self target:self
action:@selector(actionCard)]; action:@selector(actionCard)];
self.navigationItem.rightBarButtonItem = rightBtn; self.navigationItem.rightBarButtonItem = rightBtn;
} }
- (void)httpCardWithNumber:(NSString *)number { - (void)httpCardWithNumber:(NSString *)number {
NSString *url = kStrPrefix(number, kGetTicketUrl); NSString *url = kStrPrefix(number, kGetTicketUrl);
[MBProgressHUD j_loading:@"查询中…"]; [MBProgressHUD j_loading:@"查询中…"];
WS(weakSelf); WS(weakSelf);
[kHttp GET:url [kHttp GET:url
parameters:nil parameters:nil
complete:^(id _Nullable response, NSError *_Nullable error) { complete:^(id _Nullable response, NSError *_Nullable error) {
[MBProgressHUD j_hideLoadingView]; [MBProgressHUD j_hideLoadingView];
if (kRsSuccess(response)) { if (kRsSuccess(response)) {
weakSelf.card = [[CardModel alloc] initWithDictionary:response[@"data"] error:nil]; weakSelf.card = [[CardModel alloc] initWithDictionary:response[@"data"] error:nil];
[weakSelf configUIWithCard]; [weakSelf configUIWithCard];
} else { } else {
kShowRsMsg(response); kShowRsMsg(response);
} }
}]; }];
} }
- (void)actionCard { - (void)actionCard {
HIDE_KEYBOARD; HIDE_KEYBOARD;
kCanNotBeNil(self.textFieldCardNumber.text, @"卡券号不能为空！"); kCanNotBeNil(self.textFieldCardNumber.text, @"卡券号不能为空！");
[self httpCardWithNumber:self.textFieldCardNumber.text]; [self httpCardWithNumber:self.textFieldCardNumber.text];
} }
/* /*
扫描二维码 扫描二维码
*/ */
- (IBAction)actionScan:(id)sender { - (IBAction)actionScan:(id)sender {
[self.navigationController popViewControllerAnimated:YES]; [self.navigationController popViewControllerAnimated:YES];
} }
/** /**
确认销券 确认销券
*/ */
- (IBAction)actionOffset:(id)sender { - (IBAction)actionOffset:(id)sender {
WS(weakSelf); WS(weakSelf);
[self alertTitle:@"确认销券？" msg:nil okAction:^(UIAlertAction * _Nullable action) { [self alertTitle:@"确认销券？"
[weakSelf httpCheckCard]; msg:nil
} cancelAction:nil]; okAction:^(UIAlertAction *_Nullable action) {
[weakSelf httpCheckCard];
}
cancelAction:nil];
} }
/** /**
销券 销券
*/ */
- (void)httpCheckCard { - (void)httpCheckCard {
CheckTicketRequest *param = [[CheckTicketRequest alloc] init]; CheckProductOrderRequest *param = [CheckProductOrderRequest new];
// [MBProgressHUD j_loading];
// param.checkDate = [[NSDate date] httpParameterString];
// param.checkManId = kUser.fid; [MBProgressHUD j_loading];
// param.checkManName = kUser.realName; param.checkDate = [[NSDate date] httpParameterString];
// param.ticketNumber = self.card.ticketNumber; param.checkManId = kUser.fid;
// WS(weakSelf); param.checkManName = kUser.realName;
// [kHttp POST:kCheckTicketUrl parameters:[param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) { param.checkKey = self.card.checkKey;
// [MBProgressHUD j_hideLoadingView]; WS(weakSelf);
// if (kRsSuccess(response)) { [kHttp POST:kCheckTicketUrl parameters:[param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) {
// [MBProgressHUD j_textOnly:@"销券成功！"]; [MBProgressHUD j_hideLoadingView];
// weakSelf.card.state = @"used"; if (kRsSuccess(response)) {
// [weakSelf configUIWithCard]; [MBProgressHUD j_textOnly:@"核销成功！"];
// }else{ weakSelf.card.state = @"checked";
// kShowRsMsg(response); [weakSelf configUIWithCard];
// } }else{
// }]; kShowRsMsg(response);
}
}];
} }
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
@end @end
Car/CodeClass/LeftView/Views/CardView.h
View file @ cd5f8851
...@@ -9,12 +9,41 @@ ...@@ -9,12 +9,41 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "CardModel.h" #import "CardModel.h"
@interface CardView : UIView @interface CardView : UIView
@property (weak, nonatomic) IBOutlet UIImageView *imgBg; /**
左侧的图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *imgLogo;
/**
标题
*/
@property (weak, nonatomic) IBOutlet UILabel *labelTitle; @property (weak, nonatomic) IBOutlet UILabel *labelTitle;
@property (weak, nonatomic) IBOutlet UILabel *labelPrice;
@property (weak, nonatomic) IBOutlet UILabel *labelCondition; /**
副标题
*/
@property (weak, nonatomic) IBOutlet UILabel *labelSubtitle;
/**
单号
*/
@property (weak, nonatomic) IBOutlet UILabel *labelBillNumber;
/**
有效日期
*/
@property (weak, nonatomic) IBOutlet UILabel *labelDuring;
/**
状态
*/
@property (weak, nonatomic) IBOutlet UIImageView *imgState; @property (weak, nonatomic) IBOutlet UIImageView *imgState;
@property (weak, nonatomic) IBOutlet UILabel *labelDuration;
@property (weak, nonatomic) IBOutlet UILabel *labelCardNumber; /**
金额
*/
@property (weak, nonatomic) IBOutlet UILabel *labelMoney;
@property (strong, nonatomic) CardModel *model; @property (strong, nonatomic) CardModel *model;
@end @end
Car/CodeClass/LeftView/Views/CardView.m
View file @ cd5f8851
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "CardView.h" #import "CardView.h"
#import "CalculateHelper.h" #import "CalculateHelper.h"
#import "UIImageView+WebCache.h"
@implementation CardView @implementation CardView
/* /*
...@@ -19,25 +20,12 @@ ...@@ -19,25 +20,12 @@
*/ */
- (void)setModel:(CardModel *)model { - (void)setModel:(CardModel *)model {
_model = model; _model = model;
self.labelTitle.text = model.name; [self.imgLogo sd_setImageWithURL:[NSURL URLWithString:model.productImageUrl]];
self.labelPrice.text = [model.total stringValue]; self.labelTitle.text = model.productName;
self.labelDuration.text = [NSString stringWithFormat:@"%@~%@",[model.startDate substringToIndex:11],[model.endDate substringToIndex:11]]; self.labelBillNumber.text = model.billNumber;
self.labelCondition.text = model.remak; self.labelMoney.text = [model.realPayTotal stringValue];
self.labelCardNumber.text = kStrPrefix(model.ticketNumber, @"券号："); self.imgState.hidden = ![model.state isEqualToString:@"checked"];
if ([model.state isEqualToString:@"used"]) {
[self used];
}else{
[self unUse];
}
}
- (void)unUse {
self.imgBg.image = [UIImage imageNamed:@"orange_card_bg"];
self.imgState.hidden = YES;
}
- (void)used {
self.imgBg.image = [UIImage imageNamed:@"gray_card_bg"];
self.imgState.hidden = NO;
} }
@end @end
Car/CodeClass/Main/Cells/OrderListTableViewCell.h
View file @ cd5f8851
...@@ -9,21 +9,47 @@ ...@@ -9,21 +9,47 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface OrderListTableViewCell : UITableViewCell @interface OrderListTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UILabel *labelTime;
@property (weak, nonatomic) IBOutlet UILabel *labelStation; /**
@property (weak, nonatomic) IBOutlet UILabel *labelOil; 左侧的图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *imgLogo;
/**
标题
*/
@property (weak, nonatomic) IBOutlet UILabel *labelTitle;
/**
副标题
*/
@property (weak, nonatomic) IBOutlet UILabel *labelSubtitle;
/**
单号
*/
@property (weak, nonatomic) IBOutlet UILabel *labelBillNumber; @property (weak, nonatomic) IBOutlet UILabel *labelBillNumber;
@property (weak, nonatomic) IBOutlet UILabel *labelPrice;
@property (weak, nonatomic) IBOutlet UIButton *btnIsChecked;
/**
有效日期
*/
@property (weak, nonatomic) IBOutlet UILabel *labelDuring;
/**
状态
*/
@property (weak, nonatomic) IBOutlet UIImageView *imgState;
/** /**
cell刷新 金额
*/
@property (weak, nonatomic) IBOutlet UILabel *labelMoney;
@param array 数据 /**
@param indexPath 位置 使用条件
@param isShow 是否显示checkbox
@param isAll 是否全选
*/ */
- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll; @property (weak, nonatomic) IBOutlet UILabel *labelCondition;
- (void)configCellWithModel:(ProductOrderEntity *)model;
@end @end
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
View file @ cd5f8851
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#import "OrderListTableViewCell.h" #import "OrderListTableViewCell.h"
#import "OrderListModel.h" #import "OrderListModel.h"
#import "UIImageView+WebCache.h"
@interface OrderListTableViewCell () @interface OrderListTableViewCell ()
@property (strong, nonatomic) OrderListModel *model; @property (strong, nonatomic) OrderListModel *model;
@end @end
...@@ -17,33 +16,16 @@ ...@@ -17,33 +16,16 @@
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
[self.btnIsChecked setBackgroundImage:[UIImage imageNamed:@"radious_select_gray"] forState:UIControlStateDisabled | UIControlStateSelected];
// Initialization code
} }
- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll{ - (void)configCellWithModel:(ProductOrderEntity *)model; {
OrderListModel *model = array[indexPath.row]; [self.imgLogo sd_setImageWithURL:[NSURL URLWithString:model.productImageUrl]];
self.model = model; self.labelTitle.text = model.productName;
self.labelTime.text = model.payTime;
self.labelStation.text = [NSString stringWithFormat:@"%@ - %@", model.stationName, model.stationUserName];
self.labelOil.text = [NSString stringWithFormat:@"%@ - %@", model.gasItemName, model.oilGunName];
self.labelBillNumber.text = model.billNumber; self.labelBillNumber.text = model.billNumber;
self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.realPayTotal]; self.labelMoney.text = [model.realPayTotal stringValue];
self.imgState.hidden = ![model.state isEqualToString:@"checked"];
self.btnIsChecked.selected = model.isSelected;
if ([model.checkState isEqualToString:@"checked"]) {
self.btnIsChecked.enabled = NO;
} else {
self.btnIsChecked.enabled = YES;
}
self.btnIsChecked.hidden = !isShow;
}
- (IBAction)actionCheck:(UIButton *)sender {
sender.selected = !sender.isSelected;
self.model.isSelected = sender.isSelected;
[[NSNotificationCenter defaultCenter] postNotificationName:kNotiSelectBill object:self.model];
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
Car/CodeClass/Main/ViewControllers/MainViewController.m
View file @ cd5f8851
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
[super viewDidLoad]; [super viewDidLoad];
[self httpRequest]; [self httpRequest];
self.view.backgroundColor = [UIColor whiteColor]; self.view.backgroundColor = [UIColor whiteColor];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(actionNoti:) name:kNotiSelectBill object:nil]; // self.tableView.rowHeight = UITableViewAutomaticDimension;
// self.tableView.estimatedRowHeight = 140;
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
...@@ -45,7 +46,10 @@ ...@@ -45,7 +46,10 @@
[MBProgressHUD j_hideLoadingView]; [MBProgressHUD j_hideLoadingView];
if (kRsSuccess(response)) { if (kRsSuccess(response)) {
weakSelf.total = [[TradeStatisticsResult alloc] initWithDictionary:response[@"data"][@"total"] error:nil]; for (NSDictionary *dict in response[@"data"][@"records"]) {
ProductOrderEntity *order = [[ProductOrderEntity alloc] initWithDictionary:dict error:nil];
[weakSelf.arrData addObject:order];
};
[weakSelf listTableViewReloadData]; [weakSelf listTableViewReloadData];
...@@ -61,16 +65,14 @@ ...@@ -61,16 +65,14 @@
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 166; return 128;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.arrData.count;
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath]; OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath];
ProductOrderEntity *entity = self.arrData[indexPath.row];
[cell configCellWithModel:entity];
// [cell configCellArray:self.arrData indexPath:indexPath isShow:self.btnCheck.isSelected isAll:self.btnSelectAll.selected]; // [cell configCellArray:self.arrData indexPath:indexPath isShow:self.btnCheck.isSelected isAll:self.btnSelectAll.selected];
return cell; return cell;
} }
...@@ -84,9 +86,9 @@ ...@@ -84,9 +86,9 @@
- (void)listDidSelect:(id)model { - (void)listDidSelect:(id)model {
OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; // OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
detailVC.model = model; // detailVC.model = model;
[self.navigationController pushViewController:detailVC animated:YES]; // [self.navigationController pushViewController:detailVC animated:YES];
} }
#pragma mark - actions #pragma mark - actions
...@@ -138,7 +140,7 @@ ...@@ -138,7 +140,7 @@
order.field = @"payTime"; order.field = @"payTime";
order.direction = @"desc"; order.direction = @"desc";
_param.orders = (NSArray<QueryOrder> *) @[ order ]; _param.orders = (NSArray<QueryOrder> *) @[ order ];
_param.merchantId = kUser.fid; // _param.merchantId = kUser.fid;
// _param.state = @"paid, invalid"; // _param.state = @"paid, invalid";
_param.beginDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 00:00:00"]; _param.beginDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 00:00:00"];
_param.endDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 23:59:59"]; _param.endDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 23:59:59"];
......
Car/URL.h
View file @ cd5f8851
...@@ -33,8 +33,9 @@ static NSString *const kAccountGetUrl = @"account/get"; ...@@ -33,8 +33,9 @@ static NSString *const kAccountGetUrl = @"account/get";
//查询加油员账户流水列表 //查询加油员账户流水列表
static NSString *const kAccountQueryUrl = @"account/query"; static NSString *const kAccountQueryUrl = @"account/query";
static NSString *const kRePrintUrl = @"printer/printRefuelBill"; static NSString *const kRePrintUrl = @"printer/printRefuelBill";
static NSString *const kGetTicketUrl = @"ticket/get?ticketNumber="; //根据兑换码获取订单
static NSString *const kCheckTicketUrl = @"ticket/check"; static NSString *const kGetTicketUrl = @"productorder/getByCheckKey?checkKey=";
static NSString *const kCheckTicketUrl = @"productorder/check";
static NSString *const kWatchLogin = @"stationUser/token/send"; static NSString *const kWatchLogin = @"stationUser/token/send";
//查询用户申请提现记录 //查询用户申请提现记录
......
Car/car_objc_json_client.h
View file @ cd5f8851
...@@ -433,7 +433,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -433,7 +433,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *balance; @property (nonatomic, strong) NSNumber *balance;
/** /**
* 方法: 取得日订单数量 * 方法: 取得日订单数量
* *
...@@ -445,7 +445,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -445,7 +445,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *drawBalance; @property (nonatomic, strong) NSNumber *drawBalance;
@end /* interface StationUserAcctEntity */ @end /* interface StationUserAcctEntity */
...@@ -617,13 +617,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -617,13 +617,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *workpoint; @property (nonatomic, strong) NSNumber *workpoint;
/** /**
* 提现金额 * 提现金额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *cash; @property (nonatomic, strong) NSNumber *cash;
/** /**
* 状态 * 状态
* *
...@@ -905,7 +905,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -905,7 +905,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *price; @property (nonatomic, strong) NSNumber *price;
/** /**
* 描述 * 描述
* *
...@@ -1181,13 +1181,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -1181,13 +1181,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *total; @property (nonatomic, strong) NSNumber *total;
/** /**
* 实际抵扣金额 * 实际抵扣金额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *realPayTotal; @property (nonatomic, strong) NSNumber *realPayTotal;
/** /**
* 状态 * 状态
* *
...@@ -1342,19 +1342,19 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -1342,19 +1342,19 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *total; @property (nonatomic, strong) NSNumber *total;
/** /**
* 实际支付金额 * 实际支付金额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *realPayTotal; @property (nonatomic, strong) NSNumber *realPayTotal;
/** /**
* 优惠金额 * 优惠金额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *discountAmount; @property (nonatomic, strong) NSNumber *discountAmount;
/** /**
* 支付时间 * 支付时间
* *
...@@ -1620,13 +1620,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -1620,13 +1620,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *total; @property (nonatomic, strong) NSNumber *total;
/** /**
* 方法: 取得实付金额 * 方法: 取得实付金额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *realPayTotal; @property (nonatomic, strong) NSNumber *realPayTotal;
/** /**
* 方法: 取得支付时间 * 方法: 取得支付时间
* *
...@@ -1644,7 +1644,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -1644,7 +1644,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *deduct; @property (nonatomic, strong) NSNumber *deduct;
/** /**
* 方法: 取得是否开票 * 方法: 取得是否开票
* *
...@@ -1808,19 +1808,19 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -1808,19 +1808,19 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *oldBalance; @property (nonatomic, strong) NSNumber *oldBalance;
/** /**
* 方法: 取得发生额 * 方法: 取得发生额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *occur; @property (nonatomic, strong) NSNumber *occur;
/** /**
* 方法: 取得变化后余额 * 方法: 取得变化后余额
* *
* *
*/ */
@property (nonatomic, strong) NSDecimalNumber *fnewBalance; @property (nonatomic, strong) NSNumber *fnewBalance;
/** /**
* 方法: 取得业务单号 * 方法: 取得业务单号
* *
...@@ -2241,10 +2241,10 @@ extern NSString * const QUERYORDERDIRECTION_DESC; ...@@ -2241,10 +2241,10 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
@interface ProductOrderQueryResult : RsQueryResult @interface ProductOrderQueryResult : RsQueryResult
/** /**
* 查询结果集合 * 查询结果集合
* @see OrderEntity * @see ProductOrderEntity
* *
*/ */
@property (nonatomic, strong) NSArray<OrderEntity> *records; @property (nonatomic, strong) NSArray<ProductOrderEntity> *records;
@end /* interface ProductOrderQueryResult */ @end /* interface ProductOrderQueryResult */
......
Car/tools/BaseClass/BaseListViewController.m
View file @ cd5f8851
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
#pragma mark - life cycle #pragma mark - life cycle
- (void)viewDidLoad - (void)viewDidLoad {
{
[super viewDidLoad]; [super viewDidLoad];
self.pageSize = 15; self.pageSize = 15;
...@@ -31,25 +30,21 @@ ...@@ -31,25 +30,21 @@
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
- (void)viewDidAppear:(BOOL)animated - (void)viewDidAppear:(BOOL)animated {
{
[super viewDidAppear:animated]; [super viewDidAppear:animated];
} }
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated {
{
[super viewWillAppear:animated]; [super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:NO animated:YES]; [self.navigationController setNavigationBarHidden:NO animated:YES];
} }
- (void)viewWillDisappear:(BOOL)animated - (void)viewWillDisappear:(BOOL)animated {
{
[super viewWillDisappear:animated]; [super viewWillDisappear:animated];
[self.navigationController setNavigationBarHidden:NO animated:YES]; [self.navigationController setNavigationBarHidden:NO animated:YES];
} }
- (void)didReceiveMemoryWarning - (void)didReceiveMemoryWarning {
{
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
...@@ -57,8 +52,7 @@ ...@@ -57,8 +52,7 @@
/** /**
* 启用分页加载（最好在ViewDidLoad里面调用） * 启用分页加载（最好在ViewDidLoad里面调用）
*/ */
- (void)paggingMode - (void)paggingMode {
{
WS(weakSelf); WS(weakSelf);
self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
weakSelf.page = 0; weakSelf.page = 0;
...@@ -74,37 +68,31 @@ ...@@ -74,37 +68,31 @@
weakSelf.page++; weakSelf.page++;
[weakSelf httpRequest]; [weakSelf httpRequest];
}]; }];
self.tableView.mj_footer.hidden = YES; self.tableView.mj_footer.automaticallyHidden = YES;
} }
- (void)refresh - (void)refresh {
{
[self.tableView.mj_header beginRefreshing]; [self.tableView.mj_header beginRefreshing];
} }
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
{
return self.arrData.count; return self.arrData.count;
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
{
[tableView deselectRowAtIndexPath:indexPath animated:YES]; [tableView deselectRowAtIndexPath:indexPath animated:YES];
[self listDidSelect:self.arrData[indexPath.row]]; [self listDidSelect:self.arrData[indexPath.row]];
} }
#pragma mark - empty state #pragma mark - empty state
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView {
{
return [UIImage imageNamed:@"list_no_data"]; return [UIImage imageNamed:@"list_no_data"];
} }
- (void)emptyDataSet:(UIScrollView *)scrollView didTapView:(UIView *)view - (void)emptyDataSet:(UIScrollView *)scrollView didTapView:(UIView *)view {
{
[self.tableView.mj_header beginRefreshing]; [self.tableView.mj_header beginRefreshing];
} }
- (CAAnimation *)imageAnimationForEmptyDataSet:(UIScrollView *)scrollView - (CAAnimation *)imageAnimationForEmptyDataSet:(UIScrollView *)scrollView {
{
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform"]; CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform"];
animation.fromValue = [NSValue valueWithCATransform3D:CATransform3DIdentity]; animation.fromValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeRotation(M_PI_2, 0.0, 0.0, 1.0)]; animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeRotation(M_PI_2, 0.0, 0.0, 1.0)];
...@@ -115,40 +103,39 @@ ...@@ -115,40 +103,39 @@
return animation; return animation;
} }
- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView - (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView {
{
return [UIColor whiteColor]; return [UIColor whiteColor];
} }
- (IBAction)actionAdd:(UIButton *)sender - (IBAction)actionAdd:(UIButton *)sender {
{
} }
- (void)listTableViewReloadData - (void)listTableViewReloadData {
{
[MBProgressHUD j_hideLoadingView]; [MBProgressHUD j_hideLoadingView];
[self.tableView reloadData];
[self.tableView j_endRefresh];
self.tableView.mj_footer.hidden = self.arrData.count == 0;
if (self.arrData.count < self.pageSize * self.page) {
[self.tableView.mj_footer endRefreshingWithNoMoreData];
}
if (self.page == 0) { if (self.page == 0) {
[self.tableView j_endRefresh];
[self.tableView.mj_footer resetNoMoreData]; [self.tableView.mj_footer resetNoMoreData];
} else {
if (self.arrData.count < self.pageSize * self.page) {
[self.tableView.mj_footer endRefreshingWithNoMoreData];
} else {
[self.tableView j_endRefresh];
}
} }
[self.tableView reloadData];
} }
- (void)listTableViewReloadDataWithNewRecord:(NSArray *)newRecord - (void)listTableViewReloadDataWithNewRecord:(NSArray *)newRecord {
{
[self listTableViewReloadData]; [self listTableViewReloadData];
CLog(@"newrecord count = %lu", newRecord.count); CLog(@"newrecord count = %lu", newRecord.count);
if ([newRecord count] < self.pageSize) { if ([newRecord count] < self.pageSize) {
[self.tableView.mj_footer endRefreshingWithNoMoreData]; [self.tableView.mj_footer endRefreshingWithNoMoreData];
} }
} }
- (NSMutableArray *)arrData - (NSMutableArray *)arrData {
{
if (!_arrData) { if (!_arrData) {
_arrData = [NSMutableArray array]; _arrData = [NSMutableArray array];
} }
......
Car/tools/Catogorys/UITableView+Addtions.m
View file @ cd5f8851
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
@implementation UITableView (Addtions) @implementation UITableView (Addtions)
- (void)j_endRefresh { - (void)j_endRefresh {
// if ([self.mj_header isRefreshing]) { if ([self.mj_header isRefreshing]) {
[self.mj_header endRefreshing]; [self.mj_header endRefreshing];
// }else if ([self.mj_footer isRefreshing]) { }else if ([self.mj_footer isRefreshing]) {
[self.mj_footer endRefreshing]; [self.mj_footer endRefreshing];
// } }
} }
@end @end
Podfile
View file @ cd5f8851
...@@ -4,7 +4,7 @@ abstract_target 'car_base' do ...@@ -4,7 +4,7 @@ abstract_target 'car_base' do
pod 'AFNetworking', '~> 3.1.0' pod 'AFNetworking', '~> 3.1.0'
pod 'SDWebImage', '~> 3.7.5' pod 'SDWebImage', '~> 3.7.5'
pod 'MBProgressHUD', '~> 1.0.0' pod 'MBProgressHUD', '~> 1.0.0'
pod 'MJRefresh', '~> 3.1.2' pod 'MJRefresh'
pod 'IQKeyboardManager', '~> 4.0.6' pod 'IQKeyboardManager', '~> 4.0.6'
pod 'JSONModel', '~> 1.2.0' pod 'JSONModel', '~> 1.2.0'
pod 'DZNEmptyDataSet', '~> 1.8.1' pod 'DZNEmptyDataSet', '~> 1.8.1'
...@@ -14,9 +14,9 @@ abstract_target 'car_base' do ...@@ -14,9 +14,9 @@ abstract_target 'car_base' do
pod 'ZXingObjC', '~> 3.0' pod 'ZXingObjC', '~> 3.0'
pod 'UMengUShare/Social/WeChat' pod 'UMengUShare/Social/WeChat'
target 'Car' do target 'Car-Customer' do
end end
target 'Car Release' do target 'Car-Customer Release' do
end end
end end
Podfile.lock
View file @ cd5f8851
...@@ -42,7 +42,7 @@ DEPENDENCIES: ...@@ -42,7 +42,7 @@ DEPENDENCIES:
- JPush (~> 2.2.0.1) - JPush (~> 2.2.0.1)
- JSONModel (~> 1.2.0) - JSONModel (~> 1.2.0)
- MBProgressHUD (~> 1.0.0) - MBProgressHUD (~> 1.0.0)
- MJRefresh (~> 3.1.2) - MJRefresh
- SDWebImage (~> 3.7.5) - SDWebImage (~> 3.7.5)
- UMengAnalytics-NO-IDFA - UMengAnalytics-NO-IDFA
- UMengUShare/Social/WeChat - UMengUShare/Social/WeChat
...@@ -62,6 +62,6 @@ SPEC CHECKSUMS: ...@@ -62,6 +62,6 @@ SPEC CHECKSUMS:
UMengUShare: fc0a98b8d5297632e82874318fd72a10d17da228 UMengUShare: fc0a98b8d5297632e82874318fd72a10d17da228
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
PODFILE CHECKSUM: e9648119590790f6e637a439070d1eeaeac8afa5 PODFILE CHECKSUM: 267d7a77c2851d02af19b01794259d6389bb108e
COCOAPODS: 1.2.0 COCOAPODS: 1.2.0
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