Skip to content

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

核销订单增加了起止时间，隐藏描述

parent c9dbbe0e
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 14 deletions
Car.xcodeproj/project.pbxproj
View file @ b9523645
......@@ -1202,7 +1202,7 @@
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
......@@ -1227,7 +1227,7 @@
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
......
Car/Base.lproj/Main.storyboard
View file @ b9523645
......@@ -214,7 +214,7 @@
<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="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mA5-Kq-bqR">
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mA5-Kq-bqR">
<rect key="frame" x="114" y="37" width="170" height="33.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
......@@ -259,7 +259,7 @@
<color key="textColor" red="0.95902961492538452" green="0.67940151691436768" blue="0.52041810750961304" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2018.1.7-2018.3.7" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NFE-En-JUU">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2018.1.7-2018.3.7" textAlignment="natural" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NFE-En-JUU">
<rect key="frame" x="182" y="99.5" width="177" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="Nfj-OP-MFs"/>
......@@ -683,7 +683,7 @@
<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="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F66-us-Om2">
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="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"/>
......@@ -728,7 +728,7 @@
<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">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2018.1.7-2018.3.7" textAlignment="natural" lineBreakMode="characterWrap" 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"/>
......@@ -747,11 +747,11 @@
<constraint firstItem="Xuc-hU-rho" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" id="07L-1E-8u2"/>
<constraint firstItem="wKO-ji-8eT" firstAttribute="leading" secondItem="4gE-Tw-xPl" secondAttribute="trailing" id="33k-eP-cNh"/>
<constraint firstAttribute="trailing" secondItem="3b2-8b-QTU" secondAttribute="trailing" constant="16" id="8a9-hG-Bya"/>
<constraint firstAttribute="bottom" secondItem="ntz-3c-WfB" secondAttribute="bottom" constant="10.5" id="AIu-PE-mpf"/>
<constraint firstItem="WJt-FQ-BuY" firstAttribute="bottom" secondItem="c3Y-ie-Xav" secondAttribute="bottom" constant="-2" id="C1j-EF-AbX"/>
<constraint firstAttribute="trailing" secondItem="Xuc-hU-rho" secondAttribute="trailing" id="CHC-jN-lbp"/>
<constraint firstItem="c3Y-ie-Xav" firstAttribute="centerY" secondItem="EMk-Xg-ghT" secondAttribute="centerY" constant="-8" id="CK1-cJ-E8D"/>
<constraint firstAttribute="trailing" secondItem="ntz-3c-WfB" secondAttribute="trailing" constant="16" id="KtI-Sh-44Z"/>
<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="ybf-JI-v6z" firstAttribute="leading" secondItem="3b2-8b-QTU" secondAttribute="leading" id="S2Q-Eh-O2R"/>
<constraint firstItem="F66-us-Om2" firstAttribute="leading" secondItem="3b2-8b-QTU" secondAttribute="leading" id="U2a-K4-ijs"/>
......@@ -1032,7 +1032,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">
......@@ -1062,7 +1062,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">
......@@ -2137,7 +2137,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="122"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rzh-1n-mk1" id="MQA-cg-btL">
<rect key="frame" x="0.0" y="0.0" width="375" height="121"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="121.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PiO-EO-PrN">
......
Car/CodeClass/LeftView/Views/CardView.m
View file @ b9523645
......@@ -25,7 +25,11 @@
self.labelBillNumber.text = model.billNumber;
self.labelMoney.text = [model.realPayTotal stringValue];
self.imgState.hidden = ![model.state isEqualToString:@"checked"];
if (model.validatedStartDate) {
self.labelDuring.text = [NSString stringWithFormat:@"%@~%@",model.validatedStartDate, model.validatedEndDate];
}else{
self.labelDuring.text = @"暂无";
}
}
@end
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
View file @ b9523645
......@@ -24,7 +24,12 @@
self.labelBillNumber.text = model.billNumber;
self.labelMoney.text = [model.realPayTotal stringValue];
self.imgState.hidden = ![model.state isEqualToString:@"checked"];
if (model.validatedStartDate) {
self.labelDuring.text = [NSString stringWithFormat:@"%@~%@",model.validatedStartDate, model.validatedEndDate];
}else{
self.labelDuring.text = @"暂无";
}
}
......
Car/Info.plist
View file @ b9523645
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.3</string>
<string>1.0.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......@@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.3</string>
<string>1.0.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
Car/car_objc_json_client.h
View file @ b9523645
......@@ -1469,6 +1469,8 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *productImageUrl;
@property (nonatomic, copy) NSString *validatedEndDate;
@property (nonatomic, copy) NSString *validatedStartDate;
@end /* interface ProductOrderEntity */
......
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