Commit 4b771a05 authored by 曹云霄's avatar 曹云霄

提现功能开发

parent 64176b2b
...@@ -212,8 +212,8 @@ ...@@ -212,8 +212,8 @@
}else if ([Name isEqualToString:@"场景库"]) }else if ([Name isEqualToString:@"场景库"])
{ {
selectedIndex = 5; selectedIndex = 6;
SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5]; SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
sceneVC.conditionModel.styleEquals = nil; sceneVC.conditionModel.styleEquals = nil;
sceneVC.conditionModel.spaceEquals = nil; sceneVC.conditionModel.spaceEquals = nil;
[sceneVC.StyleButton setTitle:@"风格" forState:UIControlStateNormal]; [sceneVC.StyleButton setTitle:@"风格" forState:UIControlStateNormal];
...@@ -222,8 +222,8 @@ ...@@ -222,8 +222,8 @@
}else if ([Name isEqualToString:@"产品库"]) }else if ([Name isEqualToString:@"产品库"])
{ {
selectedIndex = 4; selectedIndex = 5;
ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4]; ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
//默认加载全部数据 //默认加载全部数据
productVC.barcode = nil; productVC.barcode = nil;
productVC.selectedCode = nil; productVC.selectedCode = nil;
...@@ -237,12 +237,12 @@ ...@@ -237,12 +237,12 @@
[productVC.productCollectionView.mj_header beginRefreshing]; [productVC.productCollectionView.mj_header beginRefreshing];
}else if ([Name isEqualToString:@"客户管理"]) }else if ([Name isEqualToString:@"客户管理"])
{ {
selectedIndex = 3; selectedIndex = 4;
}else if ([Name isEqualToString:@"所有客户"]) }else if ([Name isEqualToString:@"所有客户"])
{ {
selectedIndex = 2; selectedIndex = 3;
AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:2]; AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:3];
AllcustomerVC.searchTextfield.text = nil; AllcustomerVC.searchTextfield.text = nil;
AllcustomerVC.conditionModel.resellerCodeEquals = nil; AllcustomerVC.conditionModel.resellerCodeEquals = nil;
AllcustomerVC.conditionModel.mobileEquals = nil; AllcustomerVC.conditionModel.mobileEquals = nil;
...@@ -252,8 +252,8 @@ ...@@ -252,8 +252,8 @@
[AllcustomerVC.allCustomerTableview.mj_header beginRefreshing]; [AllcustomerVC.allCustomerTableview.mj_header beginRefreshing];
}else if ([Name isEqualToString:@"客户订单"]) }else if ([Name isEqualToString:@"客户订单"])
{ {
selectedIndex = 1; selectedIndex = 2;
CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:1]; CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:2];
customerVC.searchCustomerOrder.text = nil; customerVC.searchCustomerOrder.text = nil;
[customerVC.StyleButton setTitle:@"全部订单" forState:UIControlStateNormal]; [customerVC.StyleButton setTitle:@"全部订单" forState:UIControlStateNormal];
customerVC.model.consumerNameOrMobileEquals = nil; customerVC.model.consumerNameOrMobileEquals = nil;
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
[customerVC.customerOrderTableView.mj_header beginRefreshing]; [customerVC.customerOrderTableView.mj_header beginRefreshing];
}else if ([Name isEqualToString:@"关于"]) }else if ([Name isEqualToString:@"关于"])
{ {
selectedIndex = 0; selectedIndex = 1;
} }
self.customtabbar.selectedIndex = selectedIndex; self.customtabbar.selectedIndex = selectedIndex;
} }
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSDictionary *dict = returnValue[@"data"]; NSDictionary *dict = returnValue[@"data"];
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"发现新版本,快去更新吧!" preferredStyle:UIAlertControllerStyleAlert]; UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:[NSString stringWithFormat:@"发现新版本%@,快去更新吧!",dict[@"version"]] preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { [alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:dict[@"url"]]]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:dict[@"url"]]];
}]]; }]];
......
//
// PaymentsDetailsTableViewController.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PaymentsDetailsTableViewController : UITableViewController
@end
//
// PaymentsDetailsTableViewController.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PaymentsDetailsTableViewController.h"
@interface PaymentsDetailsTableViewController ()
@end
@implementation PaymentsDetailsTableViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Uncomment the following line to preserve selection between presentations.
// self.clearsSelectionOnViewWillAppear = NO;
// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem;
}
//
//- (void)didReceiveMemoryWarning {
// [super didReceiveMemoryWarning];
// // Dispose of any resources that can be recreated.
//}
//
//#pragma mark - Table view data source
//
//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
//#warning Incomplete implementation, return the number of sections
// return 0;
//}
//
//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
//#warning Incomplete implementation, return the number of rows
// return 0;
//}
/*
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:<#@"reuseIdentifier"#> forIndexPath:indexPath];
// Configure the cell...
return cell;
}
*/
/*
// Override to support conditional editing of the table view.
- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
// Return NO if you do not want the specified item to be editable.
return YES;
}
*/
/*
// Override to support editing the table view.
- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
if (editingStyle == UITableViewCellEditingStyleDelete) {
// Delete the row from the data source
[tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
} else if (editingStyle == UITableViewCellEditingStyleInsert) {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
}
}
*/
/*
// Override to support rearranging the table view.
- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
}
*/
/*
// Override to support conditional rearranging of the table view.
- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
// Return NO if you do not want the item to be re-orderable.
return YES;
}
*/
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
//
// PaymentsTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PaymentsTableViewCell : UITableViewCell
@end
//
// PaymentsTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PaymentsTableViewCell.h"
@implementation PaymentsTableViewCell
- (void)awakeFromNib {
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// PaymentsViewController.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface PaymentsViewController : BaseViewController
@end
//
// PaymentsViewController.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PaymentsViewController.h"
#import "PaymentsTableViewCell.h"
#import "PaymentsDetailsTableViewController.h"
@interface PaymentsViewController ()<UITableViewDelegate,UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UITableView *paymentsTableView;
@end
@implementation PaymentsViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
}
#pragma mark - UI
- (void)uiConfigAction
{
}
#pragma mark - <UITableViewDataSource,UITableViewDelegate>
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
PaymentsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PaymentsTableViewCell" forIndexPath:indexPath];
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 10;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 70;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
PaymentsDetailsTableViewController *paymentsDetailsVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PaymentsDetailsTableViewController"];
[self.navigationController pushViewController:paymentsDetailsVC animated:YES];
}
@end
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
} }
else else
{ {
[weakSelf ErrorMBProgressView:@"暂无数据"]; [weakSelf ErrorMBProgressView:returnValue[@"message"]];
} }
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
......
//
// RebateViewController.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface RebateViewController : BaseViewController
@end
//
// RebateViewController.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "RebateViewController.h"
#import "PaymentsViewController.h"
#import "WithdrawalViewController.h"
@interface RebateViewController ()
/**
* 头像
*/
@property (weak, nonatomic) IBOutlet UIImageView *headerImageView;
/**
* 账户金额
*/
@property (weak, nonatomic) IBOutlet UILabel *currentAmountLabel;
/**
* 昨日收益
*/
@property (weak, nonatomic) IBOutlet UILabel *yesterdayAmountLabel;
/**
* 历史收益
*/
@property (weak, nonatomic) IBOutlet UILabel *historyAmountLabel;
/**
* 提现
*/
@property (weak, nonatomic) IBOutlet UIButton *withdrawalButton;
/**
* 收支明细,提现进度
*/
@property (weak, nonatomic) IBOutlet UIView *contentBackgroundView;
/**
* 当前的控制器
*/
@property (nonatomic,strong) BaseViewController *currentVC;
/**
* 指示条
*/
@property (weak, nonatomic) IBOutlet UIView *instructionsLinesView;
/**
* 收支明细
*/
@property (weak, nonatomic) IBOutlet UIButton *paymentsButton;
/**
* 提现进度
*/
@property (weak, nonatomic) IBOutlet UIButton *withdrawalProgressButton;
@end
@implementation RebateViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self setupChildViewController];
[self uiConfigAction];
}
#pragma mark - UI
- (void)uiConfigAction
{
[self setupInstructionsViewOrigin:self.paymentsButton];
[self.headerImageView sd_setImageWithURL:[NSURL URLWithString:[Shoppersmanager manager].Shoppers.employee.picture] placeholderImage:ReplaceImage];
}
#pragma mark - 设置收支明细、提现进度
- (void)setupChildViewController
{
PaymentsViewController *payments = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PaymentsViewController"];
[self addChildViewController:payments];
WithdrawalViewController *withdrawal = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"WithdrawalViewController"];
[self addChildViewController:withdrawal];
payments.view.frame = CGRectMake(0, 40, self.contentBackgroundView.mj_w, self.contentBackgroundView.mj_h-40);
withdrawal.view.frame = CGRectMake(0, 40, self.contentBackgroundView.mj_w, self.contentBackgroundView.mj_h-40);
[self.contentBackgroundView addSubview:payments.view];
self.currentVC = payments;
}
#pragma mark - 切换收支明细、提现进度
- (void)switchPaymentsVCAndWithdrawalVC:(BaseViewController *)newViewController
{
[self transitionFromViewController:self.currentVC toViewController:newViewController duration:0.5 options:UIViewAnimationOptionTransitionNone animations:nil completion:^(BOOL finished) {
if (finished) {
[self.contentBackgroundView addSubview:newViewController.view];
self.currentVC = newViewController;
}
}];
}
#pragma mark - 切换ContentController
- (IBAction)paymentsButtonAndWithdrawalButtonClick:(UIButton *)sender {
if ([sender isEqual:self.paymentsButton]) {
sender.selected = YES;
self.withdrawalButton.selected = NO;
}else
{
sender.selected = YES;
self.paymentsButton.selected = NO;
}
[self setupInstructionsViewOrigin:sender];
[self switchPaymentsVCAndWithdrawalVC:self.childViewControllers[sender.tag-100]];
}
#pragma mark - 设置指示线的位置
- (void)setupInstructionsViewOrigin:(UIButton *)sender
{
[UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{
self.instructionsLinesView.frame = CGRectMake(sender.mj_origin.x+(sender.mj_w-self.instructionsLinesView.mj_w)/2, self.instructionsLinesView.mj_origin.y, self.instructionsLinesView.mj_w, 2);
} completion:nil];
}
@end
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#pragma mark -布局 #pragma mark -布局
- (void)uiConfigAction - (void)uiConfigAction
{ {
self.view.backgroundColor = [UIColor whiteColor];
self.rightTableview = [[UITableView alloc]initWithFrame:CGRectMake(0, 100, RightWidth, ScreenHeight-100) style:UITableViewStylePlain]; self.rightTableview = [[UITableView alloc]initWithFrame:CGRectMake(0, 100, RightWidth, ScreenHeight-100) style:UITableViewStylePlain];
self.rightTableview.delegate = self; self.rightTableview.delegate = self;
self.rightTableview.dataSource = self; self.rightTableview.dataSource = self;
...@@ -164,7 +165,6 @@ ...@@ -164,7 +165,6 @@
- (void)recoveryCell - (void)recoveryCell
{ {
if ([self.dataArray containsObject:@"所有客户"] && [self.dataArray containsObject:@"客户订单"]) { if ([self.dataArray containsObject:@"所有客户"] && [self.dataArray containsObject:@"客户订单"]) {
self.isOpen = NO; self.isOpen = NO;
[self.dataArray removeObject:@"所有客户"]; [self.dataArray removeObject:@"所有客户"];
[self.dataArray removeObject:@"客户订单"]; [self.dataArray removeObject:@"客户订单"];
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#import "BaseViewController.h" #import "BaseViewController.h"
#import "QRViewController.h" #import "QRViewController.h"
#import "ExperienceCentreViewController.h" #import "ExperienceCentreViewController.h"
#import "RebateViewController.h"
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
@interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate> @interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
...@@ -107,6 +108,8 @@ ...@@ -107,6 +108,8 @@
[self.tabBar addSubview:self.toolview]; [self.tabBar addSubview:self.toolview];
//显示体验中心 //显示体验中心
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:@"FollowHeartVC" object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:@"FollowHeartVC" object:nil];
//2016年08月26日15:52:28显示我的账户
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showMyAccountController:) name:@"ShowMyAccountVC" object:nil];
} }
...@@ -124,6 +127,8 @@ ...@@ -124,6 +127,8 @@
AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]]; AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]]; CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:9]]; AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:9]];
//2016年08月26日15:13:04新增返利
RebateViewController *rebateVC = [storyboard instantiateViewControllerWithIdentifier:@"RebateViewController"];
UINavigationController *searchNav = [[UINavigationController alloc]initWithRootViewController:searchVC]; UINavigationController *searchNav = [[UINavigationController alloc]initWithRootViewController:searchVC];
...@@ -135,11 +140,12 @@ ...@@ -135,11 +140,12 @@
UINavigationController *allcustomerNav = [[UINavigationController alloc]initWithRootViewController:allcustomerVC]; UINavigationController *allcustomerNav = [[UINavigationController alloc]initWithRootViewController:allcustomerVC];
UINavigationController *cutomerorderNav = [[UINavigationController alloc]initWithRootViewController:customerOrderVC]; UINavigationController *cutomerorderNav = [[UINavigationController alloc]initWithRootViewController:customerOrderVC];
UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC]; UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC];
UINavigationController *rebateNav = [[UINavigationController alloc]initWithRootViewController:rebateVC];
self.vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,clientNav,shoppingNav,searchNav, nil]; self.vcArray = [NSArray arrayWithObjects:rebateNav,aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,clientNav,shoppingNav,searchNav, nil];
self.viewControllers = self.vcArray; self.viewControllers = self.vcArray;
SHARED_APPDELEGATE.allControllerArray = [NSArray arrayWithObjects:aboutVC,customerOrderVC,allcustomerVC,customerVC,productVC,sceneVC,clientVC,shoppingVC,searchVC, nil]; SHARED_APPDELEGATE.allControllerArray = [NSArray arrayWithObjects:rebateVC,aboutVC,customerOrderVC,allcustomerVC,customerVC,productVC,sceneVC,clientVC,shoppingVC,searchVC, nil];
self.selectedIndex = 6; self.selectedIndex = 7;
} }
...@@ -188,7 +194,7 @@ ...@@ -188,7 +194,7 @@
//我的客户 //我的客户
case 102: case 102:
self.selectedIndex = 6; self.selectedIndex = 7;
break; break;
...@@ -210,7 +216,7 @@ ...@@ -210,7 +216,7 @@
}else }else
{ {
self.selectedIndex = 7; self.selectedIndex = 8;
} }
break; break;
...@@ -296,7 +302,7 @@ ...@@ -296,7 +302,7 @@
{ {
//返回根视图 //返回根视图
[[NSNotificationCenter defaultCenter] postNotificationName:POPROOTCONTROLLER object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:POPROOTCONTROLLER object:nil];
self.selectedIndex = 8; self.selectedIndex = 9;
return YES; return YES;
} }
...@@ -360,5 +366,11 @@ ...@@ -360,5 +366,11 @@
} }
} }
#pragma mark - 显示我的账户
- (void)showMyAccountController:(NSNotification *)sender
{
[self dismissViewControllerAnimated:NO completion:nil];
self.selectedIndex = 0;
}
@end @end
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view from its nib.
[self uiConfigAction]; [self uiConfigAction];
[self queryShoppersCommission];
} }
#pragma mark -UI #pragma mark -UI
...@@ -61,7 +59,7 @@ ...@@ -61,7 +59,7 @@
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHOPPERSCOMMISSION),[Shoppersmanager manager].Shoppers.employee.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHOPPERSCOMMISSION),[Shoppersmanager manager].Shoppers.employee.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
self.rebateLabe.text = [NSString stringWithFormat:@"¥%.2f",[returnValue[@"data"] floatValue]]; // self.rebateLabe.text = [NSString stringWithFormat:@"¥%.2f",[returnValue[@"data"] floatValue]];
} }
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) { } WithFailureBlock:^(id error) {
...@@ -72,7 +70,7 @@ ...@@ -72,7 +70,7 @@
#pragma mark -返利余额点击 #pragma mark -返利余额点击
- (void)rebateViewClickAction:(UITapGestureRecognizer *)tap - (void)rebateViewClickAction:(UITapGestureRecognizer *)tap
{ {
NSLog(@"点击"); [[NSNotificationCenter defaultCenter] postNotificationName:@"ShowMyAccountVC" object:nil];
} }
#pragma mark -用户头像点击 #pragma mark -用户头像点击
...@@ -339,14 +337,4 @@ ...@@ -339,14 +337,4 @@
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end @end
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UserViewController"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UserViewController">
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
<rect key="frame" x="20" y="175" width="220" height="40"/> <rect key="frame" x="20" y="175" width="220" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="¥-副本" id="7AA-eS-ui1"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="myaccount" id="7AA-eS-ui1">
<rect key="frame" x="46" y="5" width="30" height="30"/> <rect key="frame" x="59" y="8" width="25" height="25"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rhj-kj-q1f"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的账户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rhj-kj-q1f">
<rect key="frame" x="81" y="10" width="139" height="21"/> <rect key="frame" x="95" y="10" width="65" height="21"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.98431372549019602" green="0.32941176470588235" blue="0.12549019607843137" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.23137254900000001" green="0.52941176469999995" blue="0.75294117650000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </subviews>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<resources> <resources>
<image name="Lock-0" width="17" height="21"/> <image name="Lock-0" width="17" height="21"/>
<image name="User-Profile" width="17" height="17"/> <image name="User-Profile" width="17" height="17"/>
<image name="¥-副本" width="35" height="35"/> <image name="myaccount" width="15" height="16"/>
<image name="矢量智能对象" width="110" height="110"/> <image name="矢量智能对象" width="110" height="110"/>
</resources> </resources>
</document> </document>
//
// WithdrawalTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface WithdrawalTableViewCell : UITableViewCell
@end
//
// WithdrawalTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "WithdrawalTableViewCell.h"
@implementation WithdrawalTableViewCell
- (void)awakeFromNib {
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// WithdrawalViewController.h
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface WithdrawalViewController : BaseViewController
@end
//
// WithdrawalViewController.m
// Lighting
//
// Created by 曹云霄 on 16/8/26.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "WithdrawalViewController.h"
#import "WithdrawalTableViewCell.h"
@interface WithdrawalViewController ()
@property (weak, nonatomic) IBOutlet UITableView *withdrawalTableView;
@end
@implementation WithdrawalViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
}
#pragma mark - UI
- (void)uiConfigAction
{
}
#pragma mark - <UITableViewDataSource,UITableViewDelegate>
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
WithdrawalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"WithdrawalTableViewCell" forIndexPath:indexPath];
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 10;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 70;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
}
@end
This diff is collapsed.
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
@property (strong, nonatomic) UIWindow *window; @property (strong, nonatomic) UIWindow *window;
@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
/** /**
* 网络状态 * 网络状态
...@@ -68,9 +63,5 @@ ...@@ -68,9 +63,5 @@
*/ */
@property (nonatomic,strong) NSArray *productArray; @property (nonatomic,strong) NSArray *productArray;
- (void)saveContext;
- (NSURL *)applicationDocumentsDirectory;
- (NSUInteger)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window;
@end @end
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
return YES; return YES;
} }
- (NSUInteger)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window - (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window
{ {
//判断是否是横屏 //判断是否是横屏
if ( [[DeviceDirectionManager instance] isHorizontal]) { if ( [[DeviceDirectionManager instance] isHorizontal]) {
...@@ -168,10 +168,6 @@ int compare_version(const char *v1, const char *v2) ...@@ -168,10 +168,6 @@ int compare_version(const char *v1, const char *v2)
// 设置微博的AppKey、appSecret,分享url // 设置微博的AppKey、appSecret,分享url
[UMSocialSinaSSOHandler openNewSinaSSOWithAppKey:@"1111393286" secret:@"5d011c05122b5539ec9592372f944d3c" RedirectURL:@"http://sns.whalecloud.com/sina2/callback"]; [UMSocialSinaSSOHandler openNewSinaSSOWithAppKey:@"1111393286" secret:@"5d011c05122b5539ec9592372f944d3c" RedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
// // 设置QQAppId、appSecret,分享url
// [UMSocialQQHandler setQQWithAppId:@"AppId" appKey:@"appSecret" url:@"url链接"];
} }
...@@ -204,87 +200,8 @@ int compare_version(const char *v1, const char *v2) ...@@ -204,87 +200,8 @@ int compare_version(const char *v1, const char *v2)
- (void)applicationWillTerminate:(UIApplication *)application { - (void)applicationWillTerminate:(UIApplication *)application {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
// Saves changes in the application's managed object context before the application terminates. // Saves changes in the application's managed object context before the application terminates.
[self saveContext];
}
#pragma mark - Core Data stack
@synthesize managedObjectContext = _managedObjectContext;
@synthesize managedObjectModel = _managedObjectModel;
@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
- (NSURL *)applicationDocumentsDirectory {
// The directory the application uses to store the Core Data store file. This code uses a directory named "----------.Lighting" in the application's documents directory.
return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
} }
- (NSManagedObjectModel *)managedObjectModel {
// The managed object model for the application. It is a fatal error for the application not to be able to find and load its model.
if (_managedObjectModel != nil) {
return _managedObjectModel;
}
NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"Lighting" withExtension:@"momd"];
_managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
return _managedObjectModel;
}
- (NSPersistentStoreCoordinator *)persistentStoreCoordinator {
// The persistent store coordinator for the application. This implementation creates and returns a coordinator, having added the store for the application to it.
if (_persistentStoreCoordinator != nil) {
return _persistentStoreCoordinator;
}
// Create the coordinator and store
_persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Lighting.sqlite"];
NSError *error = nil;
NSString *failureReason = @"There was an error creating or loading the application's saved data.";
if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
// Report any error we got.
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
dict[NSLocalizedDescriptionKey] = @"Failed to initialize the application's saved data";
dict[NSLocalizedFailureReasonErrorKey] = failureReason;
dict[NSUnderlyingErrorKey] = error;
error = [NSError errorWithDomain:@"YOUR_ERROR_DOMAIN" code:9999 userInfo:dict];
// Replace this with code to handle the error appropriately.
// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
abort();
}
return _persistentStoreCoordinator;
}
- (NSManagedObjectContext *)managedObjectContext {
// Returns the managed object context for the application (which is already bound to the persistent store coordinator for the application.)
if (_managedObjectContext != nil) {
return _managedObjectContext;
}
NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
if (!coordinator) {
return nil;
}
_managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
[_managedObjectContext setPersistentStoreCoordinator:coordinator];
return _managedObjectContext;
}
#pragma mark - Core Data Saving support
- (void)saveContext {
NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
if (managedObjectContext != nil) {
NSError *error = nil;
if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
// Replace this implementation with code to handle the error appropriately.
// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
abort();
}
}
}
@end @end
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
......
{
"images" : [
{
"idiom" : "universal",
"filename" : "data.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "data@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "dial.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "dial@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "line.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "line@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "search.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "search@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "圆角矩形-3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "圆角矩形-3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "当前.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "当前@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "矢量智能对象.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "矢量智能对象@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "10-副本-3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10-副本-3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "Trash.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Trash@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "View.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "View@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "View1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "View1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "ablum-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ablum-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "已完成.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已完成@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "已撤销.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已撤销@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "已退货.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "已退货@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "视角3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "视角3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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