Skip to content

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

订单列表页面修改

parent a37782d4
Show whitespace changes
Inline Side-by-side
Showing with 338 additions and 63 deletions
ALand.xcodeproj/project.pbxproj
View file @ 8ed4b621
......@@ -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
View file @ 8ed4b621
......@@ -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 0 → 100644
View file @ 8ed4b621
//
// 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 0 → 100644
View file @ 8ed4b621
//
// 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/OrderExpressTableViewCell.xib 0 → 100644
View file @ 8ed4b621
<?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">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<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="204" id="VUy-Fo-j9I" customClass="OrderExpressTableViewCell">
<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"/>
<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">
<rect key="frame" x="8" y="18" width="51" 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="jog-1Q-NME">
<rect key="frame" x="74" y="18" width="51" 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" misplaced="YES" text="待支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J5p-Wx-HPf">
<rect key="frame" x="272" 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"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7nV-AP-ciI">
<rect key="frame" x="8" y="47" width="73" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63360416669999997" green="0.63360416669999997" blue="0.63360416669999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-10-12 09:13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ck-1t-J8c">
<rect key="frame" x="94" y="47" width="167" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63360416669999997" green="0.63360416669999997" blue="0.63360416669999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="14H-w4-6eU">
<rect key="frame" x="8" y="74" width="315" 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="yeu-SB-vLO"/>
</constraints>
</view>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7at-Z4-fCe">
<rect key="frame" x="0.0" y="0.0" width="331" height="10"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="10" id="L0q-yU-oH5"/>
</constraints>
</view>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NKY-p0-eZH">
<rect key="frame" x="0.0" y="78" width="331" height="44"/>
<subviews>
<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="105" 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" misplaced="YES" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ga-eZ-C09">
<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" misplaced="YES" text="应付:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iCY-t9-oeZ">
<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" misplaced="YES" text="￥83.7" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIr-bn-6Cs">
<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"/>
</label>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VUV-c7-npe">
<rect key="frame" x="8" y="43" width="315" 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="Vsr-k9-3yO"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="VUV-c7-npe" secondAttribute="bottom" id="9RR-UP-e6V"/>
<constraint firstAttribute="height" constant="44" id="N7a-oG-4AV"/>
<constraint firstItem="8Ga-eZ-C09" firstAttribute="centerY" secondItem="NSP-00-fgb" secondAttribute="centerY" id="OVP-xM-vxC"/>
<constraint firstItem="iIr-bn-6Cs" firstAttribute="leading" secondItem="iCY-t9-oeZ" secondAttribute="trailing" constant="8" id="Ogp-Os-GR5"/>
<constraint firstItem="iCY-t9-oeZ" firstAttribute="centerY" secondItem="NSP-00-fgb" secondAttribute="centerY" id="Tne-GU-m0w"/>
<constraint firstAttribute="trailing" secondItem="iIr-bn-6Cs" secondAttribute="trailing" constant="6" id="bpe-mU-ZuY"/>
<constraint firstAttribute="bottom" secondItem="NSP-00-fgb" secondAttribute="bottom" constant="8" id="idg-OL-70F"/>
<constraint firstItem="iIr-bn-6Cs" firstAttribute="centerY" secondItem="NSP-00-fgb" secondAttribute="centerY" id="oY6-eZ-fc2"/>
<constraint firstItem="8Ga-eZ-C09" firstAttribute="leading" secondItem="NSP-00-fgb" secondAttribute="trailing" constant="8" id="ozw-Qw-0NK"/>
<constraint firstItem="VUV-c7-npe" firstAttribute="leading" secondItem="NKY-p0-eZH" secondAttribute="leading" constant="8" id="upg-Rm-jj7"/>
<constraint firstAttribute="trailing" secondItem="VUV-c7-npe" secondAttribute="trailing" constant="8" id="wVf-yd-ado"/>
<constraint firstItem="iCY-t9-oeZ" firstAttribute="leading" secondItem="8Ga-eZ-C09" secondAttribute="trailing" constant="26" id="wef-ij-AGL"/>
<constraint firstAttribute="bottom" secondItem="iIr-bn-6Cs" secondAttribute="bottom" constant="8" id="zjJ-zV-2cl"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ajs-cQ-mp9">
<rect key="frame" x="158" y="130" width="165" height="39"/>
<constraints>
<constraint firstAttribute="width" constant="216" id="9Dj-0z-J1R"/>
<constraint firstAttribute="height" constant="39" id="XeW-Ie-n9B"/>
<constraint firstAttribute="width" constant="165" id="huc-TR-wCR"/>
<constraint firstAttribute="height" constant="44" id="rfY-Fy-ksn"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
<state key="normal" title="查看物流" backgroundImage="logistics_btn">
<color key="titleColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
</state>
<variation key="default">
<mask key="constraints">
<exclude reference="rfY-Fy-ksn"/>
<exclude reference="9Dj-0z-J1R"/>
</mask>
</variation>
</button>
</subviews>
<constraints>
<constraint firstItem="ajs-cQ-mp9" firstAttribute="trailing" secondItem="9AG-22-NSU" secondAttribute="trailingMargin" id="5PN-aI-Cwb"/>
<constraint firstItem="14H-w4-6eU" firstAttribute="leading" secondItem="9AG-22-NSU" secondAttribute="leading" constant="8" id="ATt-aM-dhx"/>
<constraint firstAttribute="trailing" secondItem="14H-w4-6eU" secondAttribute="trailing" constant="8" id="FrD-rR-4rz"/>
<constraint firstItem="jog-1Q-NME" firstAttribute="leading" secondItem="1Q9-Yb-5Zd" secondAttribute="trailing" constant="15" id="KGG-PA-nsE"/>
<constraint firstItem="7at-Z4-fCe" firstAttribute="top" secondItem="9AG-22-NSU" secondAttribute="top" id="KsX-db-ok5"/>
<constraint firstAttribute="bottom" secondItem="7at-Z4-fCe" secondAttribute="bottom" id="Nmp-Jf-G7O"/>
<constraint firstItem="7nV-AP-ciI" firstAttribute="top" secondItem="jog-1Q-NME" secondAttribute="bottom" constant="8" id="Qa1-la-Dha"/>
<constraint firstAttribute="trailing" secondItem="7at-Z4-fCe" secondAttribute="trailing" id="Sn2-4c-1gK"/>
<constraint firstItem="7Ck-1t-J8c" firstAttribute="leading" secondItem="7nV-AP-ciI" secondAttribute="trailing" constant="13" id="Tdn-jT-JpB"/>
<constraint firstItem="7at-Z4-fCe" firstAttribute="leading" secondItem="9AG-22-NSU" secondAttribute="leading" id="VNt-rr-aff"/>
<constraint firstItem="ajs-cQ-mp9" firstAttribute="bottom" secondItem="9AG-22-NSU" secondAttribute="bottomMargin" id="W4P-fl-kHN"/>
<constraint firstAttribute="trailing" secondItem="7at-Z4-fCe" secondAttribute="trailing" id="WS8-Q0-IlQ"/>
<constraint firstItem="1Q9-Yb-5Zd" firstAttribute="leading" secondItem="9AG-22-NSU" secondAttribute="leadingMargin" id="XaH-5j-98w"/>
<constraint firstItem="jog-1Q-NME" firstAttribute="centerY" secondItem="1Q9-Yb-5Zd" secondAttribute="centerY" id="aFC-UC-b8f"/>
<constraint firstItem="NKY-p0-eZH" firstAttribute="leading" secondItem="9AG-22-NSU" secondAttribute="leading" id="bJS-cQ-820"/>
<constraint firstItem="7Ck-1t-J8c" firstAttribute="centerY" secondItem="7nV-AP-ciI" secondAttribute="centerY" id="cX8-GY-q8D"/>
<constraint firstItem="7nV-AP-ciI" firstAttribute="leading" secondItem="1Q9-Yb-5Zd" secondAttribute="leading" id="dQ9-Mf-guJ"/>
<constraint firstItem="1Q9-Yb-5Zd" firstAttribute="top" secondItem="7at-Z4-fCe" secondAttribute="bottom" constant="8" id="eFG-Uz-aZZ"/>
<constraint firstItem="ajs-cQ-mp9" firstAttribute="top" secondItem="NKY-p0-eZH" secondAttribute="bottom" constant="8" id="erm-2A-lRW"/>
<constraint firstItem="J5p-Wx-HPf" firstAttribute="top" secondItem="9AG-22-NSU" secondAttribute="topMargin" id="gQj-Wb-5YI"/>
<constraint firstItem="J5p-Wx-HPf" firstAttribute="trailing" secondItem="9AG-22-NSU" secondAttribute="trailingMargin" id="hNT-zU-ioC"/>
<constraint firstItem="J5p-Wx-HPf" firstAttribute="centerY" secondItem="jog-1Q-NME" secondAttribute="centerY" id="ifw-k4-bBw"/>
<constraint firstAttribute="bottom" secondItem="NKY-p0-eZH" secondAttribute="bottom" constant="55" id="jQY-BD-lqh"/>
<constraint firstAttribute="trailing" secondItem="NKY-p0-eZH" secondAttribute="trailing" id="rfn-oK-ZJC"/>
<constraint firstItem="7at-Z4-fCe" firstAttribute="leading" secondItem="9AG-22-NSU" secondAttribute="leading" id="ruu-ft-eSI"/>
<constraint firstItem="14H-w4-6eU" firstAttribute="top" secondItem="7Ck-1t-J8c" secondAttribute="bottom" constant="6" id="v2d-HF-n08"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="VNt-rr-aff"/>
<exclude reference="Nmp-Jf-G7O"/>
<exclude reference="Sn2-4c-1gK"/>
<exclude reference="gQj-Wb-5YI"/>
</mask>
</variation>
</tableViewCellContentView>
<connections>
<outlet property="checkExpress" destination="ajs-cQ-mp9" id="k8g-tC-4fW"/>
<outlet property="labelState" destination="J5p-Wx-HPf" id="JJ8-KI-3gH"/>
</connections>
<point key="canvasLocation" x="149.5" y="349"/>
</tableViewCell>
</objects>
<resources>
<image name="logistics_btn" width="244" height="70"/>
</resources>
</document>
ALand/CodeClass/Home/View/Order/OrderTableViewCell.m
View file @ 8ed4b621
......@@ -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
View file @ 8ed4b621
......@@ -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
View file @ 8ed4b621
......@@ -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 {
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;
}
}
......
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