增加冻结金额

Lighting/Class/Login/LoginViewController.m

@@ -494,7 +494,7 @@
                 [[UIApplication sharedApplication] openURL:[NSURL URLWithString:dict[@"url"]]];
             }]];
             //是否强制更新
-            if (![dict[@"forceupdate"] isEqualToString:@"yes"]) {
+            if (![dict[@"forceupdate"] isEqualToString:@"1"]) {
                 [alertVC addAction:[UIAlertAction actionWithTitle:@"以后再说" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
                     [weakSelf dismissViewControllerAnimated:YES completion:nil];
                 }]];

Lighting/Class/PaymentsViewController.m

@@ -11,7 +11,7 @@
 #import "PaymentsDetailsTableViewController.h"
 
 
-@interface PaymentsViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface PaymentsViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
 @property (weak, nonatomic) IBOutlet UITableView *paymentsTableView;
 /**
@@ -63,7 +63,7 @@
     [self setupRefreshing];
 }
 
-- (void)viewWillAppear:(BOOL)animated
+- (void)viewDidAppear:(BOOL)animated
 {
     [self.paymentsTableView.mj_header beginRefreshing];
 }
@@ -80,9 +80,8 @@
     headerRefresh.stateLabel.hidden = YES;
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.paymentsTableView.mj_header = headerRefresh;
-    [self.paymentsTableView.mj_header beginRefreshing];
     
-    self.paymentsTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+    MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         if (++ weakSelf.model.page.page >= weakSelf.totalPage) {
             [weakSelf.paymentsTableView.mj_footer endRefreshingWithNoMoreData];
         }else
@@ -90,7 +89,8 @@
             [weakSelf getDatasAction:NO];
         }
     }];
-  
+    footer.automaticallyHidden = YES;
+    self.paymentsTableView.mj_footer = footer;
 }
 
 #pragma mark - 获取收支明细
@@ -99,6 +99,9 @@
     WS(weakSelf);
     [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PAYMENTS) WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
+        
+        weakSelf.paymentsTableView.emptyDataSetSource = self;
+        weakSelf.paymentsTableView.emptyDataSetDelegate = self;
         [weakSelf endRefreshingForTableView:weakSelf.paymentsTableView];
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
@@ -171,6 +174,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];
+}
 
 
 @end

Lighting/Class/RebateDetailsViewController.h

@@ -13,7 +13,7 @@
 /**
  *  最大提现金额
  */
-@property (nonatomic,copy) NSString *rebateAmount;
+@property (nonatomic,assign) CGFloat rebateAmount;
 
 /**
  *  查看此次申请详情

Lighting/Class/RebateDetailsViewController.m

@@ -29,7 +29,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.inputRebateTextField.placeholder = [NSString stringWithFormat:@"当前可提现:%.2f",[self.rebateAmount floatValue]];
+    self.inputRebateTextField.placeholder = [NSString stringWithFormat:@"当前可提现:%.2f",self.rebateAmount];
 }
 
 - (IBAction)rebateButtonClickAction:(UIButton *)sender {
@@ -38,7 +38,7 @@
     if (![self.inputRebateTextField.text length]) {
         [self SHOWPrompttext:@"请输入提现金额"];return;
     }
-    if ([self.inputRebateTextField.text floatValue] > [self.rebateAmount floatValue]) {
+    if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) {
         [self SHOWPrompttext:@"当前账户余额不足"];return;
     }
     if ([self.inputRebateTextField.text floatValue] <= 0) {
@@ -81,7 +81,6 @@
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {
             [weakSelf.navigationController popViewControllerAnimated:YES];
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"setupRefreshing" object:nil];
         }else if (indexPath.row == 0)
         {
             [weakSelf queryDetails];

Lighting/Class/RebateViewController.m

@@ -35,6 +35,11 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *historyAmountLabel;
 
+/**
+ *  冻结金额
+ */
+@property (weak, nonatomic) IBOutlet UILabel *freezeAmountLabel;
+
 /**
  *  提现
  */
@@ -75,7 +80,7 @@
 
 @implementation RebateViewController
 
-- (void)viewWillAppear:(BOOL)animated
+- (void)viewDidAppear:(BOOL)animated
 {
     [self getRebateDatasFromUser];
 }
@@ -157,6 +162,7 @@
              weakSelf.currentAmountLabel.text = [NSString stringWithFormat:@"%.2f",[returnValue[@"data"][@"accountTotal"] floatValue]];
              weakSelf.yesterdayAmountLabel.text = [NSString stringWithFormat:@"%.2f",[returnValue[@"data"][@"yesterdayEarnings"] floatValue]];
              weakSelf.historyAmountLabel.text = [NSString stringWithFormat:@"%.2f",[returnValue[@"data"][@"historyEarning"] floatValue]];
+            weakSelf.freezeAmountLabel.text = [NSString stringWithFormat:@"%.2f",[returnValue[@"data"][@"applytotal"] floatValue]];
         }else
         {
             [weakSelf SHOWPrompttext:returnValue[@"message"]];
@@ -177,7 +183,7 @@
     
     WS(weakSelf);
     RebateDetailsViewController *rebateDetails = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
-    rebateDetails.rebateAmount = [self.model.accountTotal stringValue];
+    rebateDetails.rebateAmount = [self.model.accountTotal floatValue]-[self.model.applytotal floatValue];
     [rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
         WithdrawalTableViewController *detailVC = [weakSelf.getStoryboardWithName instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
         detailVC.model = entity;
@@ -189,19 +195,4 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 @end

Lighting/Class/SceneLibraryViewController.m

@@ -83,19 +83,13 @@
     return _conditionModel;
 }
 
-
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
     [self uiConfigAction];
     [self getdatasAction];
-
 }
 
-
-
 #pragma mark -UI
 - (void)uiConfigAction
 {
@@ -125,8 +119,6 @@
     self.SpaceButton.layer.cornerRadius = 10;
     [self.backView addSubview:self.StyleButton];
     [self.backView addSubview:self.SpaceButton];
-    self.indexPage = 1;
-    
     
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{

Lighting/Class/WithdrawalViewController.m

@@ -10,7 +10,7 @@
 #import "WithdrawalTableViewCell.h"
 #import "WithdrawalTableViewController.h"
 
-@interface WithdrawalViewController ()
+@interface WithdrawalViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
 
 @property (weak, nonatomic) IBOutlet UITableView *withdrawalTableView;
 
@@ -59,14 +59,12 @@
     [super viewDidLoad];
     
     self.withdrawalTableView.tableFooterView = [UIView new];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshList) name:@"setupRefreshing" object:nil];
     [self setupRefreshing];
 }
 
