Skip to content

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

修改项说明：申请兑换奖品开发

parent 871db568
Hide whitespace changes
Inline Side-by-side
Showing with 1056 additions and 104 deletions
Class/ApplyPrizeViewController.h 0 → 100644
View file @ e171a48c
//
// ApplyPrizeViewController.h
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface ApplyPrizeViewController : BaseViewController
@property (weak, nonatomic) IBOutlet UIScrollView *exchangeScrollView;
@property (weak, nonatomic) IBOutlet UITextField *consigneeTextField;
@property (weak, nonatomic) IBOutlet UITextField *mobileTextField;
@property (weak, nonatomic) IBOutlet UITextField *addressTextField;
@property (weak, nonatomic) IBOutlet UITextField *addressDetailsTextField;
@end
Class/ApplyPrizeViewController.m 0 → 100644
View file @ e171a48c
//
// ApplyPrizeViewController.m
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ApplyPrizeViewController.h"
#import "ModifyShippingAddressView.h"
@interface ApplyPrizeViewController ()<CityselectedDelegate,UITextFieldDelegate>
/**
* 城市选择器
*/
@property (nonatomic,strong) ModifyShippingAddressView *citySelecteview;
@end
@implementation ApplyPrizeViewController
#pragma mark -取消弹出的圆角
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
self.view.superview.layer.cornerRadius = 0;
}
- (void)viewDidLoad {
[super viewDidLoad];
[self setUpTextFieldAction];
}
#pragma mark - 设置UITextField
- (void)setUpTextFieldAction
{
UIView *leftView1 = [[UIView alloc]init];
leftView1.frame = CGRectMake(0, 0, 10, 1);
self.consigneeTextField.leftView = leftView1;
self.consigneeTextField.leftViewMode = UITextFieldViewModeAlways;
UIView *leftView2 = [[UIView alloc]init];
leftView2.frame = CGRectMake(0, 0, 10, 1);
self.mobileTextField.leftView = leftView2;
self.mobileTextField.leftViewMode = UITextFieldViewModeAlways;
UIView *leftView3 = [[UIView alloc]init];
leftView3.frame = CGRectMake(0, 0, 10, 1);
self.addressTextField.leftView = leftView3;
self.addressTextField.leftViewMode = UITextFieldViewModeAlways;
UIView *rightView = [[UIView alloc]initWithFrame:CGRectMake(self.addressDetailsTextField.width-20, 0, 20, self.addressDetailsTextField.height)];
UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 10, 15, 10)];
imageView.image = TCImage(@"down_arr");
[rightView addSubview:imageView];
self.addressTextField.rightView = rightView;
self.addressTextField.rightViewMode = UITextFieldViewModeAlways;
UIView *leftView4 = [[UIView alloc]init];
leftView4.frame = CGRectMake(0, 0, 10, 1);
self.addressDetailsTextField.leftView = leftView4;
self.addressDetailsTextField.leftViewMode = UITextFieldViewModeAlways;
}
#pragma mark - <UITextFieldDelegate>
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
{
if ([textField isEqual:self.addressTextField]) {
[self selectedCityClickAction];
return NO;
}
return YES;
}
#pragma mark -城市选择器
- (void)selectedCityClickAction
{
self.citySelecteview.frame = CGRectMake(0, self.view.frame.size.height, self.view.frame.size.width, 160);
[self.view addSubview:self.citySelecteview];
self.citySelecteview.delegate = self;
[self.citySelecteview.selectedCityButton addTarget:self action:@selector(completeButton) forControlEvents:UIControlEventTouchUpInside];
[UIView animateWithDuration:0.2 animations:^{
self.citySelecteview.frame = CGRectMake(0, self.view.frame.size.height-160, self.view.frame.size.width, 160);
}completion:^(BOOL finished) {
}];
}
#pragma mark -完成按钮点击
- (void)completeButton
{
[UIView animateWithDuration:0.2 animations:^{
self.citySelecteview.frame = CGRectMake(0, ScreenHeight, self.view.frame.size.width, 160);
}completion:^(BOOL finished) {
[self.citySelecteview removeFromSuperview];
self.citySelecteview = nil;
}];
}
#pragma mark - 取消
- (IBAction)cancelButtonClickAction:(UIButton *)sender {
[self dismissViewControllerAnimated:YES completion:nil];
}
#pragma mark - 提交
- (IBAction)submitButtonClickAction:(UIButton *)sender {
}
#pragma mark - lazy
/**
* 城市选择View
*
* @return ModifyShippingAddressView
*/
- (ModifyShippingAddressView *)citySelecteview
{
if (_citySelecteview == nil) {
_citySelecteview = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
owner:self options:nil] lastObject];
}
return _citySelecteview;
}
@end
Class/ApplyPrizeViewController.xib 0 → 100644
View file @ e171a48c
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ApplyPrizeViewController">
<connections>
<outlet property="addressDetailsTextField" destination="8m1-Qu-OSF" id="oZO-r9-yVx"/>
<outlet property="addressTextField" destination="vKD-Yw-bIN" id="XnD-o0-iQa"/>
<outlet property="consigneeTextField" destination="K2I-Hc-a9L" id="xIj-Nm-g8u"/>
<outlet property="exchangeScrollView" destination="KzL-Tc-cv5" id="vQV-jA-LBS"/>
<outlet property="mobileTextField" destination="Skz-R9-9h7" id="dHE-IW-uhS"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="376" height="400"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="QwZ-C7-zlx">
<frame key="frameInset" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="兑换礼品:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DEM-JV-bdq">
<frame key="frameInset" minX="19" minY="77" width="66" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="peG-Ik-Seq">
<frame key="frameInset" minX="19" minY="143" width="66" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="申请兑换" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KMQ-Qz-GfT">
<frame key="frameInset" minX="16" minY="12" width="77" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="KzL-Tc-cv5">
<frame key="frameInset" minX="87" minY="52" height="71" maxX="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</scrollView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="K2I-Hc-a9L">
<frame key="frameInset" minX="93" minY="138" height="30" maxX="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="pAJ-Xh-GtR"/>
</connections>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yiU-pj-dA2">
<frame key="frameInset" minX="19" minY="188" width="66" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="Skz-R9-9h7">
<frame key="frameInset" minX="93" minY="183" height="30" maxX="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="Gw6-GV-rXo"/>
</connections>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="地址选址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="olb-Md-I9g">
<frame key="frameInset" minX="19" minY="233" width="66" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="vKD-Yw-bIN">
<frame key="frameInset" minX="93" minY="228" height="30" maxX="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="CAh-ZE-xbT"/>
</connections>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NP3-Lz-Htq">
<frame key="frameInset" minX="19" minY="278" width="66" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="8m1-Qu-OSF">
<frame key="frameInset" minX="93" minY="273" height="30" maxX="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="a1T-85-GwQ"/>
</connections>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="76b-hj-DSH">
<frame key="frameInset" minX="46" width="112" height="35" maxY="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<state key="normal" title="取消">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="cancelButtonClickAction:" destination="-1" eventType="touchUpInside" id="YRZ-j3-cZS"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="pMX-eO-SeV">
<frame key="frameInset" width="112" height="35" maxX="47" maxY="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<state key="normal" title="提交">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitButtonClickAction:" destination="-1" eventType="touchUpInside" id="d1g-Eb-x2b"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="-201" y="-177.5"/>
</view>
</objects>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document>
Class/GuideIntegralViewController.m
View file @ e171a48c
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "GuideIntegralViewController.h" #import "GuideIntegralViewController.h"
#import "IntegralDetailsViewController.h" #import "IntegralDetailsViewController.h"
#import "PrizeMainViewController.h"
@interface GuideIntegralViewController () @interface GuideIntegralViewController ()
...@@ -29,11 +30,11 @@ ...@@ -29,11 +30,11 @@
self.yearIntegralLabel.text = [NSString stringWithFormat:@"%ld",scoreModel.annualRanking]; self.yearIntegralLabel.text = [NSString stringWithFormat:@"%ld",scoreModel.annualRanking];
} }
#pragma mark - 添加积分明细、导购头像 #pragma mark - 添加积分明细、导购头像
- (void)addChildViewController - (void)addChildViewController
{ {
IntegralDetailsViewController *integralDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"]; IntegralDetailsViewController *integralDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"];
integralDetails.cellType = intrgralTableView;
[self addChildViewController:integralDetails]; [self addChildViewController:integralDetails];
integralDetails.view.frame = CGRectMake(0, 50, self.integralDetailsView.mj_w, self.integralDetailsView.mj_h-50); integralDetails.view.frame = CGRectMake(0, 50, self.integralDetailsView.mj_w, self.integralDetailsView.mj_h-50);
[self.integralDetailsView addSubview:integralDetails.view]; [self.integralDetailsView addSubview:integralDetails.view];
...@@ -45,10 +46,11 @@ ...@@ -45,10 +46,11 @@
}]; }];
} }
#pragma mark - 礼品兑换 #pragma mark - 礼品兑换
- (IBAction)exchangeButtonClick:(UIButton *)sender { - (IBAction)exchangeButtonClick:(UIButton *)sender {
PrizeMainViewController *prizeMainVC = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeMainViewController"];
[self.navigationController pushViewController:prizeMainVC animated:YES];
} }
......
Class/IntegralDetailsViewController.m
View file @ e171a48c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import "IntegralDetailsTableViewCell.h" #import "IntegralDetailsTableViewCell.h"
#import "prizeDetailsTableViewCell.h" #import "prizeDetailsTableViewCell.h"
@interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource> @interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/** /**
数据源 数据源
*/ */
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
- (void)uiConfigAction - (void)uiConfigAction
{ {
self.integralDetailsTableView.rowHeight = 70; self.integralDetailsTableView.rowHeight = 70;
self.integralDetailsTableView.tableFooterView = [UIView new];
if (self.cellType == prizeTableView) {
self.integralDetailsTableView.frame = CGRectMake(0, 64, ScreenWidth, ScreenHeight-64);
}
} }
#pragma mark - 设置刷新 #pragma mark - 设置刷新
...@@ -100,6 +104,8 @@ ...@@ -100,6 +104,8 @@
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView]; [weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil]; RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds]; [weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds];
...@@ -125,7 +131,35 @@ ...@@ -125,7 +131,35 @@
#pragma mark - 查询兑奖明细 #pragma mark - 查询兑奖明细
- (void)queryPrizeDetails:(BOOL)isRemove - (void)queryPrizeDetails:(BOOL)isRemove
{ {
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(ALLEXCHANGERECORD),[Shoppersmanager manager].Shoppers.employee.fid];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds];
if (weakSelf.returnIntegralDetailsBlock) {
weakSelf.returnIntegralDetailsBlock(integralDatas);
}
}else {
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
[weakSelf.integralDetailsTableView reloadData];
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
} }
#pragma mark - <UITableViewDataSource,UITableViewDelegate> #pragma mark - <UITableViewDataSource,UITableViewDelegate>
...@@ -146,7 +180,21 @@ ...@@ -146,7 +180,21 @@
} }
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据~" attributes:nil];
}
#pragma mark - lazy #pragma mark - lazy
......
Class/PrizeListCollectionViewCell.h 0 → 100644
View file @ e171a48c
//
// PrizeListCollectionViewCell.h
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PrizeListCollectionViewCell : UICollectionViewCell
/**
奖品图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *prizeImageView;
/**
奖品描述
*/
@property (weak, nonatomic) IBOutlet UILabel *prizeDescribeLabel;
/**
勾选框
*/
@property (weak, nonatomic) IBOutlet UIButton *isSelectButton;
/**
奖品数据
*/
@property (nonatomic,strong) TOPrizeEntity *prizeModel;
@end
Class/PrizeListCollectionViewCell.m 0 → 100644
View file @ e171a48c
//
// PrizeListCollectionViewCell.m
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PrizeListCollectionViewCell.h"
@implementation PrizeListCollectionViewCell
- (void)setPrizeModel:(TOPrizeEntity *)prizeModel
{
_prizeModel = prizeModel;
[self.prizeImageView sd_setImageWithURL:[NSURL URLWithString:_prizeModel.picture] placeholderImage:REPLACEIMAGE];
self.prizeDescribeLabel.text = _prizeModel.name;
}
@end
Class/PrizeListModel.h 0 → 100644
View file @ e171a48c
//
// PrizeListModel.h
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface PrizeListModel : TOPrizeEntity
- (instancetype)initWithSuper:(TOPrizeEntity *)model;
@property (nonatomic,assign) BOOL isSelect;
@end
Class/PrizeListModel.m 0 → 100644
View file @ e171a48c
//
// PrizeListModel.m
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PrizeListModel.h"
@implementation PrizeListModel
- (instancetype)initWithSuper:(TOPrizeEntity *)model
{
if (self = [super init]) {
self.fid = model.fid;
self.picture = model.picture;
self.createName = model.createName;
self.createBy = model.createBy;
self.updateName = model.updateName;
self.updateBy = model.updateBy;
self.code = model.code;
self.name = model.name;
self.createDate = model.createDate;
self.updateDate = model.updateDate;
self.isSelect = NO;
}
return self;
}
@end
Class/PrizeMainViewController.h 0 → 100644
View file @ e171a48c
//
// PrizeMainViewController.h
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface PrizeMainViewController : BaseViewController
/**
兑奖记录
*/
@property (weak, nonatomic) IBOutlet UIButton *recordButton;
/**
申请兑奖
*/
@property (weak, nonatomic) IBOutlet UIButton *requestExchangeButton;
/**
奖品列表
*/
@property (weak, nonatomic) IBOutlet UICollectionView *prizeListCollectionView;
/**
FlowLayout
*/
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *prizeCollectionViewFlowLayout;
@end
Class/PrizeMainViewController.m 0 → 100644
View file @ e171a48c
//
// PrizeMainViewController.m
// Lighting
//
// Created by 曹云霄 on 2016/11/22.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PrizeMainViewController.h"
#import "PrizeListCollectionViewCell.h"
#import "PrizeListModel.h"
#import "ApplyPrizeViewController.h"
#import "IntegralDetailsViewController.h"
@interface PrizeMainViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
查询奖品列表
*/
@property (nonatomic,strong) PrizeCondition *queryPrizeModel;
/**
奖品数据源
*/
@property (nonatomic,strong) NSMutableArray *prizeDatasArray;
@end
@implementation PrizeMainViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self setUpCollectionView];
[self queryExchangeQualification];
[self setUpRefreshAction];
}
#pragma mark - UICollectionView
- (void)setUpCollectionView
{
self.prizeCollectionViewFlowLayout.itemSize = CGSizeMake((ScreenWidth-100)/4, (ScreenWidth-100)/4);
self.prizeCollectionViewFlowLayout.minimumLineSpacing = 20;
self.prizeCollectionViewFlowLayout.minimumInteritemSpacing = 20;
self.prizeCollectionViewFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
}
#pragma mark - 设置刷新
- (void)setUpRefreshAction
{
WS(weakSelf);
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
[weakSelf.prizeListCollectionView.mj_footer resetNoMoreData];
weakSelf.queryPrizeModel.page.page = ONE;
[weakSelf getPrizeListDatasAction:YES];
}];
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
[headerRefresh beginRefreshing];
self.prizeListCollectionView.mj_header = headerRefresh;
MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
}];
footer.automaticallyHidden = YES;
self.prizeListCollectionView.mj_footer = footer;
}
#pragma mark - 获取奖品列表
- (void)getPrizeListDatasAction:(BOOL)isRemove
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRIZELIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.queryPrizeModel WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
weakSelf.prizeListCollectionView.emptyDataSetSource = weakSelf;
weakSelf.prizeListCollectionView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) {
PrizeResponse *prizeResult = [[PrizeResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
for (TOPrizeEntity *prize in prizeResult.prizes) {
PrizeListModel *model = [[PrizeListModel alloc]initWithSuper:prize];
[weakSelf.prizeDatasArray addObject:model];
}
}else {
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
[weakSelf.prizeListCollectionView reloadData];
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 查询兑奖资格
- (void)queryExchangeQualification
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(EXCHANGEQUALIFICATION),[Shoppersmanager manager].Shoppers.employee.fid] WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
NSLog(@"%@",returnValue);
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - <UICollectionViewDelegate,UICollectionViewDataSource>
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return self.prizeDatasArray.count;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
PrizeListCollectionViewCell *prizeListCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"PrizeListCollectionViewCell" forIndexPath:indexPath];
prizeListCell.prizeModel = self.prizeDatasArray[indexPath.row];
return prizeListCell;
}
#pragma mark - 申请兑奖
- (IBAction)applyExchangeButton:(UIButton *)sender {
ApplyPrizeViewController *applyPrizeVC = [[ApplyPrizeViewController alloc]init];
applyPrizeVC.preferredContentSize = applyPrizeVC.view.mj_size;
applyPrizeVC.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = applyPrizeVC.popoverPresentationController;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
pop.sourceView = applyPrizeVC.view;
[self presentViewController:applyPrizeVC animated:YES completion:nil];
}
#pragma mark - 兑换记录
- (IBAction)exchangeRecordButton:(UIButton *)sender {
IntegralDetailsViewController *prizeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"];
prizeDetails.cellType = prizeTableView;
[self.navigationController pushViewController:prizeDetails animated:YES];
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据~" attributes:nil];
}
#pragma mark - lazy
- (NSMutableArray *)prizeDatasArray
{
if (!_prizeDatasArray) {
_prizeDatasArray = [NSMutableArray array];
}
return _prizeDatasArray;
}
- (PrizeCondition *)queryPrizeModel
{
if (!_queryPrizeModel) {
_queryPrizeModel = [[PrizeCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = ONE;
page.rows = KROWS;
_queryPrizeModel.page = page;
}
return _queryPrizeModel;
}
@end
Class/PromotionChooseViewController.m
View file @ e171a48c
...@@ -73,15 +73,18 @@ ...@@ -73,15 +73,18 @@
for (int i=0;i<weakSelf.customPromotionDatas.count;i++) { for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i]; CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type]) { if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type]) {
for (int i=0;i<weakSelf.customPromotionDatas.count;i++) { // for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i]; // CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i];
if ([model3.conflicts containsObject:model1.type]) { // if ([model3.conflicts containsObject:model2.type]) {
break; // break;
} // }
if (i == weakSelf.customPromotionDatas.count-1) { // if (i == weakSelf.customPromotionDatas.count-1) {
model1.isSelected = YES; // model2.isSelected = YES;
} // }
} // }
model1.isSelected = YES;
}else{
// model1.isSelected = NO;
} }
} }
}else { }else {
......
Class/Shoppingcart/AddressViewController.m
View file @ e171a48c
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"]; [weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) { } WithFailureBlock:^(id error) {
......
Class/Shoppingcart/AddressViewController.xib
View file @ e171a48c
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AddressViewController"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AddressViewController">
...@@ -27,122 +28,139 @@ ...@@ -27,122 +28,139 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lRq-bE-96S"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lRq-bE-96S">
<rect key="frame" x="0.0" y="0.0" width="315" height="320"/> <frame key="frameInset" width="315" height="320"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7wQ-Ul-DNp"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7wQ-Ul-DNp">
<rect key="frame" x="0.0" y="0.0" width="315" height="46"/> <frame key="frameInset" width="315" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="修改收货地址" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6yY-AC-w19"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="修改收货地址" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6yY-AC-w19">
<rect key="frame" x="24" y="13" width="150" height="21"/> <frame key="frameInset" minX="24" minY="13" width="150" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WZQ-AI-kTR"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WZQ-AI-kTR">
<rect key="frame" x="258" y="5" width="40" height="35"/> <frame key="frameInset" minX="258" minY="5" width="40" height="35"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/> <fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="关闭"> <state key="normal" title="关闭">
<color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state> </state>
<connections> <connections>
<action selector="turnoffAddressView:" destination="-1" eventType="touchUpInside" id="SYs-oq-Ahe"/> <action selector="turnoffAddressView:" destination="-1" eventType="touchUpInside" id="SYs-oq-Ahe"/>
</connections> </connections>
</button> </button>
</subviews> </subviews>
<color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Yb-LU-Kjn"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Yb-LU-Kjn">
<rect key="frame" x="28" y="78" width="50" height="21"/> <frame key="frameInset" minX="28" minY="78" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1Y-ze-xvQ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1Y-ze-xvQ">
<rect key="frame" x="28" y="123" width="50" height="21"/> <frame key="frameInset" minX="28" minY="123" width="50" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="地址选择：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6K-Vq-zSy"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="地址选择：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6K-Vq-zSy">
<rect key="frame" x="28" y="168" width="70" height="18"/> <frame key="frameInset" minX="28" minY="168" width="70" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZxP-Pp-hw9"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZxP-Pp-hw9">
<rect key="frame" x="28" y="212" width="65" height="21"/> <frame key="frameInset" minX="28" minY="212" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="51b-5f-c5c"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="51b-5f-c5c">
<rect key="frame" x="19" y="271" width="120" height="35"/> <frame key="frameInset" minX="19" minY="271" width="120" height="35"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="取消"> <state key="normal" title="取消">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state> </state>
<connections> <connections>
<action selector="cancelButtonClick:" destination="-1" eventType="touchUpInside" id="N17-5d-yqF"/> <action selector="cancelButtonClick:" destination="-1" eventType="touchUpInside" id="N17-5d-yqF"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EMy-g3-6JD"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EMy-g3-6JD">
<rect key="frame" x="176" y="271" width="120" height="35"/> <frame key="frameInset" minX="176" minY="271" width="120" height="35"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="新增"> <state key="normal" title="新增">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state> </state>
<connections> <connections>
<action selector="addAddressButtonClick:" destination="-1" eventType="touchUpInside" id="AJG-5a-ivS"/> <action selector="addAddressButtonClick:" destination="-1" eventType="touchUpInside" id="AJG-5a-ivS"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QSY-YC-rrl"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QSY-YC-rrl">
<rect key="frame" x="98" y="162" width="160" height="30"/> <frame key="frameInset" minX="98" minY="162" width="160" height="30"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="城市选择"> <state key="normal" title="城市选择">
<color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state> </state>
</button> </button>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UeJ-Cx-EfL"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UeJ-Cx-EfL">
<rect key="frame" x="98" y="73" width="160" height="30"/> <frame key="frameInset" minX="98" minY="73" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7St-jb-JzO"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7St-jb-JzO">
<rect key="frame" x="10" y="0.0" width="150" height="30"/> <frame key="frameInset" minX="10" width="150" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits"/>
</textField> </textField>
</subviews> </subviews>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MAm-bZ-TXn"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MAm-bZ-TXn">
<rect key="frame" x="98" y="119" width="160" height="30"/> <frame key="frameInset" minX="98" minY="119" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FVz-vp-Mlo"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FVz-vp-Mlo">
<rect key="frame" x="10" y="0.0" width="150" height="30"/> <frame key="frameInset" minX="10" width="150" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField> </textField>
</subviews> </subviews>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BvA-1X-IUc"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BvA-1X-IUc">
<rect key="frame" x="98" y="208" width="200" height="30"/> <frame key="frameInset" minX="98" minY="208" width="200" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5O3-uQ-Ccg"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5O3-uQ-Ccg">
<rect key="frame" x="10" y="0.0" width="190" height="30"/> <frame key="frameInset" minX="10" width="190" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits"/>
</textField> </textField>
</subviews> </subviews>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="291.5" y="261"/> <point key="canvasLocation" x="291.5" y="261"/>
</view> </view>
......
Class/Shoppingcart/GenerateOrdersViewController.m
View file @ e171a48c
...@@ -315,20 +315,14 @@ ...@@ -315,20 +315,14 @@
return nil; return nil;
} }
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{ {
return self.datasArray.count; return self.datasArray.count;
} }
#pragma mark -新增或者修改收货地址 #pragma mark -新增或者修改收货地址
- (void)CreateModifyShippingView:(AddressModel *)model Withindex:(NSInteger)cellindex - (void)CreateModifyShippingView:(AddressModel *)model Withindex:(NSInteger)cellindex
{ {
AddressViewController *address = [[AddressViewController alloc]init]; AddressViewController *address = [[AddressViewController alloc]init];
address.delegate = self; address.delegate = self;
if (model != nil) { if (model != nil) {
...@@ -345,9 +339,6 @@ ...@@ -345,9 +339,6 @@
[self presentViewController:address animated:YES completion:nil]; [self presentViewController:address animated:YES completion:nil];
} }
#pragma mark -生成订单 #pragma mark -生成订单
- (IBAction)CreateOrderButtonClick:(UIButton *)sender { - (IBAction)CreateOrderButtonClick:(UIButton *)sender {
......
Lighting.xcodeproj/project.pbxproj
View file @ e171a48c
...@@ -188,6 +188,11 @@ ...@@ -188,6 +188,11 @@
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; }; 29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; };
29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; }; 29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; };
29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */; }; 29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */; };
29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */; };
29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */; };
29E9444D1DE40D5F007CD26C /* PrizeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9444C1DE40D5F007CD26C /* PrizeListModel.m */; };
29E944521DE413D6007CD26C /* ApplyPrizeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */; };
29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */; };
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */; }; 29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */; };
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */; }; 29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */; };
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */; }; 29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */; };
...@@ -549,6 +554,15 @@ ...@@ -549,6 +554,15 @@
29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; }; 29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
29E9443B1DE3E0D0007CD26C /* prizeDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeDetailsTableViewCell.h; sourceTree = "<group>"; }; 29E9443B1DE3E0D0007CD26C /* prizeDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeDetailsTableViewCell.h; sourceTree = "<group>"; };
29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeDetailsTableViewCell.m; sourceTree = "<group>"; }; 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeDetailsTableViewCell.m; sourceTree = "<group>"; };
29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeMainViewController.h; sourceTree = "<group>"; };
29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeMainViewController.m; sourceTree = "<group>"; };
29E944441DE3EFFE007CD26C /* PrizeListCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeListCollectionViewCell.h; sourceTree = "<group>"; };
29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeListCollectionViewCell.m; sourceTree = "<group>"; };
29E9444B1DE40D5F007CD26C /* PrizeListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeListModel.h; sourceTree = "<group>"; };
29E9444C1DE40D5F007CD26C /* PrizeListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeListModel.m; sourceTree = "<group>"; };
29E9444F1DE413D6007CD26C /* ApplyPrizeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplyPrizeViewController.h; sourceTree = "<group>"; };
29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplyPrizeViewController.m; sourceTree = "<group>"; };
29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ApplyPrizeViewController.xib; sourceTree = "<group>"; };
29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillingInfoView.h; sourceTree = "<group>"; }; 29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillingInfoView.h; sourceTree = "<group>"; };
29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BillingInfoView.m; sourceTree = "<group>"; }; 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BillingInfoView.m; sourceTree = "<group>"; };
29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BillingInfoView.xib; sourceTree = "<group>"; }; 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BillingInfoView.xib; sourceTree = "<group>"; };
...@@ -1320,13 +1334,9 @@ ...@@ -1320,13 +1334,9 @@
29834EC11CDF768C001A484F /* XXuserController */ = { 29834EC11CDF768C001A484F /* XXuserController */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29834EC21CDF76C1001A484F /* UserViewController.h */, 29E9443E1DE3EBE9007CD26C /* GuideMain */,
29834EC31CDF76C1001A484F /* UserViewController.m */,
29834EC41CDF76C1001A484F /* UserViewController.xib */,
29EC33171CE023D5005F0C13 /* ChangePasswordViewController.h */,
29EC33181CE023D5005F0C13 /* ChangePasswordViewController.m */,
29EC33191CE023D5005F0C13 /* ChangePasswordViewController.xib */,
295DE5691DDC5DBD00E27725 /* GuideIntegral */, 295DE5691DDC5DBD00E27725 /* GuideIntegral */,
29E9443F1DE3EC03007CD26C /* Prize */,
29B3EE6E1DCE15EC0065FCCF /* MyLuckyDraw */, 29B3EE6E1DCE15EC0065FCCF /* MyLuckyDraw */,
295DEAA01DB7562A006ED4A6 /* CardStock */, 295DEAA01DB7562A006ED4A6 /* CardStock */,
2916A73B1D70230600644C8C /* RebateVC */, 2916A73B1D70230600644C8C /* RebateVC */,
...@@ -1735,6 +1745,59 @@ ...@@ -1735,6 +1745,59 @@
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
29E9443E1DE3EBE9007CD26C /* GuideMain */ = {
isa = PBXGroup;
children = (
29834EC21CDF76C1001A484F /* UserViewController.h */,
29834EC31CDF76C1001A484F /* UserViewController.m */,
29834EC41CDF76C1001A484F /* UserViewController.xib */,
29EC33171CE023D5005F0C13 /* ChangePasswordViewController.h */,
29EC33181CE023D5005F0C13 /* ChangePasswordViewController.m */,
29EC33191CE023D5005F0C13 /* ChangePasswordViewController.xib */,
);
name = GuideMain;
sourceTree = "<group>";
};
29E9443F1DE3EC03007CD26C /* Prize */ = {
isa = PBXGroup;
children = (
29E9444E1DE4139D007CD26C /* Controllers */,
29E944471DE40D13007CD26C /* Models */,
29E944431DE3EFD4007CD26C /* Cells */,
);
name = Prize;
sourceTree = "<group>";
};
29E944431DE3EFD4007CD26C /* Cells */ = {
isa = PBXGroup;
children = (
29E944441DE3EFFE007CD26C /* PrizeListCollectionViewCell.h */,
29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */,
);
name = Cells;
sourceTree = "<group>";
};
29E944471DE40D13007CD26C /* Models */ = {
isa = PBXGroup;
children = (
29E9444B1DE40D5F007CD26C /* PrizeListModel.h */,
29E9444C1DE40D5F007CD26C /* PrizeListModel.m */,
);
name = Models;
sourceTree = "<group>";
};
29E9444E1DE4139D007CD26C /* Controllers */ = {
isa = PBXGroup;
children = (
29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */,
29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */,
29E9444F1DE413D6007CD26C /* ApplyPrizeViewController.h */,
29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */,
29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */,
);
name = Controllers;
sourceTree = "<group>";
};
29EAAE911CDC412100C4DBA2 /* controller */ = { 29EAAE911CDC412100C4DBA2 /* controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1969,6 +2032,7 @@ ...@@ -1969,6 +2032,7 @@
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */, 294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */, 29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */, 29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */,
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */, 29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */, 29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */, 29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
...@@ -2071,6 +2135,7 @@ ...@@ -2071,6 +2135,7 @@
292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */, 292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */,
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */, 29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */, 29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */,
29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */,
2921F3031DB5EBD600D6439B /* PromotionalDeductionModel.m in Sources */, 2921F3031DB5EBD600D6439B /* PromotionalDeductionModel.m in Sources */,
294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */, 294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */,
29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */, 29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */,
...@@ -2129,6 +2194,7 @@ ...@@ -2129,6 +2194,7 @@
29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */, 29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */,
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */, 29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */, 29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */, 2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */, 29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */,
2921F3001DB5E91A00D6439B /* NSDictionary+category.m in Sources */, 2921F3001DB5E91A00D6439B /* NSDictionary+category.m in Sources */,
...@@ -2143,6 +2209,7 @@ ...@@ -2143,6 +2209,7 @@
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */, 29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
29706DA61CD082990003C412 /* main.m in Sources */, 29706DA61CD082990003C412 /* main.m in Sources */,
2936F2961D017BBD007CA67C /* GoodsImageView.m in Sources */, 2936F2961D017BBD007CA67C /* GoodsImageView.m in Sources */,
29E9444D1DE40D5F007CD26C /* PrizeListModel.m in Sources */,
29498C541D050DFC004FA79B /* UIImagePickerController+SupportDirection.m in Sources */, 29498C541D050DFC004FA79B /* UIImagePickerController+SupportDirection.m in Sources */,
291D6A621CFFE212007891AE /* DataDictModel.m in Sources */, 291D6A621CFFE212007891AE /* DataDictModel.m in Sources */,
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */, 29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
...@@ -2183,6 +2250,7 @@ ...@@ -2183,6 +2250,7 @@
29D260F81CEEAF2D00A9787D /* FullScreenViewCell.m in Sources */, 29D260F81CEEAF2D00A9787D /* FullScreenViewCell.m in Sources */,
290887061CE58BC2000B7097 /* screeningButton.m in Sources */, 290887061CE58BC2000B7097 /* screeningButton.m in Sources */,
295DEAC21DB786B8006ED4A6 /* CardDontUseViewController.m in Sources */, 295DEAC21DB786B8006ED4A6 /* CardDontUseViewController.m in Sources */,
29E944521DE413D6007CD26C /* ApplyPrizeViewController.m in Sources */,
292AD2001DE309C1003EC56E /* IntegralDetailsViewController.m in Sources */, 292AD2001DE309C1003EC56E /* IntegralDetailsViewController.m in Sources */,
044708611CD7C1E800555827 /* MainSetViewController.m in Sources */, 044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */, 29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
......
Lighting/GuideIntegral.storyboard
View file @ e171a48c
...@@ -14,22 +14,22 @@ ...@@ -14,22 +14,22 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" misplaced="YES" id="6Yy-Ao-XPR"> <view contentMode="scaleToFill" misplaced="YES" id="6Yy-Ao-XPR">
<frame key="frameInset" minX="23" minY="80" height="90" maxX="22.5"/> <frame key="frameInset" minX="23" minY="80" height="90" maxX="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="ehM-sk-qnE"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="ehM-sk-qnE">
<frame key="frameInset" minX="0.99%" minY="47.50%" width="70.5" height="70"/> <frame key="frameInset" minX="0.94%" minY="47.50%" width="70" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="当前积分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="W9n-sx-VVL"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="当前积分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="W9n-sx-VVL">
<frame key="frameInset" minX="11.19%" minY="31.25%" width="9.45%" height="18"/> <frame key="frameInset" minX="10.94%" minY="31.51%" width="9.71%" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="12233300" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="luv-aV-HGH"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="12233300" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="luv-aV-HGH">
<frame key="frameInset" minX="11.19%" minY="66.67%" width="13.95%" height="21"/> <frame key="frameInset" minX="10.94%" minY="65.94%" width="14.21%" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98039215690000003" green="0.32156862749999998" blue="0.050980392159999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.98039215690000003" green="0.32156862749999998" blue="0.050980392159999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -52,36 +52,36 @@ ...@@ -52,36 +52,36 @@
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" misplaced="YES" id="DFa-vp-e22"> <view contentMode="scaleToFill" misplaced="YES" id="DFa-vp-e22">
<frame key="frameInset" minX="25.59%" minY="50.00%" width="1.5" height="50"/> <frame key="frameInset" minX="25.58%" minY="50.00%" width="0.5" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<view contentMode="scaleToFill" misplaced="YES" id="wwz-7Q-A55"> <view contentMode="scaleToFill" misplaced="YES" id="wwz-7Q-A55">
<frame key="frameInset" minX="43.19%" minY="50.00%" width="1.5" height="50"/> <frame key="frameInset" minX="43.12%" minY="50.00%" width="0.5" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="13" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YJy-KV-6XP"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="13" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YJy-KV-6XP">
<frame key="frameInset" minX="46.14%" minY="66.67%" width="13.95%" height="21"/> <frame key="frameInset" minX="46.06%" minY="65.94%" width="14.06%" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="35" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Eh-Eu-GWV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="35" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Eh-Eu-GWV">
<frame key="frameInset" minX="28.72%" minY="66.67%" width="13.90%" height="21"/> <frame key="frameInset" minX="28.68%" minY="65.94%" width="13.91%" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zzy-VB-gpq"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zzy-VB-gpq">
<frame key="frameInset" minX="28.72%" minY="31.25%" width="9.40%" height="18"/> <frame key="frameInset" minX="28.68%" minY="31.51%" width="9.36%" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="年度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xbh-34-JR3"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="年度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xbh-34-JR3">
<frame key="frameInset" minX="46.14%" minY="31.25%" width="9.66%" height="18"/> <frame key="frameInset" minX="46.06%" minY="31.51%" width="9.77%" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</view> </view>
<view contentMode="scaleToFill" misplaced="YES" id="hU8-JL-KlR"> <view contentMode="scaleToFill" misplaced="YES" id="hU8-JL-KlR">
<frame key="frameInset" minX="23" minY="191" maxX="22.5" maxY="24.5"/> <frame key="frameInset" minX="23" minY="190.5" maxX="23" maxY="25"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="积分明细" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2Ip-ij-E17"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="积分明细" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2Ip-ij-E17">
...@@ -124,6 +124,112 @@ ...@@ -124,6 +124,112 @@
</objects> </objects>
<point key="canvasLocation" x="-177" y="-109"/> <point key="canvasLocation" x="-177" y="-109"/>
</scene> </scene>
<!--Prize Main View Controller-->
<scene sceneID="T9S-y5-eRx">
<objects>
<viewController storyboardIdentifier="PrizeMainViewController" id="Bn3-e5-Odb" customClass="PrizeMainViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="S8f-mf-Xs2">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" dataMode="prototypes" id="8mA-NF-xF3">
<frame key="frameInset" minY="127"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="BAY-Cu-eCc">
<size key="itemSize" width="125" height="94"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" misplaced="YES" reuseIdentifier="PrizeListCollectionViewCell" id="cvF-m8-EvS" customClass="PrizeListCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="125" height="94"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="125" height="94"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="00登录-谭" id="O88-Xc-mmd">
<frame key="frameInset" maxY="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="多功能抱枕" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3Qi-Hc-eV0">
<frame key="frameInset" minX="6" height="12" maxX="21" maxY="6"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="9"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="9kC-nV-7qm">
<frame key="frameInset" width="12" height="12" maxX="5" maxY="6"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<state key="normal" backgroundImage="box-副本"/>
<state key="selected" backgroundImage="bg"/>
</button>
</subviews>
</view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="isSelectButton" destination="9kC-nV-7qm" id="I0t-ZU-5cJ"/>
<outlet property="prizeDescribeLabel" destination="3Qi-Hc-eV0" id="578-Wv-Eok"/>
<outlet property="prizeImageView" destination="O88-Xc-mmd" id="7jW-I5-toi"/>
</connections>
</collectionViewCell>
</cells>
<connections>
<outlet property="dataSource" destination="Bn3-e5-Odb" id="QfO-Fa-U2a"/>
<outlet property="delegate" destination="Bn3-e5-Odb" id="zHj-Zn-6uc"/>
</connections>
</collectionView>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="ZKg-2M-z15">
<frame key="frameInset" minY="83" width="69.5" height="30" maxX="14.5"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="申请兑换">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="applyExchangeButton:" destination="Bn3-e5-Odb" eventType="touchUpInside" id="qXD-i3-FMJ"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="LuM-4O-5F2">
<frame key="frameInset" minY="83" width="70.5" height="30" maxX="120"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="兑换记录">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="exchangeRecordButton:" destination="Bn3-e5-Odb" eventType="touchUpInside" id="qBV-ed-OHv"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.96078431372549022" green="0.96470588235294119" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/>
</view>
<connections>
<outlet property="prizeCollectionViewFlowLayout" destination="BAY-Cu-eCc" id="jNa-tc-glp"/>
<outlet property="prizeListCollectionView" destination="8mA-NF-xF3" id="5BY-g2-w3G"/>
<outlet property="recordButton" destination="LuM-4O-5F2" id="E0v-qP-Umc"/>
<outlet property="requestExchangeButton" destination="ZKg-2M-z15" id="F2W-h1-F45"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="i1p-Kh-eEx" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="957" y="-109"/>
</scene>
<!--Integral Details View Controller--> <!--Integral Details View Controller-->
<scene sceneID="St0-Ph-Lj7"> <scene sceneID="St0-Ph-Lj7">
<objects> <objects>
...@@ -133,33 +239,33 @@ ...@@ -133,33 +239,33 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" id="qbR-St-FxM"> <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" id="qbR-St-FxM">
<frame key="frameInset" minY="-0.5" maxX="0.5" maxY="0.5"/> <frame key="frameInset" minX="-0.5" minY="-1.5" maxX="1.5" maxY="1.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="IntegralDetailsTableViewCell" rowHeight="70" id="dvh-wm-f5G" customClass="IntegralDetailsTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="IntegralDetailsTableViewCell" rowHeight="70" id="dvh-wm-f5G" customClass="IntegralDetailsTableViewCell">
<rect key="frame" x="0.0" y="28" width="1023.5" height="70"/> <rect key="frame" x="0.0" y="28" width="1023" height="70"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dvh-wm-f5G" id="UeK-sH-3z8"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dvh-wm-f5G" id="UeK-sH-3z8">
<frame key="frameInset" width="1023.5" height="69"/> <frame key="frameInset" width="1023" height="69"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="积分清零" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YDf-Lj-2uh"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="积分清零" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YDf-Lj-2uh">
<frame key="frameInset" minX="19" minY="30.21%" width="17.07%" height="21"/> <frame key="frameInset" minX="19" minY="29.17%" width="17.03%" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IZs-JW-Ffo"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IZs-JW-Ffo">
<frame key="frameInset" minX="19" minY="71.88%" width="17.07%" height="21"/> <frame key="frameInset" minX="19" minY="70.83%" width="17.03%" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/> <fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-200" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5dd-4T-RC4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-200" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5dd-4T-RC4">
<frame key="frameInset" minY="48.96%" width="111" height="21" maxX="19"/> <frame key="frameInset" minY="47.92%" width="111.5" height="21" maxX="19"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/> <nil key="textColor"/>
...@@ -174,14 +280,14 @@ ...@@ -174,14 +280,14 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="prizeDetailsTableViewCell" rowHeight="70" id="GX2-Gv-YRn" customClass="prizeDetailsTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="prizeDetailsTableViewCell" rowHeight="70" id="GX2-Gv-YRn" customClass="prizeDetailsTableViewCell">
<rect key="frame" x="0.0" y="98" width="1023.5" height="70"/> <rect key="frame" x="0.0" y="98" width="1023" height="70"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GX2-Gv-YRn" id="tQ9-m3-04b"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GX2-Gv-YRn" id="tQ9-m3-04b">
<frame key="frameInset" width="1023.5" height="69"/> <frame key="frameInset" width="1023" height="69"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ynF-nD-CoS"> <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ynF-nD-CoS">
<frame key="frameInset" minY="47.87%" width="64" height="22" maxX="11"/> <frame key="frameInset" minY="46.81%" width="64.5" height="22" maxX="11"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/> <fontDescription key="fontDescription" type="system" pointSize="11"/>
<inset key="titleEdgeInsets" minX="-19" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="titleEdgeInsets" minX="-19" minY="0.0" maxX="0.0" maxY="0.0"/>
...@@ -194,21 +300,21 @@ ...@@ -194,21 +300,21 @@
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2016年11月22日10:07:57" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AiS-xF-TBa"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2016年11月22日10:07:57" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AiS-xF-TBa">
<frame key="frameInset" minX="19" minY="30.21%" width="21.65%" height="21"/> <frame key="frameInset" minX="19" minY="29.17%" width="21.61%" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="兑换单号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WLA-Tz-XJu"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="兑换单号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WLA-Tz-XJu">
<frame key="frameInset" minX="19" minY="71.88%" width="54" height="21"/> <frame key="frameInset" minX="19" minY="71.13%" width="54" height="20.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/> <fontDescription key="fontDescription" type="system" pointSize="10"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="1234567898754" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fKt-d3-ydD"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="1234567898754" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fKt-d3-ydD">
<frame key="frameInset" minX="68" minY="71.88%" width="17.74%" height="21"/> <frame key="frameInset" minX="67.5" minY="71.13%" width="17.74%" height="20.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/> <fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
...@@ -241,6 +347,9 @@ ...@@ -241,6 +347,9 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="00登录-谭" width="1024" height="768"/>
<image name="bg" width="26" height="26"/>
<image name="box-副本" width="26" height="26"/>
<image name="right" width="8" height="13"/> <image name="right" width="8" height="13"/>
</resources> </resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedMetricsContainer key="defaultSimulatedMetrics">
......
Lighting/Images.xcassets/Brand Assets.launchimage/Contents.json
View file @ e171a48c
{ {
"images" : [ "images" : [
{ {
"orientation" : "landscape", "orientation" : "portrait",
"idiom" : "ipad", "idiom" : "ipad",
"minimum-system-version" : "7.0",
"extent" : "full-screen", "extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"orientation" : "landscape", "orientation" : "landscape",
"idiom" : "ipad", "idiom" : "ipad",
"minimum-system-version" : "7.0",
"extent" : "full-screen", "extent" : "full-screen",
"scale" : "2x" "minimum-system-version" : "7.0",
"scale" : "1x"
}, },
{ {
"orientation" : "portrait", "orientation" : "portrait",
"idiom" : "ipad", "idiom" : "ipad",
"minimum-system-version" : "7.0",
"extent" : "full-screen", "extent" : "full-screen",
"scale" : "1x" "minimum-system-version" : "7.0",
"scale" : "2x"
}, },
{ {
"orientation" : "portrait", "orientation" : "landscape",
"idiom" : "ipad", "idiom" : "ipad",
"minimum-system-version" : "7.0",
"extent" : "full-screen", "extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x" "scale" : "2x"
} }
], ],
......
Lighting/Images.xcassets/navi.imageset/Contents.json 0 → 100644
View file @ e171a48c
{
"images" : [
{
"idiom" : "universal",
"filename" : "navi.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "navi@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "navi@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Tools/CYConstManager.h
View file @ e171a48c
...@@ -287,6 +287,21 @@ extern NSString *const USEWECHATCARD; ...@@ -287,6 +287,21 @@ extern NSString *const USEWECHATCARD;
* 查询积分 * 查询积分
*/ */
extern NSString *const INTEGRALQUERY; extern NSString *const INTEGRALQUERY;
/**
* 奖品列表
*/
extern NSString *const PRIZELIST;
/**
* 所有的兑奖记录
*/
extern NSString *const ALLEXCHANGERECORD;
/**
* 是否有兑奖资格
*/
extern NSString *const EXCHANGEQUALIFICATION;
/*****************************************接口地址*****************************************/ /*****************************************接口地址*****************************************/
......
Tools/CYConstManager.m
View file @ e171a48c
...@@ -281,6 +281,21 @@ NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&o ...@@ -281,6 +281,21 @@ NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&o
* 查询积分 * 查询积分
*/ */
NSString *const INTEGRALQUERY = @"/score/details?employee=%@"; NSString *const INTEGRALQUERY = @"/score/details?employee=%@";
/**
* 奖品列表
*/
NSString *const PRIZELIST = @"/prize/query";
/**
* 所有的兑奖记录
*/
NSString *const ALLEXCHANGERECORD = @"/prizebill/all?employee=%@";
/**
* 是否有兑奖资格
*/
NSString *const EXCHANGEQUALIFICATION = @"/prizequalification?employee=%@";
/*****************************************接口地址*****************************************/ /*****************************************接口地址*****************************************/
......
Tools/PopoverViewController.h
View file @ e171a48c
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
/** /**
* 传入数据源 * 传入数据源
*/ */
@property (nonatomic,strong) NSMutableArray *datasArray; @property (nonatomic,strong) NSArray *datasArray;
/** /**
* 代理 * 代理
......
Tools/PrefixHeader.pch
View file @ e171a48c
...@@ -140,13 +140,13 @@ ...@@ -140,13 +140,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]
//** //**
// * 服务器正式地址 // * 服务器正式地址
......
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