Skip to content

O
Opple-iOS
Commit 69c93da5 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：修复提现进度状态显示异常

parent 8d966f48
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 89 deletions
Class/Login/LoginViewController.h
View file @ 69c93da5
......@@ -16,21 +16,16 @@
*/
@property (weak, nonatomic) IBOutlet UIView *userNameLoginView;
/**
* 账户名
*/
@property (weak, nonatomic) IBOutlet UITextField *userName;
/**
* 密码
*/
@property (weak, nonatomic) IBOutlet UITextField *passWord;
/**
* 忘记密码
*/
......@@ -41,13 +36,11 @@
*/
@property (weak, nonatomic) IBOutlet UIButton *loginButton;
/**
* 用户名背景View
*/
@property (weak, nonatomic) IBOutlet UIView *userNameBackview;
/**
* 密码背景View
*/
......
Class/RebateViewController.m
View file @ 69c93da5
......@@ -208,10 +208,10 @@ NSString *const redPackage = @"redPackage";
if (!self.resultEntity.bankCards.count) {
[self showUnboundedAlertView];
}
// if (!self.resultEntity.isUsable) {
// [self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
// return;
// }
if (!self.resultEntity.isUsable) {
[self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
return;
}
WS(weakSelf);
RebateDetailsViewController *rebateDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
rebateDetails.rebateAmount = (sender.tag == 100)?[self.resultEntity.accountTotal floatValue]:[self.resultEntity.redPackageAccountTotal floatValue];
......
Class/WithdrawalTableViewController.m
View file @ 69c93da5
......@@ -33,8 +33,8 @@
BOOL boolValue = [self.model.billStates isEqualToString:@"到账成功"];
self.progressImageView.image = boolValue?TCImage(@"finish"):TCImage(@"progress");
self.appleCompleteTimeLabel.hidden = !boolValue;
self.appleCompleteTimeLabel.textColor = [self setupLabelColor:self.model.billStates];
self.appleCompleteTimeLabel.text = self.model.updateDate;
self.appleCompleteTimeLabel.textColor = [BaseViewController setupLabelColor:self.model.billStates][@"color"];
self.appleCompleteTimeLabel.text = [BaseViewController setupLabelColor:self.model.billStates][@"text"];
self.submitApplyTimeLabel.text = self.model.createDate;
self.orderTimeLabel.text = self.model.createDate;
self.orderBillNumberLabel.text = self.model.billNumber;
......@@ -42,18 +42,6 @@
}
#pragma mark - 设置字体颜色
- (UIColor *)setupLabelColor:(NSString *)text
{
if ([text isEqualToString:@"到账成功"]) {
return RGB(89, 172, 220, 1);
}
if ([text isEqualToString:@"申请已提交"]) {
return RGB(128, 189, 51, 1);
}
return nil;
}
......
Class/WithdrawalViewController.m
View file @ 69c93da5
......@@ -132,8 +132,8 @@
TOApplyBillEntity *entity = self.resultArray[indexPath.row];
cell.amountLabel.text = [NSString stringWithFormat:@"%.2f",[entity.applyMoney floatValue]];
cell.createTimeLabel.text = entity.createDate;
cell.progressLabel.textColor = [self setupLabelColor:entity.billStates];
cell.progressLabel.text = entity.billStates;
cell.progressLabel.textColor = [[self class] setupLabelColor:entity.billStates][@"color"];
cell.progressLabel.text = [[self class] setupLabelColor:entity.billStates][@"text"];
return cell;
}
......@@ -155,18 +155,6 @@
[self.navigationController pushViewController:paymentsDetailsVC animated:YES];
}
#pragma mark - 设置字体颜色
- (UIColor *)setupLabelColor:(NSString *)text
{
if ([text isEqualToString:@"到账成功"]) {
return RGB(89, 172, 220, 1);
}
if ([text isEqualToString:@"申请已提交"]) {
return RGB(128, 189, 51, 1);
}
return nil;
}
#pragma mark - 释放
- (void)dealloc
{
......
Lighting/OppleMain.storyboard
View file @ 69c93da5
......@@ -196,7 +196,7 @@
<rect key="frame" x="0.0" y="28" width="984" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
<frame key="frameInset" width="984" height="99"/>
<frame key="frameInset" width="984" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="F66-vh-va3">
......@@ -559,10 +559,10 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="56" width="1024" height="84"/>
<rect key="frame" x="0.0" y="55.5" width="1000" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
<frame key="frameInset" width="1024" height="83"/>
<frame key="frameInset" width="1000" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGm-XJ-NyV">
......@@ -634,10 +634,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="140" width="1024" height="110"/>
<rect key="frame" x="0.0" y="139.5" width="1000" height="110"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
<frame key="frameInset" width="1024" height="109"/>
<frame key="frameInset" width="1000" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Zdg-s0-xfD">
......@@ -717,10 +717,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="84" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
<rect key="frame" x="0.0" y="250" width="1024" height="84"/>
<rect key="frame" x="0.0" y="249.5" width="1000" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
<frame key="frameInset" width="1024" height="83"/>
<frame key="frameInset" width="1000" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tiK-JC-Jy4">
......@@ -776,10 +776,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="334" width="1024" height="80"/>
<rect key="frame" x="0.0" y="333.5" width="1000" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
<frame key="frameInset" width="1024" height="79"/>
<frame key="frameInset" width="1000" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="6MS-gq-TMk">
......@@ -854,10 +854,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="414" width="1024" height="50"/>
<rect key="frame" x="0.0" y="413.5" width="1000" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
<frame key="frameInset" width="1024" height="49"/>
<frame key="frameInset" width="1000" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywx-T1-GlW">
......@@ -898,10 +898,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderDetailsSectionHeaderView" rowHeight="60" id="93R-pm-DiM" customClass="OrderDetailsSectionHeaderView">
<rect key="frame" x="0.0" y="464" width="1024" height="60"/>
<rect key="frame" x="0.0" y="463.5" width="1000" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="93R-pm-DiM" id="ps4-EA-igT">
<frame key="frameInset" width="1024" height="59"/>
<frame key="frameInset" width="1000" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7rk-Gz-d7W">
......@@ -933,10 +933,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="PromotionalTableViewCell" rowHeight="44" id="R0y-9Q-NEJ" customClass="PromotionalTableViewCell">
<rect key="frame" x="0.0" y="524" width="1024" height="44"/>
<rect key="frame" x="0.0" y="523.5" width="1000" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R0y-9Q-NEJ" id="tLA-TB-cwT">
<frame key="frameInset" width="824" height="43"/>
<frame key="frameInset" width="812" height="43.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="iOu-WG-fyV">
......@@ -1183,11 +1183,11 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="192" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="7fl-ag-O5b">
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
<rect key="frame" x="0.0" y="56" width="1024" height="182"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
<rect key="frame" x="0.0" y="55.5" width="1024" height="182"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<frame key="frameInset" width="1024" height="181"/>
<frame key="frameInset" width="1024" height="181.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Ip-ptr" userLabel="View1">
......@@ -1541,11 +1541,11 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ebs-7R-KfJ">
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EPc-Ii-VaY" id="e8t-Pc-QPv">
<frame key="frameInset" width="1024" height="99"/>
<frame key="frameInset" width="1024" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="S6q-gC-tBB">
......@@ -1696,7 +1696,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Oq-z4-T96" id="GEp-Hp-EdS">
<frame key="frameInset" width="1024" height="199"/>
<frame key="frameInset" width="1024" height="199.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXj-VY-jlJ">
......@@ -2039,7 +2039,7 @@
<rect key="frame" x="0.0" y="28" width="984" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
<frame key="frameInset" width="984" height="79"/>
<frame key="frameInset" width="984" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PkJ-eJ-ksY">
......@@ -2341,7 +2341,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="110"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
<frame key="frameInset" width="1024" height="109"/>
<frame key="frameInset" width="1024" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="qWT-p0-Gta">
......@@ -2424,7 +2424,7 @@
<rect key="frame" x="0.0" y="138" width="1024" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
<frame key="frameInset" width="1024" height="55"/>
<frame key="frameInset" width="1024" height="55.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="X0Z-8j-BdI">
......@@ -2498,7 +2498,7 @@
<rect key="frame" x="0.0" y="194" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
<frame key="frameInset" width="1024" height="69"/>
<frame key="frameInset" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m0f-EW-LM5">
......@@ -2547,7 +2547,7 @@
<rect key="frame" x="0.0" y="264" width="1024" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
<frame key="frameInset" width="1024" height="79"/>
<frame key="frameInset" width="1024" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Un4-g0-sG6">
......@@ -2625,7 +2625,7 @@
<rect key="frame" x="0.0" y="344" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
<frame key="frameInset" width="1024" height="49"/>
<frame key="frameInset" width="1024" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULe-0J-pCd">
......@@ -3449,11 +3449,11 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="LIf-UD-q9P">
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="X3v-Ll-1MC" customClass="NotDrawTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="X3v-Ll-1MC" customClass="NotDrawTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X3v-Ll-1MC" id="900-Pd-b1F">
<frame key="frameInset" width="1024" height="69"/>
<frame key="frameInset" width="1024" height="69.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="TMg-8t-PNg">
......@@ -3492,11 +3492,11 @@
<outlet property="orderNumberTitle" destination="TMg-8t-PNg" id="bad-iY-IGi"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" id="7NE-I0-E9m" customClass="UsedDrawTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" id="7NE-I0-E9m" customClass="UsedDrawTableViewCell">
<rect key="frame" x="0.0" y="98" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7NE-I0-E9m" id="6dy-h1-Du5">
<frame key="frameInset" width="1024" height="69"/>
<frame key="frameInset" width="1024" height="69.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="mCP-hd-n1N">
......@@ -3847,10 +3847,10 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PaymentsTableViewCell" rowHeight="70" id="ycT-hi-XMt" customClass="PaymentsTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<rect key="frame" x="0.0" y="28" width="1000" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ycT-hi-XMt" id="kgy-QA-YB7">
<frame key="frameInset" width="1024" height="69"/>
<frame key="frameInset" width="1000" height="69.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="IgV-UM-cUZ">
......@@ -3922,7 +3922,7 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="126"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hkV-sz-e6I" id="376-dL-SGZ">
<frame key="frameInset" width="1024" height="125"/>
<frame key="frameInset" width="1024" height="125.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="bj2-3f-d1N">
......@@ -3948,7 +3948,7 @@
<rect key="frame" x="0.0" y="126" width="1024" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="omi-89-fSM" id="kHX-8W-6YZ">
<frame key="frameInset" width="1024" height="149"/>
<frame key="frameInset" width="1024" height="149.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="WvF-Vp-w7I">
......@@ -4051,7 +4051,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jHf-PW-bB3" id="GzY-E9-F2n">
<frame key="frameInset" width="1024" height="69"/>
<frame key="frameInset" width="1024" height="69.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="Ssz-VZ-85R">
......@@ -4130,7 +4130,7 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="216"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Gh-Ht-hTc" id="uun-nY-hTG">
<frame key="frameInset" width="1024" height="215"/>
<frame key="frameInset" width="1024" height="215.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="progress" translatesAutoresizingMaskIntoConstraints="NO" id="mQZ-vP-Ej3">
......@@ -4148,9 +4148,7 @@
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s3d-4S-Hli">
<frame key="frameInset" minX="13.33%" minY="170" width="16.55%" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="啊大大" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s3d-4S-Hli">
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -4170,6 +4168,7 @@
</subviews>
<constraints>
<constraint firstItem="UIr-Jo-wn0" firstAttribute="centerX" secondItem="mQZ-vP-Ej3" secondAttribute="centerX" id="2Wb-Ef-cND"/>
<constraint firstItem="s3d-4S-Hli" firstAttribute="centerX" secondItem="smo-gx-5xx" secondAttribute="centerX" id="ExA-Hf-NlB"/>
<constraint firstItem="mQZ-vP-Ej3" firstAttribute="leading" secondItem="uun-nY-hTG" secondAttribute="leading" constant="300" id="LJB-hs-Oan"/>
<constraint firstItem="smo-gx-5xx" firstAttribute="centerY" secondItem="UIr-Jo-wn0" secondAttribute="centerY" id="MGO-lp-uT2"/>
<constraint firstItem="UIr-Jo-wn0" firstAttribute="centerY" secondItem="3Qj-uC-VHm" secondAttribute="centerY" id="QYC-2N-2rS"/>
......@@ -4179,6 +4178,7 @@
<constraint firstItem="mQZ-vP-Ej3" firstAttribute="centerY" secondItem="uun-nY-hTG" secondAttribute="centerY" id="iJI-W4-dS0"/>
<constraint firstAttribute="trailing" secondItem="mQZ-vP-Ej3" secondAttribute="trailing" constant="300" id="o0d-k8-fNq"/>
<constraint firstItem="smo-gx-5xx" firstAttribute="leading" secondItem="mQZ-vP-Ej3" secondAttribute="leading" constant="-20" id="pMR-cS-klx"/>
<constraint firstItem="s3d-4S-Hli" firstAttribute="top" secondItem="smo-gx-5xx" secondAttribute="bottom" constant="6" id="s1n-Xw-ZHn"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
......@@ -4186,7 +4186,7 @@
<rect key="frame" x="0.0" y="216" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odb-Qv-xvv" id="vVJ-L8-CP8">
<frame key="frameInset" width="1024" height="99"/>
<frame key="frameInset" width="1024" height="99.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="cQu-pj-zGP">
......@@ -5461,7 +5461,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="登录" translatesAutoresizingMaskIntoConstraints="NO" id="rGw-q9-ctQ">
<frame key="frameInset" minX="-3" minY="-4" maxX="4.5" maxY="1.5"/>
<frame key="frameInset" minX="-3" minY="-4" maxX="5" maxY="2"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
</subviews>
......@@ -5855,10 +5855,10 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="RightControlTableViewCell" rowHeight="60" id="0wm-zc-Jqc" customClass="RightControlTableViewCell">
<rect key="frame" x="0.0" y="56" width="200" height="60"/>
<rect key="frame" x="0.0" y="55.5" width="200" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0wm-zc-Jqc" id="p9s-UH-PIl">
<frame key="frameInset" width="200" height="59"/>
<frame key="frameInset" width="200" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="体验中心" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ima-L1-WqA">
......@@ -6099,7 +6099,7 @@
<rect key="frame" x="0.0" y="28" width="754" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="g2L-9g-KsS" id="XPi-Zc-aGh">
<frame key="frameInset" width="754" height="79"/>
<frame key="frameInset" width="754" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="34f-aR-0gw">
......@@ -6463,11 +6463,11 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="I31-IQ-4Pp">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
<rect key="frame" x="0.0" y="92" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5vC-JB-WSk" id="XVj-PN-Pxx">
<frame key="frameInset" width="1024" height="43"/>
<frame key="frameInset" width="1024" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
......@@ -6551,7 +6551,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oPa-eM-dSd" id="GU3-wN-YE4">
<frame key="frameInset" width="1024" height="43"/>
<frame key="frameInset" width="1024" height="43.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="D2u-XX-tUW">
......
Tools/BaseViewController.h
View file @ 69c93da5
......@@ -120,6 +120,17 @@
*/
+ (id)returnPrizeBillStateTitleColor:(NSString *)stateCode;
#pragma mark - 设置提现状态
/**
提现申请状态
@param text 状态码
@return 字体颜色、文本
*/
+ (NSDictionary *)setupLabelColor:(NSString *)text;
/**
考核题型转义
*/
......
Tools/BaseViewController.m
View file @ 69c93da5
......@@ -223,6 +223,29 @@
return dict;
}
#pragma mark - 设置提现状态
+ (NSDictionary *)setupLabelColor:(NSString *)text
{
UIColor *color = kMainBlueColor;
NSString *string;
if ([text isEqualToString:@"submit"]) {
color = RGB(128, 189, 51, 1);
string = @"已提交";
}else if ([text isEqualToString:@"paying"]) {
color = kMainBlueColor;
string = @"支付中";
}else if ([text isEqualToString:@"accomplished"]) {
color = kMainBlueColor;
string = @"已完成";
}else if ([text isEqualToString:@"failure"]) {
color = [UIColor redColor];
string = @"提现失败";
}
return @{@"text":string?string:text,@"color":color};
}
#pragma mark - 获取当前时间之前或者之后的时间（之前传入负数）
+ (NSString *)getTimeby:(NSInteger)day
{
......
Tools/PrefixHeader.pch
View file @ 69c93da5
......@@ -176,13 +176,13 @@
/**
* 服务器开发地址
*/
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/**
* 服务器测试地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//**
// * 服务器正式地址
......@@ -292,4 +292,6 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
#endif /* PrefixHeader_pch */
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