-#pragma mark - 通知刷新
-- (void)refreshList
+- (void)viewDidAppear:(BOOL)animated
 {
-    [self.withdrawalTableView .mj_header beginRefreshing];
+    [self.withdrawalTableView.mj_header beginRefreshing];
 }
 
 #pragma mark - 设置刷新
@@ -81,9 +79,8 @@
     headerRefresh.stateLabel.hidden = YES;
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.withdrawalTableView.mj_header = headerRefresh;
-    [self.withdrawalTableView.mj_header beginRefreshing];
     
-    self.withdrawalTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+    MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         if (++ weakSelf.model.page.page >= weakSelf.totalPage) {
             [weakSelf.withdrawalTableView.mj_footer endRefreshingWithNoMoreData];
         }else
@@ -91,14 +88,19 @@
             [weakSelf getDatasAction:NO];
         }
     }];
+    footer.automaticallyHidden = YES;
+    self.withdrawalTableView.mj_footer = footer;
 }
 
-#pragma mark - 获取收支明细
+#pragma mark - 获取提现进度
 - (void)getDatasAction:(BOOL)isRemoveAll
 {
     WS(weakSelf);
     [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(WITHDRAWALPROGRESS) WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
+        
+        weakSelf.withdrawalTableView.emptyDataSetSource = self;
+        weakSelf.withdrawalTableView.emptyDataSetDelegate = self;
         [weakSelf endRefreshingForTableView:weakSelf.withdrawalTableView];
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
@@ -176,6 +178,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];
+}
 
 
 

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -1821,7 +1821,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;
@@ -1882,7 +1882,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;

Lighting/Lighting/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.0.7</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Lighting/Tools/PrefixHeader.pch

@@ -117,13 +117,13 @@
 /**
  *  服务器测试地址
  */
-#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]
 
 ///**
 // *  服务器正式地址
 // */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
-//
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
+
 /**
  *  搜索框输入通知
  */

Lighting/Tools/SceneViewController.m

@@ -292,21 +292,19 @@
     //上拉加载
     self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         
-        if (++ weakSelf.indexPage > weakSelf.totalPages) {
+        if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
             [weakSelf.sceneOrProductClollectionView.mj_footer endRefreshingWithNoMoreData];
             
         }else
         {
             //默认数据
             DataPage *Newpage = [[DataPage alloc]init];
-            Newpage.page = weakSelf.indexPage ++;
             Newpage.rows = KROWS;
             weakSelf.conditionModel.page = Newpage;
             [weakSelf getSceneLibrarydatas:weakSelf.conditionModel isRemove:NO];
         }
     }];
     self.sceneOrProductClollectionView.mj_footer.automaticallyHidden = YES;
-
 }
 
 
@@ -345,7 +343,6 @@
                     }
                 }
             }
-            
             [weakSelf.sceneOrProductClollectionView reloadData];
         }
         else
@@ -393,7 +390,6 @@
         {
             //分页数据
             DataPage *Newpage = [[DataPage alloc]init];
-            Newpage.page = weakSelf.indexPage ++;
             Newpage.rows = KROWS;
             weakSelf.goodsModel.page = Newpage;
             [weakSelf getGoodsListDatasisRemove:NO Withobject:weakSelf.goodsModel];

Lighting/Tools/opple_objc_json_client.h

@@ -1457,6 +1457,12 @@ extern NSString * const SORTDIRECTION_DESC;
  
  */
 @interface TOOrderdetailEntity : JSONModel
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *brandName;
 /**
  * 方法: 取得java.lang.String
  *
@@ -2557,6 +2563,12 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *historyEarning;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *applytotal;
 @end /* interface EarningsResponse */
 
 

Lighting/Tools/opple_objc_json_client.m

@@ -562,6 +562,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @end
 
 @implementation TOOrderdetailEntity
+@synthesize brandName;
 @synthesize fid;
 @synthesize goodsId;
 @synthesize goodsCode;
@@ -930,6 +931,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize accountTotal;
 @synthesize yesterdayEarnings;
 @synthesize historyEarning;
+@synthesize applytotal;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {