Skip to content

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

增加查看物流界面

parent b9460043
Show whitespace changes
Inline Side-by-side
Showing with 655 additions and 57 deletions
ALand.xcodeproj/project.pbxproj
View file @ edb8a475
......@@ -333,6 +333,10 @@
8F59F0241D6D725500C9A564 /* NoPaymentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */; };
8F8D99431D6706E50080ECC1 /* PayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F8D99421D6706E50080ECC1 /* PayView.xib */; };
8F8D994B1D670F3B0080ECC1 /* PayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8D994A1D670F3B0080ECC1 /* PayView.m */; };
8FAA08361D72F30700CCA46D /* LogisticsItemsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA08351D72F30700CCA46D /* LogisticsItemsModel.m */; };
8FAA083A1D73CDD800CCA46D /* HomeZ.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8FAA08391D73CDD800CCA46D /* HomeZ.storyboard */; };
8FAA083D1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA083C1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.m */; };
8FAA08401D73D81200CCA46D /* LogisticsLineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA083F1D73D81200CCA46D /* LogisticsLineViewController.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -957,6 +961,13 @@
8F8D99421D6706E50080ECC1 /* PayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PayView.xib; sourceTree = "<group>"; };
8F8D99491D670F3B0080ECC1 /* PayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayView.h; sourceTree = "<group>"; };
8F8D994A1D670F3B0080ECC1 /* PayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayView.m; sourceTree = "<group>"; };
8FAA08341D72F30700CCA46D /* LogisticsItemsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogisticsItemsModel.h; sourceTree = "<group>"; };
8FAA08351D72F30700CCA46D /* LogisticsItemsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogisticsItemsModel.m; sourceTree = "<group>"; };
8FAA08391D73CDD800CCA46D /* HomeZ.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HomeZ.storyboard; sourceTree = "<group>"; };
8FAA083B1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogisticsTimeLineTableViewCell.h; sourceTree = "<group>"; };
8FAA083C1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogisticsTimeLineTableViewCell.m; sourceTree = "<group>"; };
8FAA083E1D73D81200CCA46D /* LogisticsLineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogisticsLineViewController.h; sourceTree = "<group>"; };
8FAA083F1D73D81200CCA46D /* LogisticsLineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogisticsLineViewController.m; sourceTree = "<group>"; };
AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
C86730AE81FB01EAF9005535 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
F32A640135BB4E1F47CB0E21 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -1031,6 +1042,8 @@
1900A3461CB6305100B2B7C4 /* Order */ = {
isa = PBXGroup;
children = (
8FAA08341D72F30700CCA46D /* LogisticsItemsModel.h */,
8FAA08351D72F30700CCA46D /* LogisticsItemsModel.m */,
190A46781CE064FE006037CB /* JavenOrderModel.h */,
190A46791CE064FE006037CB /* JavenOrderModel.m */,
);
......@@ -1083,6 +1096,8 @@
199B4D8A1CAE688400451E0E /* SeeLogistics.h */,
199B4D8B1CAE688400451E0E /* SeeLogistics.m */,
199B4D881CAE67C600451E0E /* SeeLogistics.xib */,
8FAA083B1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.h */,
8FAA083C1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.m */,
);
path = Order;
sourceTree = "<group>";
......@@ -1503,6 +1518,8 @@
199B4D671CABBCF600451E0E /* OrderDetailViewController.m */,
8F1E2CE21D7042A5002CCC76 /* OrderWebViewController.h */,
8F1E2CE31D7042A5002CCC76 /* OrderWebViewController.m */,
8FAA083E1D73D81200CCA46D /* LogisticsLineViewController.h */,
8FAA083F1D73D81200CCA46D /* LogisticsLineViewController.m */,
);
name = "Order（订单）";
path = Order;
......@@ -1948,6 +1965,7 @@
19ADD36B1CA3B88A00EE6E5A /* Commodity（添加商品） */,
1979752B1CA90D3900407E3F /* CommodityManagement（商品管理） */,
1952C2F51CEDB6730017E4D6 /* Home */,
8FAA08391D73CDD800CCA46D /* HomeZ.storyboard */,
);
path = ViewController;
sourceTree = "<group>";
......@@ -2407,6 +2425,7 @@
buildActionMask = 2147483647;
files = (
19632DA51CB350F80024A8A1 /* StoreQRCodeViewController.xib in Resources */,
8FAA083A1D73CDD800CCA46D /* HomeZ.storyboard in Resources */,
8F8D99431D6706E50080ECC1 /* PayView.xib in Resources */,
199B4D871CAE43F800451E0E /* OrderDetailTableViewCell.xib in Resources */,
19ADD3871CA4E21100EE6E5A /* AddCommodityHeaderView.xib in Resources */,
......@@ -2611,6 +2630,7 @@
1929F1811CA0E597000E9B26 /* UIView+Category.m in Sources */,
19DCCB631C9A9EB30072C3BF /* IBTTableViewSectionInfo.m in Sources */,
19DCCB5D1C9A9EB30072C3BF /* IBTImagePicker.m in Sources */,
8FAA083D1D73D54C00CCA46D /* LogisticsTimeLineTableViewCell.m in Sources */,
19D906B61CC86DA300CD42DC /* SettingViewController.m in Sources */,
194FB0491CE2CAAF0089A3D5 /* MyAcountHelfViewController.m in Sources */,
19DCCBCB1C9AA0450072C3BF /* UIApplication+CheckFirstRun.m in Sources */,
......@@ -2694,6 +2714,7 @@
19DCCBD31C9AA0450072C3BF /* UIScrollView+Content.m in Sources */,
197975271CA8FAE500407E3F /* CommodityDetailTopView.m in Sources */,
197975221CA8DA8200407E3F /* CommodityDetailViewController.m in Sources */,
8FAA08361D72F30700CCA46D /* LogisticsItemsModel.m in Sources */,
192118F61D41CE80000A56EA /* UserInfoAppConfig.m in Sources */,
19DCCB771C9A9EB30072C3BF /* IBTUIViewController.m in Sources */,
191AEE5C1CBCC6D100F5E535 /* addCommodityRequestModel.m in Sources */,
......@@ -2768,6 +2789,7 @@
194FB0D31CE2FA370089A3D5 /* JavenResellerBigModel.m in Sources */,
1900A33C1CB602D500B2B7C4 /* StoreNameViewController.m in Sources */,
196944DC1CEC4E6C0036E574 /* NoBillHistoryView.m in Sources */,
8FAA08401D73D81200CCA46D /* LogisticsLineViewController.m in Sources */,
19DCCBCD1C9AA0450072C3BF /* UIFont+Custom.m in Sources */,
19DCCBE41C9AA0450072C3BF /* ICRFunctionEntity.m in Sources */,
1929401F1CC8DA5B00E377EE /* InvitePartnerViewController.m in Sources */,
......
ALand/Assets.xcassets/04物流信息_iPhone_assets/Contents.json 0 → 100644
View file @ edb8a475
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/04物流信息_iPhone_assets/img_time_logo_gray.imageset/Contents.json 0 → 100644
View file @ edb8a475
{
"images" : [
{
"idiom" : "universal",
"filename" : "img_time_logo_gray.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "img_time_logo_gray@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/04物流信息_iPhone_assets/img_time_logo_red.imageset/Contents.json 0 → 100644
View file @ edb8a475
{
"images" : [
{
"idiom" : "universal",
"filename" : "img_time_logo_red.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "img_time_logo_red@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/04物流信息_iPhone_assets/yto.imageset/Contents.json 0 → 100644
View file @ edb8a475
{
"images" : [
{
"idiom" : "universal",
"filename" : "yto.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Base.lproj/LaunchScreen.storyboard
View file @ edb8a475
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<scenes>
<!--View Controller-->
......
ALand/CodeClass/Home/Model/Order/LogisticsItemsModel.h 0 → 100644
View file @ edb8a475
//
// LogisticsItemsModel.h
//
// Created by 杰 张 on 16/8/28
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface LogisticsItemsModel : NSObject <NSCoding, NSCopying>
@property (nonatomic, copy) NSString *operTime;
@property (nonatomic, copy) NSString *internalBaseClassDescription;
@property (nonatomic, copy) NSString *operType;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;
- (NSDictionary *)dictionaryRepresentation;
@end
ALand/CodeClass/Home/Model/Order/LogisticsItemsModel.m 0 → 100644
View file @ edb8a475
//
// LogisticsItemsModel.m
//
// Created by 杰 张 on 16/8/28
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "LogisticsItemsModel.h"
NSString *const kLogisticsItemsModelOperTime = @"operTime";
NSString *const kLogisticsItemsModelDescription = @"description";
NSString *const kLogisticsItemsModelOperType = @"operType";
@interface LogisticsItemsModel ()
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
@end
@implementation LogisticsItemsModel
@synthesize operTime = _operTime;
@synthesize internalBaseClassDescription = _internalBaseClassDescription;
@synthesize operType = _operType;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
{
return [[self alloc] initWithDictionary:dict];
}
- (instancetype)initWithDictionary:(NSDictionary *)dict
{
self = [super init];
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.operTime = [self objectOrNilForKey:kLogisticsItemsModelOperTime fromDictionary:dict];
self.internalBaseClassDescription = [self objectOrNilForKey:kLogisticsItemsModelDescription fromDictionary:dict];
self.operType = [self objectOrNilForKey:kLogisticsItemsModelOperType fromDictionary:dict];
}
return self;
}
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:self.operTime forKey:kLogisticsItemsModelOperTime];
[mutableDict setValue:self.internalBaseClassDescription forKey:kLogisticsItemsModelDescription];
[mutableDict setValue:self.operType forKey:kLogisticsItemsModelOperType];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
- (NSString *)description
{
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
}
#pragma mark - Helper Method
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
{
id object = [dict objectForKey:aKey];
return [object isEqual:[NSNull null]] ? nil : object;
}
#pragma mark - NSCoding Methods
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super init];
self.operTime = [aDecoder decodeObjectForKey:kLogisticsItemsModelOperTime];
self.internalBaseClassDescription = [aDecoder decodeObjectForKey:kLogisticsItemsModelDescription];
self.operType = [aDecoder decodeObjectForKey:kLogisticsItemsModelOperType];
return self;
}
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:_operTime forKey:kLogisticsItemsModelOperTime];
[aCoder encodeObject:_internalBaseClassDescription forKey:kLogisticsItemsModelDescription];
[aCoder encodeObject:_operType forKey:kLogisticsItemsModelOperType];
}
- (id)copyWithZone:(NSZone *)zone
{
LogisticsItemsModel *copy = [[LogisticsItemsModel alloc] init];
if (copy) {
copy.operTime = [self.operTime copyWithZone:zone];
copy.internalBaseClassDescription = [self.internalBaseClassDescription copyWithZone:zone];
copy.operType = [self.operType copyWithZone:zone];
}
return copy;
}
@end
ALand/CodeClass/Home/View/Order/LogisticsTimeLineTableViewCell.h 0 → 100644
View file @ edb8a475
//
// LogisticsTimeLineTableViewCell.h
// ALand
//
// Created by Javen on 16/8/29.
// Copyright © 2016年 Z. All rights reserved.
//
#import <UIKit/UIKit.h>
typedef NS_ENUM(NSInteger, LogisticsLineType) {
LogisticsLineTypeTop,
LogisticsLineTypeCenter,
LogisticsLineTypeBottom
};
@interface LogisticsTimeLineTableViewCell : UITableViewCell
@property (nonatomic, assign) LogisticsLineType type;
- (void)configCellWithArr:(id)array index:(NSIndexPath *)indexPath;
@end
ALand/CodeClass/Home/View/Order/LogisticsTimeLineTableViewCell.m 0 → 100644
View file @ edb8a475
//
// LogisticsTimeLineTableViewCell.m
// ALand
//
// Created by Javen on 16/8/29.
// Copyright © 2016年 Z. All rights reserved.
//
#import "LogisticsTimeLineTableViewCell.h"
#import "LogisticsItemsModel.h"
@interface LogisticsTimeLineTableViewCell ()
/** 上面的灰线 */
@property (weak, nonatomic) IBOutlet UIView *upLIne;
/** 下面的灰线 */
@property (weak, nonatomic) IBOutlet UIView *downLine;
/** 时间 */
@property (weak, nonatomic) IBOutlet UILabel *time;
/** 物流信息 */
@property (weak, nonatomic) IBOutlet UILabel *LogisticsInfo;
/** 小闹钟图标 */
@property (weak, nonatomic) IBOutlet UIImageView *imgClock;
@end
@implementation LogisticsTimeLineTableViewCell
- (void)awakeFromNib {
// Initialization code
}
- (void)configCellWithArr:(id)array index:(NSIndexPath *)indexPath {
LogisticsItemsModel *model = array[indexPath.row];
self.time.text = SAFE_STRING(model.operTime);
self.LogisticsInfo.text = model.internalBaseClassDescription;
if (indexPath.row == 0) {
self.type = LogisticsLineTypeTop;
}else if (indexPath.row + 1 == [array count]){
self.type = LogisticsLineTypeBottom;
}else{
self.type = LogisticsLineTypeCenter;
}
}
/**
* 根据类型设置cell的样式
*
* @param type 类型
*/
- (void)setType:(LogisticsLineType)type {
switch (type) {
case LogisticsLineTypeTop: {
self.upLIne.hidden = YES;
self.imgClock.highlighted = NO;
self.downLine.hidden = NO;
self.time.textColor = kCustomGreenColor;
self.LogisticsInfo.textColor = kCustomGreenColor;
break;
}
case LogisticsLineTypeCenter: {
self.upLIne.hidden = NO;
self.imgClock.highlighted = YES;
self.downLine.hidden = NO;
self.time.textColor = [UIColor grayColor];
self.LogisticsInfo.textColor = [UIColor grayColor];
break;
}
case LogisticsLineTypeBottom: {
self.upLIne.hidden = NO;
self.imgClock.highlighted = YES;
self.downLine.hidden = YES;
self.time.textColor = [UIColor grayColor];
self.LogisticsInfo.textColor = [UIColor grayColor];
break;
}
}
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
View file @ edb8a475
......@@ -9,7 +9,6 @@
#import <UIKit/UIKit.h>
#import "MBLabelWithFontAdapter.h"
#import "JavenOrderModel.h"
@interface OrderDetailTopView : UIView
@property (nonatomic, strong) NSString *orderType;
@property (weak, nonatomic) IBOutlet MBLabelWithFontAdapter *labelExpress;
......@@ -19,6 +18,11 @@
@property (weak, nonatomic) IBOutlet UILabel *labelPhoneNumber;
@property (weak, nonatomic) IBOutlet UILabel *labelAddress;
@property (weak, nonatomic) IBOutlet UIView *bottomView;
@property (strong , nonatomic) NSMutableArray *arrData;
@property (nonatomic, strong) NSString *shipType;
@property (nonatomic, copy) NSString *shipTrackingNumber;
@property (nonatomic, copy) void(^tapBlcok)(void);
......
ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
View file @ edb8a475
......@@ -7,7 +7,7 @@
//
#import "OrderDetailTopView.h"
#import "LogisticsItemsModel.h"
@interface OrderDetailTopView ()
@property (weak, nonatomic) IBOutlet UIView *viewExpress;
@property (weak, nonatomic) IBOutlet UIImageView *imgIcon;
......@@ -17,17 +17,14 @@
@implementation OrderDetailTopView
- (void)awakeFromNib {
}
- (void)updateByOrderType {
if ([self.orderType isEqualToString: @"配送中"] || [self.orderType isEqualToString:@""]) {
if ([self.orderType isEqualToString: @"配送中"] || [self.orderType isEqualToString:@"待发货"]) {
CLog(@"待发货");
}else{
[self.viewExpress removeFromSuperview];
}
}
- (void)updateHeight {
......@@ -49,7 +46,16 @@
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"order/getLogistics/%@", model.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if (kIsResponseSuccess(responseObject)) {
weakSelf.labelExpress.text = responseObject[@"logistics"];
NSArray *items = responseObject[@"logistics"][@"items"];
weakSelf.shipType = responseObject[@"logistics"][@"yto"];
weakSelf.shipTrackingNumber = responseObject[@"logistics"][@"shipTrackingNumber"];
weakSelf.arrData = [NSMutableArray array];
for (NSDictionary *dic in items) {
LogisticsItemsModel *model = [LogisticsItemsModel modelObjectWithDictionary:dic];
[weakSelf.arrData insertObject:model atIndex:0];
}
LogisticsItemsModel *model = [weakSelf.arrData firstObject];
weakSelf.labelExpress.text = model.internalBaseClassDescription;
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
......@@ -60,6 +66,9 @@
- (void)getLogistics {
}
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
self.tapBlcok();
}
- (IBAction)actionCall:(id)sender {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", self.labelPhoneNumber.text]]];
......
ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
View file @ edb8a475
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDetailTopView"/>
......@@ -11,33 +11,33 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9kH-LK-wk8">
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9kH-LK-wk8">
<rect key="frame" x="0.0" y="178" width="320" height="102"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xru-fq-ja3">
<rect key="frame" x="45" y="22" width="68" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xru-fq-ja3">
<rect key="frame" x="45" y="22" width="68" height="20.5"/>
<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" ambiguous="YES" misplaced="YES" text="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J01-8B-y5r">
<rect key="frame" x="115" y="22" width="51" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J01-8B-y5r">
<rect key="frame" x="115" y="22" width="51" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="手机号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vh-Et-vJt">
<rect key="frame" x="45" y="51" width="68" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vh-Et-vJt">
<rect key="frame" x="45" y="50" width="68" height="20.5"/>
<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" ambiguous="YES" misplaced="YES" text="18321155536" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v7R-er-zaD">
<rect key="frame" x="115" y="51" width="105" height="21"/>
<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="115" y="50" width="104.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yca-8a-HcF">
<rect key="frame" x="262" y="22" width="50" height="50"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yca-8a-HcF">
<rect key="frame" x="262" y="22" width="50" height="49"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="2su-RU-ZJh"/>
</constraints>
......@@ -46,15 +46,15 @@
<action selector="actionCall:" destination="-1" eventType="touchUpInside" id="2Q6-do-hGR"/>
</connections>
</button>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" ambiguous="YES" misplaced="YES" image="icon_order_address" translatesAutoresizingMaskIntoConstraints="NO" id="OeX-RE-d2m">
<rect key="frame" x="4" y="74" width="30" height="23"/>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="icon_order_address" translatesAutoresizingMaskIntoConstraints="NO" id="OeX-RE-d2m">
<rect key="frame" x="4" y="73" width="30" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="eth-Xe-EGH"/>
<constraint firstAttribute="height" constant="23" id="yMF-z8-J4m"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="上海市 上海市 闵行区 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rM9-W2-1PT">
<rect key="frame" x="45" y="76" width="267" height="18"/>
<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="rM9-W2-1PT">
<rect key="frame" x="45" y="75" width="267" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
......@@ -94,11 +94,11 @@
</mask>
</variation>
</view>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kMe-iN-q0b">
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kMe-iN-q0b">
<rect key="frame" x="0.0" y="288" width="320" height="29"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" 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"/>
<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="20.5"/>
<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"/>
......@@ -114,8 +114,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9bs-ar-XXb">
<rect key="frame" x="0.0" y="120" width="320" height="58"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="在上海市闵行区分公" 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="18"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="在上海市闵行区分公" 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="20"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="xsK-I4-7Fb"/>
</constraints>
......@@ -123,21 +123,21 @@
<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" misplaced="YES" image="icon_order_car" translatesAutoresizingMaskIntoConstraints="NO" id="a5k-hm-R8j">
<rect key="frame" x="4" y="6" width="30" height="23"/>
<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="7" 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" misplaced="YES" 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="34" width="160" height="21"/>
<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="36" width="159.5" 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" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CPN-ej-33q">
<rect key="frame" x="8" y="55" width="304" height="1"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CPN-ej-33q">
<rect key="frame" x="8" y="57" 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"/>
......
ALand/CodeClass/Home/View/Order/OrderExpressTableViewCell.xib
View file @ edb8a475
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<objects>
......@@ -12,7 +12,7 @@
<rect key="frame" x="0.0" y="0.0" width="345" height="200"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VUy-Fo-j9I" id="9AG-22-NSU">
<rect key="frame" x="0.0" y="0.0" width="345" height="199"/>
<rect key="frame" x="0.0" y="0.0" width="345" height="199.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="1Q9-Yb-5Zd">
......@@ -45,7 +45,7 @@
<color key="textColor" red="0.63360416669999997" green="0.63360416669999997" blue="0.63360416669999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="14H-w4-6eU">
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="14H-w4-6eU">
<rect key="frame" x="8" y="74" width="329" height="1"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
......@@ -62,13 +62,13 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NKY-p0-eZH">
<rect key="frame" x="0.0" y="100" width="345" height="44"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="应付:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NSP-00-fgb">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="应付:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NSP-00-fgb">
<rect key="frame" x="119" y="15" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.50823958329999996" green="0.50823958329999996" blue="0.50823958329999996" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ga-eZ-C09">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ga-eZ-C09">
<rect key="frame" x="166" y="15" width="48" 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"/>
......
ALand/CodeClass/Home/View/Order/SeeLogistics.xib
View file @ edb8a475
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......
ALand/CodeClass/Home/ViewController/HomeZ.storyboard 0 → 100644
View file @ edb8a475
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--Logistics Line View Controller-->
<scene sceneID="BAh-z1-adc">
<objects>
<viewController storyboardIdentifier="LogisticsLineViewController" id="UFy-cL-QUX" customClass="LogisticsLineViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="7dR-fr-Dr2"/>
<viewControllerLayoutGuide type="bottom" id="CkA-7f-J4N"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="cqf-kF-shy">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="123" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="o5T-Xd-q59">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="e30-Z8-FB2">
<rect key="frame" x="0.0" y="0.0" width="375" height="114"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="yto" translatesAutoresizingMaskIntoConstraints="NO" id="OnE-R2-IqQ">
<rect key="frame" x="16" y="16" width="82" height="82"/>
<constraints>
<constraint firstAttribute="width" secondItem="OnE-R2-IqQ" secondAttribute="height" multiplier="1:1" id="gqF-wO-vr3"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="运单号：8dheksj8923" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kTT-ZN-JpD">
<rect key="frame" x="106" y="61" width="253" height="25.5"/>
<fontDescription key="fontDescription" type="system" pointSize="21"/>
<color key="textColor" white="1" 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="JQw-U8-9IB">
<rect key="frame" x="106" y="26" width="92" height="27.5"/>
<fontDescription key="fontDescription" type="system" pointSize="23"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.50196078431372548" green="0.77647058823529413" blue="0.15686274509803921" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="kTT-ZN-JpD" secondAttribute="trailing" constant="16" id="CHW-va-9fj"/>
<constraint firstAttribute="bottom" secondItem="OnE-R2-IqQ" secondAttribute="bottom" constant="16" id="NgU-r3-7FI"/>
<constraint firstItem="kTT-ZN-JpD" firstAttribute="top" secondItem="JQw-U8-9IB" secondAttribute="bottom" constant="7.5" id="NqP-4o-32L"/>
<constraint firstItem="kTT-ZN-JpD" firstAttribute="leading" secondItem="JQw-U8-9IB" secondAttribute="leading" id="VsD-0y-RWk"/>
<constraint firstItem="JQw-U8-9IB" firstAttribute="leading" secondItem="OnE-R2-IqQ" secondAttribute="trailing" constant="8" id="aT2-Kc-atQ"/>
<constraint firstItem="OnE-R2-IqQ" firstAttribute="leading" secondItem="e30-Z8-FB2" secondAttribute="leading" constant="16" id="rRf-NP-cYy"/>
<constraint firstItem="JQw-U8-9IB" firstAttribute="top" secondItem="OnE-R2-IqQ" secondAttribute="top" constant="10" id="x1c-77-2yw"/>
<constraint firstItem="OnE-R2-IqQ" firstAttribute="top" secondItem="e30-Z8-FB2" secondAttribute="top" constant="16" id="zew-wZ-WpD"/>
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LogisticsTimeLineTableViewCell" rowHeight="123" id="FvG-1C-5xV" customClass="LogisticsTimeLineTableViewCell">
<rect key="frame" x="0.0" y="142" width="375" height="123"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FvG-1C-5xV" id="cMO-GK-HAf">
<rect key="frame" x="0.0" y="0.0" width="375" height="123"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFill" image="img_time_logo_red" highlightedImage="img_time_logo_gray" translatesAutoresizingMaskIntoConstraints="NO" id="b6n-BJ-ofX">
<rect key="frame" x="16" y="16" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="KMj-Su-al0"/>
<constraint firstAttribute="width" constant="20" id="fdt-aX-OOW"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iK5-Og-Ley" userLabel="灰线 上">
<rect key="frame" x="25" y="0.0" width="1" height="16"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="dgb-PE-9TT"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bdJ-qA-Wlf" userLabel="灰线 下">
<rect key="frame" x="25" y="36" width="1" height="86.5"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="9P9-J3-0nw"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-06-23 23:34:34" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NAQ-Vl-MFa">
<rect key="frame" x="52" y="15" width="170" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.50196078430000002" green="0.77647058820000003" blue="0.15686274510000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<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="wzX-Pa-eEm">
<rect key="frame" x="52" y="44" width="302" height="62.5"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.50196078430000002" green="0.77647058820000003" blue="0.15686274510000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CEb-CT-1cx">
<rect key="frame" x="42" y="121.5" width="317" height="1"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="chr-dR-Bqy"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="CEb-CT-1cx" secondAttribute="bottom" id="2Nl-3s-C4q"/>
<constraint firstItem="b6n-BJ-ofX" firstAttribute="top" secondItem="cMO-GK-HAf" secondAttribute="topMargin" constant="8" id="6gI-6v-a6j"/>
<constraint firstItem="wzX-Pa-eEm" firstAttribute="top" secondItem="NAQ-Vl-MFa" secondAttribute="bottom" constant="8" id="6jN-v0-UGk"/>
<constraint firstItem="NAQ-Vl-MFa" firstAttribute="centerY" secondItem="b6n-BJ-ofX" secondAttribute="centerY" id="ARf-nT-WYL"/>
<constraint firstItem="bdJ-qA-Wlf" firstAttribute="top" secondItem="cMO-GK-HAf" secondAttribute="top" id="O1Q-g7-0ea"/>
<constraint firstItem="b6n-BJ-ofX" firstAttribute="leading" secondItem="cMO-GK-HAf" secondAttribute="leading" constant="16" id="PHq-Tu-WWq"/>
<constraint firstItem="wzX-Pa-eEm" firstAttribute="leading" secondItem="NAQ-Vl-MFa" secondAttribute="leading" id="Ujr-B9-SZt"/>
<constraint firstItem="CEb-CT-1cx" firstAttribute="leading" secondItem="bdJ-qA-Wlf" secondAttribute="trailing" constant="16" id="ai8-Jy-b3z"/>
<constraint firstItem="b6n-BJ-ofX" firstAttribute="top" secondItem="iK5-Og-Ley" secondAttribute="bottom" id="b2d-Ms-RD2"/>
<constraint firstItem="b6n-BJ-ofX" firstAttribute="centerX" secondItem="bdJ-qA-Wlf" secondAttribute="centerX" id="cZg-lx-jYv"/>
<constraint firstAttribute="bottom" secondItem="wzX-Pa-eEm" secondAttribute="bottom" constant="16" id="cme-5D-49d"/>
<constraint firstAttribute="trailing" secondItem="CEb-CT-1cx" secondAttribute="trailing" constant="16" id="gDj-9N-6xO"/>
<constraint firstItem="bdJ-qA-Wlf" firstAttribute="top" secondItem="b6n-BJ-ofX" secondAttribute="bottom" id="gIf-VM-T2a"/>
<constraint firstAttribute="trailing" secondItem="wzX-Pa-eEm" secondAttribute="trailing" constant="21" id="j7A-46-Mun"/>
<constraint firstAttribute="bottom" secondItem="bdJ-qA-Wlf" secondAttribute="bottom" id="qDV-48-GQH"/>
<constraint firstItem="NAQ-Vl-MFa" firstAttribute="leading" secondItem="b6n-BJ-ofX" secondAttribute="trailing" constant="16" id="tVp-Cd-W6B"/>
<constraint firstItem="iK5-Og-Ley" firstAttribute="top" secondItem="cMO-GK-HAf" secondAttribute="top" id="wrV-MT-8dF"/>
<constraint firstItem="iK5-Og-Ley" firstAttribute="centerX" secondItem="b6n-BJ-ofX" secondAttribute="centerX" id="zQN-1l-VBQ"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="O1Q-g7-0ea"/>
</mask>
</variation>
</tableViewCellContentView>
<connections>
<outlet property="LogisticsInfo" destination="wzX-Pa-eEm" id="p09-QK-8TJ"/>
<outlet property="downLine" destination="bdJ-qA-Wlf" id="QxF-6d-RPo"/>
<outlet property="imgClock" destination="b6n-BJ-ofX" id="93w-Zk-lTy"/>
<outlet property="time" destination="NAQ-Vl-MFa" id="Y8l-Ca-Gsj"/>
<outlet property="upLIne" destination="iK5-Og-Ley" id="knT-mm-nlC"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="UFy-cL-QUX" id="5Ab-ra-PvP"/>
<outlet property="delegate" destination="UFy-cL-QUX" id="1Il-Kl-m57"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="o5T-Xd-q59" firstAttribute="leading" secondItem="cqf-kF-shy" secondAttribute="leading" id="5QO-Wd-SuK"/>
<constraint firstAttribute="trailing" secondItem="o5T-Xd-q59" secondAttribute="trailing" id="Gdw-Wk-HUj"/>
<constraint firstItem="CkA-7f-J4N" firstAttribute="top" secondItem="o5T-Xd-q59" secondAttribute="bottom" id="Qfg-aM-SwO"/>
<constraint firstItem="o5T-Xd-q59" firstAttribute="top" secondItem="7dR-fr-Dr2" secondAttribute="bottom" id="r8p-1v-lPP"/>
</constraints>
</view>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<connections>
<outlet property="logisticIcon" destination="OnE-R2-IqQ" id="0zw-S1-TkK"/>
<outlet property="logisticsName" destination="JQw-U8-9IB" id="TtY-Oi-bJx"/>
<outlet property="logisticsNumber" destination="kTT-ZN-JpD" id="OWx-Fz-8oi"/>
<outlet property="tableView" destination="o5T-Xd-q59" id="Lxg-ny-DSg"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Us8-dy-fcb" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="557.5" y="274.5"/>
</scene>
</scenes>
<resources>
<image name="img_time_logo_gray" width="26" height="26"/>
<image name="img_time_logo_red" width="26" height="26"/>
<image name="yto" width="308" height="308"/>
</resources>
</document>
ALand/CodeClass/Home/ViewController/Order/LogisticsLineViewController.h 0 → 100644
View file @ edb8a475
//
// LogisticsLineViewController.h
// ALand
//
// Created by Javen on 16/8/29.
// Copyright © 2016年 Z. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface LogisticsLineViewController : IBTUIViewController
@property (nonatomic, strong) NSArray *arrData;
@property (nonatomic, strong) NSString *shipType;
@property (nonatomic, copy) NSString *shipTrackingNumber;
@end
ALand/CodeClass/Home/ViewController/Order/LogisticsLineViewController.m 0 → 100644
View file @ edb8a475
//
// LogisticsLineViewController.m
// ALand
//
// Created by Javen on 16/8/29.
// Copyright © 2016年 Z. All rights reserved.
//
#import "LogisticsLineViewController.h"
#import "LogisticsTimeLineTableViewCell.h"
@interface LogisticsLineViewController ()<UITableViewDelegate, UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UITableView *tableView;
/** 物流图标 */
@property (weak, nonatomic) IBOutlet UIImageView *logisticIcon;
/** 物流名称 */
@property (weak, nonatomic) IBOutlet UILabel *logisticsName;
/** 物流单号 */
@property (weak, nonatomic) IBOutlet UILabel *logisticsNumber;
@end
@implementation LogisticsLineViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"物流详情";
self.logisticsNumber.text = [NSString stringWithFormat:@"运单号：%@",self.shipTrackingNumber];
self.tableView.estimatedRowHeight = 50;
self.tableView.rowHeight = UITableViewAutomaticDimension;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.arrData.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
LogisticsTimeLineTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LogisticsTimeLineTableViewCell" forIndexPath:indexPath];
[cell configCellWithArr:self.arrData index:indexPath];
return cell;
}
- (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
ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
View file @ edb8a475
......@@ -17,6 +17,7 @@
#import "WebViewController.h"
#import "OrderWebViewController.h"
#define kCellId @"OrderDetailTableViewCell.h"
#import "LogisticsLineViewController.h"
@interface OrderDetailViewController ()<UITableViewDelegate, UITableViewDataSource>
@property (nonatomic, strong) UITableView *tableView;
@property (nonatomic, strong) OrderDetailBottomView *bottomView;
......@@ -51,6 +52,18 @@
[self.atopView updateByOrderType];
WS(weakSelf);
self.atopView.tapBlcok = ^{
UIStoryboard *board = [UIStoryboard storyboardWithName:@"HomeZ" bundle:nil];
LogisticsLineViewController *lineVC = [board instantiateViewControllerWithIdentifier:@"LogisticsLineViewController"];
lineVC.arrData = weakSelf.atopView.arrData;
lineVC.shipType = weakSelf.atopView.shipType;
lineVC.shipTrackingNumber = weakSelf.atopView.shipTrackingNumber;
lineVC.isShowNavigationBar = YES;
[weakSelf.navigationController pushViewController:lineVC animated:YES];
};
self.bottomView = [OrderDetailBottomView viewWithNibName:@"OrderDetailBottomView"];
[self.bottomView viewWithModel:self.model];
......@@ -116,7 +129,6 @@
JavenGoodsDetails *details = self.model.goodsDetails[indexPath.row];
CommodityDetailViewController *detailVC = [[CommodityDetailViewController alloc] init];
CommotityListModel *model = [[CommotityListModel alloc] init];
model.uuid = details.goods.uuid;
model.name = details.goods.name;
......@@ -128,9 +140,6 @@
[self.navigationController pushViewController:detailVC animated:YES];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m
View file @ edb8a475
......@@ -64,11 +64,8 @@
}
[self addLeftBarBtnItemWithName:_cancelButtonName action:@selector(disMissSelf)];
}
[self.navigationController setNavigationBarHidden:!self.isShowNavigationBar animated:YES];
}
- (void)viewDidAppear:(BOOL)animated {
......
ALand/Macro/AppHeader.h
View file @ edb8a475
......@@ -52,8 +52,7 @@
#define IsArrayObject(Object) [(Object) isKindOfClass:[NSArray class]]
#define IsDictObject(Object) [(Object) isKindOfClass:[NSDictionary class]]
#define IsErrorObject(Object) ![(Object) isKindOfClass:[NSError class]]
#define SAFE_STRING(string) string ? string : @""
#define SAFE_STRING(string) [string isKindOfClass:[NSString class]] ? string : @""
#define kSysWhite [UIColor whiteColor]
#define kButtonAddAction(button, buttonAction) [button addTarget:self action:@selector(buttonAction) forControlEvents:UIControlEventTouchUpInside];
......
ALand/Macro/UrlHeader.h
View file @ edb8a475
......@@ -10,9 +10,9 @@
#define UrlHeader_h
#import <Foundation/Foundation.h>
//static NSString *const REST_BASE_URL = @"http://139.196.173.244:8080/aland-server/rest"; //正式环境
static NSString *const REST_BASE_URL = @"http://139.196.173.244:8080/aland-server/rest"; //正式环境
static NSString *const REST_BASE_URL = @"http://139.196.195.30:9090/aland-server/rest"; //测试环境
//static NSString *const REST_BASE_URL = @"http://139.196.195.30:9090/aland-server/rest"; //测试环境
static NSString *const kDomain = @"0001"; //组织代码
......
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