订单列表页面修改

ALand.xcodeproj/project.pbxproj

@@ -137,6 +137,8 @@
 		19D906AD1CC7898C00CD42DC /* MineViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906AB1CC7898C00CD42DC /* MineViewController.xib */; };
 		19D906B61CC86DA300CD42DC /* SettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906B41CC86DA300CD42DC /* SettingViewController.m */; };
 		19D906B71CC86DA300CD42DC /* SettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906B51CC86DA300CD42DC /* SettingViewController.xib */; };
+		19D906BB1CC87F3B00CD42DC /* OrderExpressTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */; };
+		19D906BC1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */; };
 		19DC6AFC1CBF867E0064A9FD /* JavenShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */; };
 		19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */; };
 		19DC6B131CC0ACDE0064A9FD /* MyteamTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */; };
@@ -478,6 +480,9 @@
 		19D906B31CC86DA300CD42DC /* SettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingViewController.h; sourceTree = "<group>"; };
 		19D906B41CC86DA300CD42DC /* SettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingViewController.m; sourceTree = "<group>"; };
 		19D906B51CC86DA300CD42DC /* SettingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingViewController.xib; sourceTree = "<group>"; };
+		19D906B81CC87F3B00CD42DC /* OrderExpressTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderExpressTableViewCell.h; sourceTree = "<group>"; };
+		19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderExpressTableViewCell.m; sourceTree = "<group>"; };
+		19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderExpressTableViewCell.xib; sourceTree = "<group>"; };
 		19DC6AFA1CBF867E0064A9FD /* JavenShopModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenShopModel.h; sourceTree = "<group>"; };
 		19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenShopModel.m; sourceTree = "<group>"; };
 		19DC6B0D1CC0AA7D0064A9FD /* MyTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTeamViewController.h; sourceTree = "<group>"; };
@@ -752,6 +757,9 @@
 				191383371CAB96D4005F6440 /* OrderTableViewCell.h */,
 				191383381CAB96D4005F6440 /* OrderTableViewCell.m */,
 				191383391CAB96D4005F6440 /* OrderTableViewCell.xib */,
+				19D906B81CC87F3B00CD42DC /* OrderExpressTableViewCell.h */,
+				19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */,
+				19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */,
 				1913833E1CAB9DD4005F6440 /* OrderCellView.h */,
 				1913833F1CAB9DD4005F6440 /* OrderCellView.m */,
 				1913833C1CAB9DC2005F6440 /* OrderCellView.xib */,
@@ -1840,6 +1848,7 @@
 				1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */,
 				19D906AD1CC7898C00CD42DC /* MineViewController.xib in Resources */,
 				197975241CA8FAAE00407E3F /* CommodityDetailTopView.xib in Resources */,
+				19D906BC1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib in Resources */,
 				19ADD3851CA4D3C400EE6E5A /* AddCommodityCollectionViewCell.xib in Resources */,
 				199BC7BF1C9B045B00E4E0B8 /* RigistViewController.xib in Resources */,
 				19D906B71CC86DA300CD42DC /* SettingViewController.xib in Resources */,
@@ -2052,6 +2061,7 @@
 				1979753E1CAA15C700407E3F /* CommodityTableViewCell.m in Sources */,
 				19DCCB671C9A9EB30072C3BF /* IBTCustomButtom.m in Sources */,
 				191AEE7E1CBCEE6B00F5E535 /* JavenCategory.m in Sources */,
+				19D906BB1CC87F3B00CD42DC /* OrderExpressTableViewCell.m in Sources */,
 				191AEE621CBCC6D100F5E535 /* Orders.m in Sources */,
 				195EB1DB1CA516CE00E298BB /* HotCommodityCell.m in Sources */,
 				191AEE841CBCEE8C00F5E535 /* JavenHotTagsModel.m in Sources */,

ALand/CodeClass/Home/View/Order/OrderCellView.xib

@@ -9,11 +9,11 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="OrderCellView">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="110"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="commodityManagementImage" translatesAutoresizingMaskIntoConstraints="NO" id="gvZ-Yx-Ujy">
-                    <rect key="frame" x="8" y="8" width="90" height="121"/>
+                    <rect key="frame" x="8" y="8" width="90" height="94"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="90" id="92I-IA-f2F"/>
                         <constraint firstAttribute="height" constant="81" id="C9T-Ih-pvI"/>
