Skip to content

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

工分提现界面搭建

parent b951351f
Hide whitespace changes
Inline Side-by-side
Showing with 484 additions and 49 deletions
Car Release.plist
View file @ 9e38f03d
......@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>1.0.2</string>
<key>CFBundleVersion</key>
<string>1.0.1</string>
<string>1.0.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
......
Car.xcodeproj/project.pbxproj
View file @ 9e38f03d
......@@ -21,6 +21,8 @@
8F42C00A1E10BC5400A54D40 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0091E10BC5400A54D40 /* OrderListTableViewCell.m */; };
8F42C00D1E10BF2900A54D40 /* OrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C00C1E10BF2900A54D40 /* OrderListModel.m */; };
8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F725CB21E120649006B597D /* OrderDetailViewController.m */; };
8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
8F8105651E10ECC3009A2AB3 /* UIView+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105641E10ECC3009A2AB3 /* UIView+Category.m */; };
8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105671E10F58A009A2AB3 /* OrderListFilterViewController.m */; };
8F81056E1E110174009A2AB3 /* DateTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F81056D1E110174009A2AB3 /* DateTextField.m */; };
......@@ -166,6 +168,8 @@
8F42C00C1E10BF2900A54D40 /* OrderListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderListModel.m; sourceTree = "<group>"; };
8F725CB11E120649006B597D /* OrderDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailViewController.h; sourceTree = "<group>"; };
8F725CB21E120649006B597D /* OrderDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailViewController.m; sourceTree = "<group>"; };
8F791BF31E4B0E89005FCB92 /* AccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountViewController.h; sourceTree = "<group>"; };
8F791BF41E4B0E89005FCB92 /* AccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountViewController.m; sourceTree = "<group>"; };
8F8105631E10ECC3009A2AB3 /* UIView+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Category.h"; sourceTree = "<group>"; };
8F8105641E10ECC3009A2AB3 /* UIView+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Category.m"; sourceTree = "<group>"; };
8F8105661E10F58A009A2AB3 /* OrderListFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderListFilterViewController.h; sourceTree = "<group>"; };
......@@ -341,6 +345,56 @@
path = Cells;
sourceTree = "<group>";
};
8F791BED1E4B0E66005FCB92 /* Account（公分提现） */ = {
isa = PBXGroup;
children = (
8F791BEE1E4B0E66005FCB92 /* Cells */,
8F791BEF1E4B0E66005FCB92 /* Models */,
8F791BF01E4B0E66005FCB92 /* ViewConstrollers */,
8F791BF11E4B0E66005FCB92 /* ViewModels */,
8F791BF21E4B0E66005FCB92 /* Views */,
);
name = "Account（公分提现）";
path = Account;
sourceTree = "<group>";
};
8F791BEE1E4B0E66005FCB92 /* Cells */ = {
isa = PBXGroup;
children = (
);
path = Cells;
sourceTree = "<group>";
};
8F791BEF1E4B0E66005FCB92 /* Models */ = {
isa = PBXGroup;
children = (
);
path = Models;
sourceTree = "<group>";
};
8F791BF01E4B0E66005FCB92 /* ViewConstrollers */ = {
isa = PBXGroup;
children = (
8F791BF31E4B0E89005FCB92 /* AccountViewController.h */,
8F791BF41E4B0E89005FCB92 /* AccountViewController.m */,
);
path = ViewConstrollers;
sourceTree = "<group>";
};
8F791BF11E4B0E66005FCB92 /* ViewModels */ = {
isa = PBXGroup;
children = (
);
path = ViewModels;
sourceTree = "<group>";
};
8F791BF21E4B0E66005FCB92 /* Views */ = {
isa = PBXGroup;
children = (
);
path = Views;
sourceTree = "<group>";
};
8F97C2AF1E0CC4BE00D8A57D = {
isa = PBXGroup;
children = (
......@@ -415,6 +469,7 @@
8F97C2EE1E0CCD2B00D8A57D /* CodeClass */ = {
isa = PBXGroup;
children = (
8F791BED1E4B0E66005FCB92 /* Account（公分提现） */,
8F97C3171E0CEBA900D8A57D /* Main */,
8F97C3091E0CE83B00D8A57D /* LeftView */,
8F97C2EF1E0CCD6500D8A57D /* Login */,
......@@ -939,6 +994,7 @@
8FC2BDBE1E12840300A879C1 /* LBXScanViewStyle.m in Sources */,
8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */,
8F42BFFB1E0D208C00A54D40 /* GlobalInstance.m in Sources */,
8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */,
8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */,
8FED4FC51E1252F200591647 /* CalculateHelper.m in Sources */,
8FFE3D9A1E13A8AA00BEB6A6 /* car_objc_json_client.m in Sources */,
......@@ -1013,6 +1069,7 @@
8FFE3DF81E14AC6700BEB6A6 /* LBXScanViewStyle.m in Sources */,
8FFE3DF91E14AC6700BEB6A6 /* OrderDetailViewController.m in Sources */,
8FFE3DFA1E14AC6700BEB6A6 /* GlobalInstance.m in Sources */,
8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */,
8FFE3DFB1E14AC6700BEB6A6 /* OrderListFilterViewController.m in Sources */,
8FFE3DFC1E14AC6700BEB6A6 /* CalculateHelper.m in Sources */,
8FFE3DFD1E14AC6700BEB6A6 /* car_objc_json_client.m in Sources */,
......
Car/Assets.xcassets/公分提现/Contents.json 0 → 100644
View file @ 9e38f03d
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Car/Assets.xcassets/公分提现/wechat.imageset/Contents.json 0 → 100644
View file @ 9e38f03d
{
"images" : [
{
"idiom" : "universal",
"filename" : "wechat.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "wechat@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "wechat@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Car/Assets.xcassets/公分提现/工分提现图标.imageset/Contents.json 0 → 100644
View file @ 9e38f03d
{
"images" : [
{
"idiom" : "universal",
"filename" : "工分提现图标.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "工分提现图标@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "工分提现图标@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Car/Base.lproj/Main.storyboard
View file @ 9e38f03d
......@@ -7,6 +7,7 @@
<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>
<scenes>
......@@ -722,7 +723,7 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cXM-5C-QrS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-287" y="1415"/>
<point key="canvasLocation" x="-222" y="1415"/>
</scene>
<!--加油单-->
<scene sceneID="Ujh-8H-jYk">
......@@ -1109,7 +1110,7 @@
</connections>
</tapGestureRecognizer>
</objects>
<point key="canvasLocation" x="486" y="2096"/>
<point key="canvasLocation" x="486" y="2118"/>
</scene>
<!--Bill List View Controller-->
<scene sceneID="cPU-nz-qim">
......@@ -1131,7 +1132,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO">
<rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S">
......@@ -1161,7 +1162,7 @@
<rect key="frame" x="0.0" y="58" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx">
......@@ -1972,7 +1973,242 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="0MH-i3-O2Z" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-954" y="2120"/>
<point key="canvasLocation" x="-954" y="2118"/>
</scene>
<!--Account View Controller-->
<scene sceneID="39e-7h-0ZC">
<objects>
<viewController storyboardIdentifier="AccountViewController" id="wJQ-XJ-kfS" customClass="AccountViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="m08-Dl-xNw"/>
<viewControllerLayoutGuide type="bottom" id="iZz-pX-fcp"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="9rB-Zq-WmE">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="wechat" translatesAutoresizingMaskIntoConstraints="NO" id="MbU-Ge-nZL">
<rect key="frame" x="130" y="87" width="114" height="93"/>
<constraints>
<constraint firstAttribute="width" constant="114" id="S6P-JJ-5Lb"/>
<constraint firstAttribute="height" constant="93" id="dVX-xD-7Kg"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0yF-fV-b9c">
<rect key="frame" x="20" y="204" width="335" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2t0-vQ-Pt1">
<rect key="frame" x="20" y="417" width="335" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="cCO-mS-dji"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="立即绑定" backgroundImage="btn_abled"/>
<state key="disabled" backgroundImage="btn_disabled"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFill" image="login_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Mtt-an-81f">
<rect key="frame" x="0.0" y="554" width="375" height="113"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDM-M0-XVm">
<rect key="frame" x="0.0" y="20" width="375" height="375"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ikj-Bd-SMC">
<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="3CH-uk-ab4">
<rect key="frame" x="16" y="0.0" width="140" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="140" id="1C9-V3-a74"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747495554428" green="0.63179747495554428" blue="0.63179747495554428" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shc-Fb-T6n">
<rect key="frame" x="156" y="0.0" width="203" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="shc-Fb-T6n" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="top" id="0kE-18-wka"/>
<constraint firstItem="3CH-uk-ab4" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="top" id="5cD-pu-cPn"/>
<constraint firstAttribute="bottom" secondItem="3CH-uk-ab4" secondAttribute="bottom" id="Zjv-rB-Daq"/>
<constraint firstAttribute="trailing" secondItem="shc-Fb-T6n" secondAttribute="trailing" constant="16" id="aBT-nZ-VtR"/>
<constraint firstAttribute="height" constant="50" id="aIT-fx-BPE"/>
<constraint firstItem="3CH-uk-ab4" firstAttribute="leading" secondItem="Ikj-Bd-SMC" secondAttribute="leading" constant="16" id="dTd-hW-WiQ"/>
<constraint firstAttribute="bottom" secondItem="shc-Fb-T6n" secondAttribute="bottom" id="pJw-Cp-0ob"/>
<constraint firstItem="shc-Fb-T6n" firstAttribute="leading" secondItem="3CH-uk-ab4" secondAttribute="trailing" id="yTs-TZ-qne"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kzF-jP-QSk">
<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="Imm-ya-fEn">
<rect key="frame" x="16" y="0.0" width="156" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="156" id="bF8-za-194"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcf-Tq-L2E">
<rect key="frame" x="172" y="0.0" width="187" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="gcf-Tq-L2E" secondAttribute="bottom" id="CmW-54-WMc"/>
<constraint firstAttribute="bottom" secondItem="Imm-ya-fEn" secondAttribute="bottom" id="Dcw-Eu-B8a"/>
<constraint firstAttribute="trailing" secondItem="gcf-Tq-L2E" secondAttribute="trailing" constant="16" id="Eqt-qP-R7l"/>
<constraint firstItem="Imm-ya-fEn" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="top" id="VGa-l5-Gqp"/>
<constraint firstItem="gcf-Tq-L2E" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="top" id="bqH-3U-WOU"/>
<constraint firstItem="gcf-Tq-L2E" firstAttribute="leading" secondItem="Imm-ya-fEn" secondAttribute="trailing" id="efV-9v-EV7"/>
<constraint firstItem="Imm-ya-fEn" firstAttribute="leading" secondItem="kzF-jP-QSk" secondAttribute="leading" constant="16" id="gV2-JG-CP6"/>
<constraint firstAttribute="height" constant="50" id="tzW-rK-6c3"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pwV-fr-77X">
<rect key="frame" x="0.0" y="120" width="375" height="130"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="本次兑换公分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kX-H2-UPG">
<rect key="frame" x="16" y="0.0" width="343" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="qzV-P2-d2w"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JgD-Na-DHg">
<rect key="frame" x="16" y="40" width="343" height="60"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="工分提现图标" translatesAutoresizingMaskIntoConstraints="NO" id="gaN-oA-ouX">
<rect key="frame" x="0.0" y="13" width="27" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="94q-Sc-Vfe"/>
<constraint firstAttribute="width" constant="27" id="npG-8x-hgD"/>
</constraints>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="700" placeholder="请输入" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oSv-7Y-OGG">
<rect key="frame" x="43" y="0.0" width="300" height="60"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="25"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RZ5-gY-1St">
<rect key="frame" x="0.0" y="59" width="343" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="hYi-TC-usy"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="RZ5-gY-1St" secondAttribute="trailing" id="7ca-Yj-eR3"/>
<constraint firstItem="oSv-7Y-OGG" firstAttribute="top" secondItem="JgD-Na-DHg" secondAttribute="top" id="8Th-on-OZy"/>
<constraint firstItem="oSv-7Y-OGG" firstAttribute="leading" secondItem="gaN-oA-ouX" secondAttribute="trailing" constant="16" id="96x-SC-TCp"/>
<constraint firstAttribute="bottom" secondItem="oSv-7Y-OGG" secondAttribute="bottom" id="Gei-wR-VuW"/>
<constraint firstAttribute="trailing" secondItem="oSv-7Y-OGG" secondAttribute="trailing" id="Odi-Jn-E28"/>
<constraint firstAttribute="height" constant="60" id="Wk4-Dk-bjA"/>
<constraint firstAttribute="bottom" secondItem="RZ5-gY-1St" secondAttribute="bottom" id="g59-fc-gFy"/>
<constraint firstItem="gaN-oA-ouX" firstAttribute="leading" secondItem="JgD-Na-DHg" secondAttribute="leading" id="l0L-hB-ZMA"/>
<constraint firstItem="RZ5-gY-1St" firstAttribute="leading" secondItem="JgD-Na-DHg" secondAttribute="leading" id="s4l-8Q-o1w"/>
<constraint firstItem="gaN-oA-ouX" firstAttribute="centerY" secondItem="JgD-Na-DHg" secondAttribute="centerY" id="thT-Gp-RO7"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="对应金额 700.00元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IyB-f2-cFo">
<rect key="frame" x="16" y="100" width="343" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="JgD-Na-DHg" firstAttribute="top" secondItem="3kX-H2-UPG" secondAttribute="bottom" constant="10" id="83t-ln-VcR"/>
<constraint firstAttribute="trailing" secondItem="JgD-Na-DHg" secondAttribute="trailing" constant="16" id="AwO-Yp-xXU"/>
<constraint firstItem="3kX-H2-UPG" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="Hxw-Tc-f1S"/>
<constraint firstItem="3kX-H2-UPG" firstAttribute="top" secondItem="pwV-fr-77X" secondAttribute="top" id="Wf7-28-hqL"/>
<constraint firstAttribute="height" constant="130" id="YQf-HS-79r"/>
<constraint firstAttribute="trailing" secondItem="IyB-f2-cFo" secondAttribute="trailing" constant="16" id="ays-03-cIk"/>
<constraint firstItem="IyB-f2-cFo" firstAttribute="top" secondItem="JgD-Na-DHg" secondAttribute="bottom" id="ccU-nz-adO"/>
<constraint firstAttribute="bottom" secondItem="IyB-f2-cFo" secondAttribute="bottom" id="eiX-HL-bsR"/>
<constraint firstAttribute="trailing" secondItem="3kX-H2-UPG" secondAttribute="trailing" constant="16" id="hjP-5i-x1Z"/>
<constraint firstItem="IyB-f2-cFo" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="mha-GN-X3A"/>
<constraint firstItem="JgD-Na-DHg" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="sBM-zb-0RJ"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="说明：可兑换工分是指所有工分总额中经后台审核通过 目前能用的工分。 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odP-oU-v4Q">
<rect key="frame" x="16" y="254" width="343" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="Ikj-Bd-SMC" firstAttribute="top" secondItem="ZDM-M0-XVm" secondAttribute="top" id="7Ad-R3-BH9"/>
<constraint firstItem="odP-oU-v4Q" firstAttribute="top" secondItem="pwV-fr-77X" secondAttribute="bottom" constant="4" id="AyA-9m-m2l"/>
<constraint firstItem="pwV-fr-77X" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="Ckn-vE-9fU"/>
<constraint firstAttribute="trailing" secondItem="kzF-jP-QSk" secondAttribute="trailing" id="Gme-Vl-gMc"/>
<constraint firstItem="Ikj-Bd-SMC" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="I0D-9H-6b3"/>
<constraint firstAttribute="trailing" secondItem="pwV-fr-77X" secondAttribute="trailing" id="Pp8-uj-Paf"/>
<constraint firstAttribute="trailing" secondItem="Ikj-Bd-SMC" secondAttribute="trailing" id="U1E-wr-f4N"/>
<constraint firstItem="odP-oU-v4Q" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" constant="16" id="W5c-On-wlh"/>
<constraint firstItem="pwV-fr-77X" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="bottom" constant="20" id="ifA-2M-v8o"/>
<constraint firstAttribute="trailing" secondItem="odP-oU-v4Q" secondAttribute="trailing" constant="16" id="kts-NS-Kba"/>
<constraint firstItem="kzF-jP-QSk" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="bottom" id="qen-lo-vLw"/>
<constraint firstItem="kzF-jP-QSk" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="xO3-y7-WDt"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
<constraint firstItem="Mtt-an-81f" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" id="0Zn-uG-1mk"/>
<constraint firstItem="MbU-Ge-nZL" firstAttribute="centerY" secondItem="9rB-Zq-WmE" secondAttribute="centerY" multiplier="0.4" id="4XB-YY-c2a"/>
<constraint firstAttribute="trailing" secondItem="0yF-fV-b9c" secondAttribute="trailing" constant="20" id="4Y9-96-4cd"/>
<constraint firstItem="ZDM-M0-XVm" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" id="8pF-d2-vFf"/>
<constraint firstItem="0yF-fV-b9c" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" constant="20" id="ATI-an-DBW"/>
<constraint firstItem="iZz-pX-fcp" firstAttribute="top" secondItem="2t0-vQ-Pt1" secondAttribute="bottom" constant="200" id="DCh-X8-qKE"/>
<constraint firstItem="iZz-pX-fcp" firstAttribute="top" secondItem="Mtt-an-81f" secondAttribute="bottom" id="FTb-Rs-4je"/>
<constraint firstAttribute="trailing" secondItem="ZDM-M0-XVm" secondAttribute="trailing" id="OMC-g2-aYR"/>
<constraint firstItem="ZDM-M0-XVm" firstAttribute="top" secondItem="m08-Dl-xNw" secondAttribute="bottom" id="OX2-x2-g15"/>
<constraint firstItem="2t0-vQ-Pt1" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" constant="20" id="UnX-GI-23i"/>
<constraint firstItem="MbU-Ge-nZL" firstAttribute="centerX" secondItem="9rB-Zq-WmE" secondAttribute="centerX" id="aNT-iB-NrZ"/>
<constraint firstAttribute="trailing" secondItem="2t0-vQ-Pt1" secondAttribute="trailing" constant="20" id="cCX-eL-dj3"/>
<constraint firstAttribute="trailing" secondItem="Mtt-an-81f" secondAttribute="trailing" id="j6Y-YT-8km"/>
<constraint firstItem="2t0-vQ-Pt1" firstAttribute="top" secondItem="ZDM-M0-XVm" secondAttribute="bottom" constant="22" id="mYJ-kO-Zth"/>
<constraint firstItem="0yF-fV-b9c" firstAttribute="top" secondItem="MbU-Ge-nZL" secondAttribute="bottom" constant="24" id="sBX-WV-gdN"/>
</constraints>
</view>
<connections>
<outlet property="labelInfo" destination="IyB-f2-cFo" id="wCh-3H-mHf"/>
<outlet property="labelToWechatInfo" destination="0yF-fV-b9c" id="Afe-j8-UoZ"/>
<outlet property="labelTotalScore" destination="Ikj-Bd-SMC" id="3c0-LY-F4q"/>
<outlet property="labelValidScore" destination="gcf-Tq-L2E" id="pd9-CJ-fFi"/>
<outlet property="scoreView" destination="ZDM-M0-XVm" id="vOR-xY-WSn"/>
<outlet property="textFieldScore" destination="oSv-7Y-OGG" id="Yjl-0u-our"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="aAC-pl-TYF" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-964" y="2776.4617691154426"/>
</scene>
<!--Watch Login View Controller-->
<scene sceneID="IfM-Jf-5An">
......@@ -2054,7 +2290,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="k1K-ML-jIs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-298.39999999999998" y="2117.9910044977514"/>
<point key="canvasLocation" x="-222" y="2118"/>
</scene>
</scenes>
<resources>
......@@ -2081,6 +2317,8 @@
<image name="right_arrow" width="32" height="32"/>
<image name="scan_icon" width="25" height="23"/>
<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"/>
<image name="引导页2" width="360" height="640"/>
<image name="引导页3" width="360" height="640"/>
......
Car/CodeClass/Account/ViewConstrollers/AccountViewController.h 0 → 100644
View file @ 9e38f03d
//
// AccountViewController.h
// Car
//
// Created by Javen on 2017/2/8.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import "BaseViewController.h"
@interface AccountViewController : BaseViewController
@end
Car/CodeClass/Account/ViewConstrollers/AccountViewController.m 0 → 100644
View file @ 9e38f03d
//
// AccountViewController.m
// Car
//
// Created by Javen on 2017/2/8.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import "AccountViewController.h"
@interface AccountViewController ()
/**
工分总额
*/
@property (weak, nonatomic) IBOutlet UIView *labelTotalScore;
/**
可换公分
*/
@property (weak, nonatomic) IBOutlet UILabel *labelValidScore;
/**
公分
*/
@property (weak, nonatomic) IBOutlet UITextField *textFieldScore;
/**
工分提现说明
*/
@property (weak, nonatomic) IBOutlet UILabel *labelInfo;
/**
提醒绑定微信提示
*/
@property (weak, nonatomic) IBOutlet UILabel *labelToWechatInfo;
@property (weak, nonatomic) IBOutlet UIView *scoreView;
@end
@implementation AccountViewController
- (void)viewDidLoad {
[super viewDidLoad];
// self.scoreView.hidden = YES;
self.title = @"工分提现";
[self configUI];
// Do any additional setup after loading the view.
}
- (void)configUI {
//未绑定微信的底部的提示
NSString *contentStr = @"亲，您还没有绑定微信哦，工分提现需要先绑定微信哦，我们的提现金额会提到微信钱包中。 ";
NSRange range = [contentStr rangeOfString:@"提现金额会提到微信钱包中"];
NSMutableAttributedString *str = [[NSMutableAttributedString alloc]initWithString:contentStr];
//设置：在0-3个单位长度内的内容显示成红色
[str addAttribute:NSForegroundColorAttributeName value:kMainColor range:range];
self.labelToWechatInfo.attributedText = str;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
View file @ 9e38f03d
......@@ -11,7 +11,7 @@
#import "ModifyPswTableViewController.h"
#import "BillListViewController.h"
#import "ScanViewController.h"
#import <AudioToolbox/AudioToolbox.h>
#import "AccountViewController.h"
@interface LeftTableViewController ()
@property (weak, nonatomic) IBOutlet UIImageView *imgUserIcon;
@property (weak, nonatomic) IBOutlet UILabel *labelName;
......@@ -57,7 +57,8 @@
BillListViewController *billVC = [BillListViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:billVC animated:YES];
}else if (indexPath.row == 1) {//账户
[MBProgressHUD j_textOnly:@"正在开发中~"];
AccountViewController *accoutVC = [AccountViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:accoutVC animated:YES];
}else if (indexPath.row == 2) {//核销卡券
[self scanCard];
......
Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m
View file @ 9e38f03d
......@@ -16,39 +16,37 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"授权登录";
self.title = @"授权登录";
// Do any additional setup after loading the view.
}
- (IBAction)actionLogin:(id)sender {
[self httpAllowLogin];
[self httpAllowLogin];
}
- (void)httpAllowLogin {
NSDictionary *param = @{@"deviceId":self.device,
@"token":self.token};
WS(weakSelf);
[kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
if (kRsSuccess(response)) {
[MBProgressHUD j_success:@"登录成功！" complete:^{
//连续返回两级
long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
[weakSelf.navigationController
popToViewController:[weakSelf.navigationController.viewControllers
objectAtIndex:index - 2]
animated:YES];
}];
}else{
kShowRsMsg(response);
}
}];
NSDictionary *param = @{@"deviceId":self.device,
@"token":self.token};
WS(weakSelf);
[kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
if (kRsSuccess(response)) {
[MBProgressHUD j_success:@"登录成功！" complete:^{
//连续返回两级
long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
[weakSelf.navigationController popToViewController:[weakSelf.navigationController.viewControllers objectAtIndex:index - 2]
animated:YES];
}];
}else{
kShowRsMsg(response);
}
}];
}
- (IBAction)actionCancel:(id)sender {
[self.navigationController popViewControllerAnimated:YES];
[self.navigationController popViewControllerAnimated:YES];
}
......@@ -59,13 +57,13 @@
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Car/URL.h
View file @ 9e38f03d
......@@ -17,14 +17,9 @@ 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 kModifyPswUrl = @"stationUser/modifyPassword";
......
Car/tools/BaseClass/BaseViewController.m
View file @ 9e38f03d
......@@ -17,8 +17,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.view.backgroundColor = [UIColor colorWithWhite:0.965 alpha:1.000];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.view.backgroundColor = [UIColor colorWithRed:0.94 green:0.94 blue:0.96 alpha:1.00];
// Do any additional setup after loading the view.
}
......
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