Skip to content

A
ALand
Commit e6861c04 authored by Sandy's avatar Sandy
Browse files
Options

订单详情根据不同状态展示详情

parent 7d16f628
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 31 deletions
ALand/Assets.xcassets/02订单详情_iPhone_assets/icon_order_car.imageset/Contents.json 0 → 100644
View file @ e6861c04
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon_order_car.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon_order_car@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
View file @ e6861c04
......@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
@property (nonatomic) CGFloat viewHeight;
- (void)updateByOrderType;
- (void)updateHeight;
@end
ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
View file @ e6861c04
......@@ -9,6 +9,7 @@
#import "OrderDetailTopView.h"
@interface OrderDetailTopView ()
@property (weak, nonatomic) IBOutlet UIView *viewExpress;
@end
@implementation OrderDetailTopView
......@@ -17,10 +18,21 @@
}
- (void)updateByOrderType {
if (self.orderType == ORDERTOPTYPE_TRANSPORTED || self.orderType == ORDERTOPTYPE_COMMPLETE) {
[self.viewExpress removeFromSuperview];
}else{
[self.viewExpress removeFromSuperview];
}
}
- (void)updateHeight {
self.height = self.bottomView.bottom;
}
- (IBAction)actionCall:(id)sender {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", self.labelPhoneNumber.text]]];
}
......
ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
View file @ e6861c04
......@@ -8,48 +8,31 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDetailTopView"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="OrderDetailTopView">
<rect key="frame" x="0.0" y="0.0" width="320" height="323"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hQw-oZ-PUV">
<rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等待付款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nyc-Bh-qZx">
<rect key="frame" x="22" y="48" width="76" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="120" id="5NF-bg-COp"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="centerY" secondItem="hQw-oZ-PUV" secondAttribute="centerY" id="B1x-lb-Dsd"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="leading" secondItem="hQw-oZ-PUV" secondAttribute="leading" constant="22" id="ecB-5T-290"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9kH-LK-wk8">
<rect key="frame" x="0.0" y="120" width="320" height="138"/>
<rect key="frame" x="0.0" y="212" width="320" height="138"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xru-fq-ja3">
<rect key="frame" x="35" y="22" width="68" height="21"/>
<rect key="frame" x="45" y="22" width="68" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<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="J01-8B-y5r">
<rect key="frame" x="105" y="22" width="51" height="21"/>
<rect key="frame" x="115" y="22" width="51" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<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="6Vh-Et-vJt">
<rect key="frame" x="35" y="51" width="68" height="21"/>
<rect key="frame" x="45" y="51" width="68" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18321155536" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v7R-er-zaD">
<rect key="frame" x="105" y="51" width="105" height="21"/>
<rect key="frame" x="115" y="51" width="105" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
......@@ -71,7 +54,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上海市 上海市 闵行区 鹤坡南路55弄2号232室上海市 上海市 闵行区 鹤坡南路55弄2号232室" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rM9-W2-1PT">
<rect key="frame" x="35" y="76" width="277" height="54"/>
<rect key="frame" x="45" y="76" width="267" height="54"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
......@@ -84,7 +67,7 @@
<constraint firstItem="v7R-er-zaD" firstAttribute="leading" secondItem="6Vh-Et-vJt" secondAttribute="trailing" constant="2" id="CNp-I7-IEP"/>
<constraint firstItem="rM9-W2-1PT" firstAttribute="centerY" secondItem="OeX-RE-d2m" secondAttribute="centerY" id="CZW-j3-3fO"/>
<constraint firstItem="rM9-W2-1PT" firstAttribute="top" secondItem="Yca-8a-HcF" secondAttribute="bottom" constant="4" id="DRA-Wo-4yR"/>
<constraint firstItem="Xru-fq-ja3" firstAttribute="leading" secondItem="9kH-LK-wk8" secondAttribute="leading" constant="35" id="E6Q-au-bhy"/>
<constraint firstItem="Xru-fq-ja3" firstAttribute="leading" secondItem="9kH-LK-wk8" secondAttribute="leading" constant="45" id="E6Q-au-bhy"/>
<constraint firstItem="Xru-fq-ja3" firstAttribute="top" secondItem="9kH-LK-wk8" secondAttribute="top" constant="22" id="FPH-kW-Z2b"/>
<constraint firstItem="rM9-W2-1PT" firstAttribute="leading" secondItem="6Vh-Et-vJt" secondAttribute="leading" id="LfN-Fv-Jbp"/>
<constraint firstItem="v7R-er-zaD" firstAttribute="centerY" secondItem="6Vh-Et-vJt" secondAttribute="centerY" id="Lz3-QZ-8GQ"/>
......@@ -110,7 +93,7 @@
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kMe-iN-q0b">
<rect key="frame" x="0.0" y="266" width="320" height="29"/>
<rect key="frame" x="0.0" y="358" width="320" height="29"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nUT-vO-b28">
<rect key="frame" x="15" y="4" width="68" height="21"/>
......@@ -126,21 +109,94 @@
<constraint firstItem="nUT-vO-b28" firstAttribute="leading" secondItem="kMe-iN-q0b" secondAttribute="leading" constant="15" id="zCP-9S-LPU"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9bs-ar-XXb">
<rect key="frame" x="0.0" y="120" width="320" height="92"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="在上海市闵行区分公司进行扫描分配，配送员： 谢德彬，手机号18850620680" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgd-cT-Y2S" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="45" y="8" width="232" height="54"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="icon_order_car" translatesAutoresizingMaskIntoConstraints="NO" id="a5k-hm-R8j">
<rect key="frame" x="4" y="23" width="30" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="23" id="Px1-e0-ZaJ"/>
<constraint firstAttribute="width" constant="30" id="zsC-PQ-qJr"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12-12 12:01:21" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KAE-q5-yVI">
<rect key="frame" x="45" y="70" width="160" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CPN-ej-33q">
<rect key="frame" x="8" y="91" width="304" height="1"/>
<color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="GY3-mx-DLT"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="CPN-ej-33q" firstAttribute="leading" secondItem="9bs-ar-XXb" secondAttribute="leading" constant="8" id="FwH-Ac-q0O"/>
<constraint firstAttribute="bottom" secondItem="qgd-cT-Y2S" secondAttribute="bottom" constant="30" id="G2a-P7-ZXe"/>
<constraint firstAttribute="bottom" secondItem="KAE-q5-yVI" secondAttribute="bottom" constant="1" id="Inb-Dq-E8r"/>
<constraint firstAttribute="trailing" secondItem="qgd-cT-Y2S" secondAttribute="trailing" constant="43" id="Mih-Bb-w1w"/>
<constraint firstAttribute="trailing" secondItem="CPN-ej-33q" secondAttribute="trailing" constant="8" id="OgA-J2-wKm"/>
<constraint firstItem="KAE-q5-yVI" firstAttribute="leading" secondItem="qgd-cT-Y2S" secondAttribute="leading" id="XzQ-kl-eZr"/>
<constraint firstItem="qgd-cT-Y2S" firstAttribute="top" secondItem="9bs-ar-XXb" secondAttribute="top" constant="8" id="abQ-5X-Zqz"/>
<constraint firstItem="KAE-q5-yVI" firstAttribute="top" secondItem="qgd-cT-Y2S" secondAttribute="bottom" constant="8" id="dyt-fZ-XDs"/>
<constraint firstAttribute="height" constant="70" id="hCW-5v-Qgf"/>
<constraint firstAttribute="bottom" secondItem="CPN-ej-33q" secondAttribute="bottom" id="qrP-cj-lCB"/>
<constraint firstItem="a5k-hm-R8j" firstAttribute="centerY" secondItem="qgd-cT-Y2S" secondAttribute="centerY" id="ybY-wg-I7z"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="hCW-5v-Qgf"/>
</mask>
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hQw-oZ-PUV">
<rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等待付款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nyc-Bh-qZx">
<rect key="frame" x="22" y="48" width="76" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="120" id="5NF-bg-COp"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="centerY" secondItem="hQw-oZ-PUV" secondAttribute="centerY" id="B1x-lb-Dsd"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="leading" secondItem="hQw-oZ-PUV" secondAttribute="leading" constant="22" id="ecB-5T-290"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="qgd-cT-Y2S" firstAttribute="leading" secondItem="Xru-fq-ja3" secondAttribute="leading" id="0L6-3w-rhK"/>
<constraint firstAttribute="trailing" secondItem="hQw-oZ-PUV" secondAttribute="trailing" id="0zM-WW-Si3"/>
<constraint firstItem="9kH-LK-wk8" firstAttribute="top" secondItem="9bs-ar-XXb" secondAttribute="bottom" id="2W8-bC-4yD"/>
<constraint firstItem="9kH-LK-wk8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="3Jf-z4-xwi"/>
<constraint firstItem="9bs-ar-XXb" firstAttribute="top" secondItem="hQw-oZ-PUV" secondAttribute="bottom" id="3Zo-d9-187"/>
<constraint firstAttribute="bottom" secondItem="kMe-iN-q0b" secondAttribute="bottom" id="AsD-oa-aoC"/>
<constraint firstAttribute="bottom" secondItem="9kH-LK-wk8" secondAttribute="bottom" constant="37" id="FF9-pf-GaR"/>
<constraint firstItem="hQw-oZ-PUV" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Hdo-R0-om7"/>
<constraint firstItem="9kH-LK-wk8" firstAttribute="top" secondItem="hQw-oZ-PUV" secondAttribute="bottom" id="MIg-ho-Nb1"/>
<constraint firstAttribute="trailing" secondItem="9kH-LK-wk8" secondAttribute="trailing" id="Mxw-8U-opv"/>
<constraint firstItem="9kH-LK-wk8" firstAttribute="top" relation="greaterThanOrEqual" secondItem="hQw-oZ-PUV" secondAttribute="bottom" id="OBr-bn-GAB"/>
<constraint firstItem="a5k-hm-R8j" firstAttribute="centerX" secondItem="OeX-RE-d2m" secondAttribute="centerX" id="PJt-vC-JSc"/>
<constraint firstItem="kMe-iN-q0b" firstAttribute="top" secondItem="9kH-LK-wk8" secondAttribute="bottom" constant="8" id="TuG-vz-tdQ"/>
<constraint firstAttribute="trailing" secondItem="kMe-iN-q0b" secondAttribute="trailing" id="X5r-ow-Mr3"/>
<constraint firstItem="9bs-ar-XXb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="cEq-2q-kvr"/>
<constraint firstItem="hQw-oZ-PUV" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="mge-f8-Nlj"/>
<constraint firstItem="kMe-iN-q0b" firstAttribute="top" secondItem="9kH-LK-wk8" secondAttribute="bottom" constant="8" id="s5e-DB-8Gt"/>
<constraint firstItem="kMe-iN-q0b" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="uTe-8n-paJ"/>
<constraint firstAttribute="trailing" secondItem="9bs-ar-XXb" secondAttribute="trailing" id="w2r-Dj-PdM"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<variation key="default">
......@@ -155,12 +211,14 @@
<outlet property="labelAddress" destination="rM9-W2-1PT" id="Vpk-og-XdW"/>
<outlet property="labelName" destination="J01-8B-y5r" id="jwt-aT-2P0"/>
<outlet property="labelPhoneNumber" destination="v7R-er-zaD" id="jiO-J8-KxV"/>
<outlet property="viewExpress" destination="9bs-ar-XXb" id="rCv-CW-UTd"/>
</connections>
<point key="canvasLocation" x="184" y="361.5"/>
<point key="canvasLocation" x="180" y="291"/>
</view>
</objects>
<resources>
<image name="call_icon" width="45" height="45"/>
<image name="icon_order_address" width="33" height="32"/>
<image name="icon_order_car" width="36" height="29"/>
</resources>
</document>
ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
View file @ e6861c04
......@@ -38,9 +38,12 @@
OrderDetailTopView *topView = [OrderDetailTopView viewWithNibName:@"OrderDetailTopView"];
self.atopView = topView;
self.atopView.orderType = self.orderType;
self.atopView.labelAddress.text = [NSString randomTestText];
[self.tableView addSubview:topView];
[self.atopView updateByOrderType];
self.bottomView = [OrderDetailBottomView viewWithNibName:@"OrderDetailBottomView"];
self.bottomView.laberRemark.text = [NSString randomTestText];
......
ALand/CodeClass/Login/Base.lproj/ToLoginViewController.xib
View file @ e6861c04
......@@ -60,8 +60,8 @@
<constraint firstAttribute="height" constant="30" id="bqM-pK-6q9"/>
</constraints>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7">
<rect key="frame" x="70" y="10" width="273" height="30"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7">
<rect key="frame" x="70" y="14" width="273" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<textInputTraits key="textInputTraits"/>
</textField>
......
ALand/Global/HTTPCilent.m
View file @ e6861c04
......@@ -68,10 +68,12 @@
[self.manager GET:URLString parameters:parameters progress:^(NSProgress * _Nonnull downloadProgress) {
} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
NSDictionary *dic = responseObject;
CLog(@"GET success！-------->%@", [dic JSONString]);
success(task, responseObject);
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
CLog(@"GET请求失败！----->%@", [error localizedDescription]);
failure(task, error);
}];
......
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