@@ -32,55 +32,72 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="96粒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bGv-K4-Dnw">
-                    <rect key="frame" x="106" y="82" width="43" height="23"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
-                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <rect key="frame" x="106" y="70" width="38" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OR2-4k-rSi">
-                    <rect key="frame" x="157" y="82" width="21" height="23"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
-                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OR2-4k-rSi">
+                    <rect key="frame" x="152" y="70" width="20" height="22"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="售价：￥279" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vW8-v5-AfH">
-                    <rect key="frame" x="106" y="108" width="98" height="21"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥178" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vW8-v5-AfH">
+                    <rect key="frame" x="225" y="70" width="45" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="acf-qI-3N1">
-                    <rect key="frame" x="8" y="138" width="304" height="1"/>
+                    <rect key="frame" x="8" y="108" width="304" height="1"/>
                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="23G-ad-XsJ"/>
                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="1" id="Z3D-fb-vaB"/>
                     </constraints>
                 </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="售价:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jpi-l7-Qzv">
+                    <rect key="frame" x="186" y="70" width="39" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
+                <constraint firstItem="vW8-v5-AfH" firstAttribute="leading" secondItem="jpi-l7-Qzv" secondAttribute="trailing" id="0Wv-4a-Qjz"/>
                 <constraint firstItem="bGv-K4-Dnw" firstAttribute="leading" secondItem="dhI-dB-05Q" secondAttribute="leading" id="0l8-KH-vVl"/>
                 <constraint firstAttribute="trailingMargin" secondItem="dhI-dB-05Q" secondAttribute="trailing" id="8t4-X9-fTa"/>
+                <constraint firstAttribute="trailing" secondItem="vW8-v5-AfH" secondAttribute="trailing" constant="50" id="9i3-tw-cM7"/>
+                <constraint firstItem="jpi-l7-Qzv" firstAttribute="centerY" secondItem="OR2-4k-rSi" secondAttribute="centerY" id="Clg-dy-dzo"/>
                 <constraint firstItem="dhI-dB-05Q" firstAttribute="leading" secondItem="gvZ-Yx-Ujy" secondAttribute="trailing" constant="8" id="DyV-JN-MBh"/>
                 <constraint firstItem="gvZ-Yx-Ujy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="E1r-kk-ilm"/>
+                <constraint firstItem="vW8-v5-AfH" firstAttribute="centerY" secondItem="OR2-4k-rSi" secondAttribute="centerY" id="JOx-xb-EXc"/>
                 <constraint firstItem="vW8-v5-AfH" firstAttribute="top" secondItem="bGv-K4-Dnw" secondAttribute="bottom" constant="3" id="TUm-3B-rCo"/>
                 <constraint firstItem="vW8-v5-AfH" firstAttribute="bottom" secondItem="gvZ-Yx-Ujy" secondAttribute="bottom" id="Vyg-Eu-u0I"/>
                 <constraint firstItem="gvZ-Yx-Ujy" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="topMargin" id="Wka-bt-cZs"/>
                 <constraint firstItem="vW8-v5-AfH" firstAttribute="leading" secondItem="bGv-K4-Dnw" secondAttribute="leading" id="Wps-v8-DZG"/>
                 <constraint firstItem="acf-qI-3N1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="XW2-I5-FBt"/>
                 <constraint firstItem="OR2-4k-rSi" firstAttribute="leading" secondItem="bGv-K4-Dnw" secondAttribute="trailing" constant="8" id="ZRX-DE-Tgo"/>
-                <constraint firstAttribute="bottomMargin" secondItem="gvZ-Yx-Ujy" secondAttribute="bottom" constant="3" id="cJq-F0-J8w"/>
+                <constraint firstAttribute="bottomMargin" secondItem="gvZ-Yx-Ujy" secondAttribute="bottom" id="cJq-F0-J8w"/>
+                <constraint firstAttribute="bottom" secondItem="bGv-K4-Dnw" secondAttribute="bottom" constant="19" id="dv6-Vw-b6i"/>
                 <constraint firstItem="dhI-dB-05Q" firstAttribute="top" secondItem="gvZ-Yx-Ujy" secondAttribute="top" id="g7A-BG-g7x"/>
                 <constraint firstAttribute="trailing" secondItem="acf-qI-3N1" secondAttribute="trailing" constant="8" id="qgd-jV-kN7"/>
                 <constraint firstItem="OR2-4k-rSi" firstAttribute="centerY" secondItem="bGv-K4-Dnw" secondAttribute="centerY" id="qiC-Hv-sB8"/>
                 <constraint firstAttribute="bottom" secondItem="acf-qI-3N1" secondAttribute="bottom" constant="1" id="zcZ-yg-SPG"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <variation key="default">
+                <mask key="constraints">
+                    <exclude reference="TUm-3B-rCo"/>
+                    <exclude reference="Vyg-Eu-u0I"/>
+                    <exclude reference="Wps-v8-DZG"/>
+                </mask>
+            </variation>
             <connections>
                 <outlet property="labelTitle" destination="dhI-dB-05Q" id="bF1-FF-LUO"/>
             </connections>
-            <point key="canvasLocation" x="237" y="351"/>
+            <point key="canvasLocation" x="237" y="336"/>
         </view>
     </objects>
     <resources>

ALand/CodeClass/Home/View/Order/OrderExpressTableViewCell.h

+//
+//  OrderExpressTableViewCell.h
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OrderExpressTableViewCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UIButton *checkExpress;
+
+- (void)cellWithViewNumber:(NSInteger)number;
+- (void)setState:(NSString *)orderState;
+@end

ALand/CodeClass/Home/View/Order/OrderExpressTableViewCell.m

+//
+//  OrderExpressTableViewCell.m
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderExpressTableViewCell.h"
+#import "OrderCellView.h"
+
+@interface OrderExpressTableViewCell ()
+@property (nonatomic, strong) NSMutableArray *arrCellView;
+@property (weak, nonatomic) IBOutlet UILabel *labelState;
+
+@end
+@implementation OrderExpressTableViewCell
+- (void)awakeFromNib {
+    // Initialization code
+    self.arrCellView = [NSMutableArray array];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+}
+
+- (void)cellWithViewNumber:(NSInteger)number {
+    for (OrderCellView *cellView  in self.arrCellView) {
+        [cellView removeFromSuperview];
+    }
+    
+    for (NSInteger i = 0; i < number; i++) {
+        OrderCellView *cellView = [OrderCellView viewWithNibName:@"OrderCellView"];
+        cellView.frame = CGRectMake(0, 74 + 120 * i, self.width, 120);
+        
+        [self.arrCellView addObject:cellView];
+        [self.contentView addSubview:cellView];
+    }
+    
+}
+
+- (void)setState:(NSString *)orderState {
+    self.labelState.text = orderState;
+}
+
+- (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/OrderTableViewCell.m

@@ -23,43 +23,18 @@
 }
 
 - (void)cellWithViewNumber:(NSInteger)number {
-    //[self.contentView removeAllSubViews];
     for (OrderCellView *cellView  in self.arrCellView) {
         [cellView removeFromSuperview];
     }
     
-    
-    
-//    //1.获取一个全局串行队列
-//    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-//    //2.把任务添加到队列中执行
-//    dispatch_async(queue, ^{
-//        
-//        //打印当前线程
-//        CLog(@"%@",[NSThread currentThread]);
-//        
-    
         for (NSInteger i = 0; i < number; i++) {
-            
-            
-            
             OrderCellView *cellView = [OrderCellView viewWithNibName:@"OrderCellView"];
             cellView.frame = CGRectMake(0, 74 + 120 * i, self.width, 120);
-            
-//            //回到主线程，展示图片
-//            dispatch_async(dispatch_get_main_queue(), ^{
-//                //打印当前线程
-//                CLog(@"%@",[NSThread currentThread]);
+
                 [self.arrCellView addObject:cellView];
                 [self.contentView addSubview:cellView];
-//            });
-//            
         }
-    
-        
-//    });
-    
-    
+
 }
 
 - (void)setState:(NSString *)orderState {

ALand/CodeClass/Home/View/Order/OrderTableViewCell.xib

@@ -8,11 +8,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="280" id="KGk-i7-Jjw" customClass="OrderTableViewCell">
-            <rect key="frame" x="0.0" y="0.0" width="333" height="276"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="361" id="KGk-i7-Jjw" customClass="OrderTableViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="331" height="357"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="333" height="275"/>
+                <rect key="frame" x="0.0" y="0.0" width="331" height="356"/>
                 <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="RqJ-Zt-ur3">
@@ -28,7 +28,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <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="C8f-Oc-X6g">
-                        <rect key="frame" x="255" y="18" width="51" height="21"/>
+                        <rect key="frame" x="274" y="18" width="51" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -46,42 +46,42 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s31-Vq-7Yk">
-                        <rect key="frame" x="8" y="74" width="298" height="1"/>
+                        <rect key="frame" x="8" y="74" width="317" height="1"/>
                         <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="6at-rq-bXi"/>
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TVn-BB-oEx">
-                        <rect key="frame" x="0.0" y="0.0" width="314" height="10"/>
+                        <rect key="frame" x="0.0" y="0.0" width="333" height="10"/>
                         <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.8666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="10" id="ODE-gK-emL"/>
                         </constraints>
                     </view>
-                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d6S-4w-qHp">
-                        <rect key="frame" x="0.0" y="230" width="333" height="44"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d6S-4w-qHp">
+                        <rect key="frame" x="0.0" y="312" width="331" 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="cc3-M1-4wO">
-                                <rect key="frame" x="8" y="15" width="39" height="21"/>
+                                <rect key="frame" x="105" y="15" width="39" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.5082395833333333" green="0.5082395833333333" blue="0.5082395833333333" 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="GFV-0S-gMx">
-                                <rect key="frame" x="55" y="15" width="48" height="21"/>
+                                <rect key="frame" x="152" y="15" width="48" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <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="IC0-sm-vao">
-                                <rect key="frame" x="129" y="15" width="39" height="21"/>
+                                <rect key="frame" x="226" 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="￥83.7" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iUL-cF-E4q">
-                                <rect key="frame" x="176" y="15" width="52" height="21"/>
+                                <rect key="frame" x="273" y="15" width="52" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="0.3921568627" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -92,8 +92,9 @@
                             <constraint firstAttribute="height" constant="44" id="0Yq-KB-ELb"/>
                             <constraint firstItem="GFV-0S-gMx" firstAttribute="leading" secondItem="cc3-M1-4wO" secondAttribute="trailing" constant="8" id="1SU-PL-DLr"/>
                             <constraint firstItem="IC0-sm-vao" firstAttribute="leading" secondItem="GFV-0S-gMx" secondAttribute="trailing" constant="26" id="IbI-Ky-EUv"/>
+                            <constraint firstAttribute="bottom" secondItem="iUL-cF-E4q" secondAttribute="bottom" constant="8" id="KnB-zu-UBg"/>
+                            <constraint firstAttribute="trailing" secondItem="iUL-cF-E4q" secondAttribute="trailing" constant="6" id="Nm3-3w-sEq"/>
                             <constraint firstItem="IC0-sm-vao" firstAttribute="centerY" secondItem="cc3-M1-4wO" secondAttribute="centerY" id="QZP-ZG-IJp"/>
-                            <constraint firstItem="cc3-M1-4wO" firstAttribute="leading" secondItem="d6S-4w-qHp" secondAttribute="leading" constant="8" id="YFg-Tv-bGf"/>
                             <constraint firstItem="GFV-0S-gMx" firstAttribute="centerY" secondItem="cc3-M1-4wO" secondAttribute="centerY" id="iYu-0G-Xk2"/>
                             <constraint firstItem="iUL-cF-E4q" firstAttribute="leading" secondItem="IC0-sm-vao" secondAttribute="trailing" constant="8" id="keG-LA-Pdp"/>
                             <constraint firstAttribute="bottom" secondItem="cc3-M1-4wO" secondAttribute="bottom" constant="8" id="rAb-U9-6js"/>
@@ -138,7 +139,7 @@
             <connections>
                 <outlet property="labelState" destination="C8f-Oc-X6g" id="zN3-gE-D8U"/>
             </connections>
-            <point key="canvasLocation" x="-47.5" y="395"/>
+            <point key="canvasLocation" x="-48.5" y="435.5"/>
         </tableViewCell>
     </objects>
 </document>

ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m

@@ -9,7 +9,9 @@
 #import "NoPaymentTableViewController.h"
 #import "OrderTableViewCell.h"
 #import "OrderDetailViewController.h"
+#import "OrderExpressTableViewCell.h"
 
+#define kExpressCell @"OrderExpressTableViewCell.h"
 #define kCellId @"OrderTableViewCell.h"
 @interface NoPaymentTableViewController ()
 @property (nonatomic, strong) NSArray *array;
@@ -21,12 +23,23 @@
     [super viewDidLoad];
     self.array = @[@2,@3,@5,@10];
     [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
+    [self.tableView registerNib:[UINib nibWithNibName:@"OrderExpressTableViewCell" bundle:nil] forCellReuseIdentifier:kExpressCell];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 64, 0);
 
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    if ([self.orderTag isEqualToString:@"代支付"]) {
+    }else if([self.orderTag isEqualToString:@"待发货"]){
+    }else if ([self.orderTag isEqualToString:@"已发货"]){
+        return 170 + 120 * [self.array[indexPath.row] integerValue];
+    }else if ([self.orderTag isEqualToString:@"已完成"]){
+        return 170 + 120 * [self.array[indexPath.row] integerValue];
+    }else if ([self.orderTag isEqualToString:@"已取消"]){
+    }
+    
     return 115 + 120 * [self.array[indexPath.row] integerValue];
 }
 
@@ -50,13 +63,26 @@
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+    if ([self.orderTag isEqualToString:@"已发货"] || [self.orderTag isEqualToString:@"已完成"]) {
+        OrderExpressTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kExpressCell forIndexPath:indexPath];
+        
+        [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+        [cell setState:_orderTag];
+        cell.checkExpress.hidden = NO;
+        return cell;
+
+    }else{
+        
+        OrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId forIndexPath:indexPath];
+        
+        // Configure the cell...
+        
+        [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
+        [cell setState:_orderTag];
+        //    cell.checkExpress.hidden = NO;
+        return cell;
+    }
     
-    // Configure the cell...
-   
-    [cell cellWithViewNumber: [self.array[indexPath.row] integerValue]];
-    [cell setState:_orderTag];
-    return cell;
 }