重庆迈尖科技有限公司
2018-08-17 c347e6cda643e1ac385f285cea5731a3317e646f
no message
7个文件已修改
144 ■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/MineViewController.m 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/BalanceViewController.m 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/IncarnateViewController.m 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/明细/BalaDetailViewController.m 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/网页视图/SureWebViewController.m 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -52,7 +52,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/界面/我的/messageLogin/MessageLoginViewController.m"
            timestampString = "556187707.748147"
            timestampString = "556193788.808499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "415"
@@ -61,5 +61,53 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/balance/&#x4f53;&#x73b0;/IncarnateViewController.m"
            timestampString = "556193788.808557"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "246"
            endingLineNumber = "246"
            landmarkName = "-getAccount"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/balance/&#x4f53;&#x73b0;/IncarnateViewController.m"
            timestampString = "556193788.808603"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "253"
            endingLineNumber = "253"
            landmarkName = "-getAccount"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MineViewController.m"
            timestampString = "556193788.808673"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "1149"
            endingLineNumber = "1149"
            landmarkName = "-tableView:cellForRowAtIndexPath:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>
MIduo/½çÃæ/ÎÒµÄ/MineViewController.m
@@ -1134,7 +1134,17 @@
            cell.redBagMessage.textVerticalAlignment = YYTextVerticalAlignmentTop;
            cell.redBagMessage.attributedText = mineRedBagMessage;
            cell.IDLabel.text = [NSString stringWithFormat:@"ID:%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]];
            if([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] && _userInfo){
                if (IS_IPHONE_6P) {
                    cell.gradeImage.sd_layout
                    .rightSpaceToView(cell.TaoBaoIcon, -25)
                    .bottomSpaceToView(cell.TaoBaoIcon, -15)
                    .widthIs(30)
                    .heightIs(25);
                }
            }
            if ([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] == nil) {
                
                cell.IDLabel.hidden = YES;
MIduo/½çÃæ/ÎÒµÄ/balance/BalanceViewController.m
@@ -140,7 +140,8 @@
    
    self.blanceLabel = [[UILabel alloc]initWithFrame:CGRectMake(20,  20, KScreenW / 3 * 2, 40)];
    self.blanceLabel.textColor = XYRMainColor;
    self.blanceLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"myHongBao"]doubleValue]];
//    self.blanceLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"myHongBao"]doubleValue]];
    self.blanceLabel.text = @"";
    self.blanceLabel.font = [UIFont boldSystemFontOfSize:40];
    [_fanliView addSubview:self.blanceLabel];
    
@@ -213,7 +214,8 @@
    _fanliLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];
    _fanliLabel.textColor = [UIColor blackColor];
    _fanliLabel.font = [UIFont boldSystemFontOfSize:30];
    _fanliLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];
//    _fanliLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];
    _fanliLabel.text = @"";
    _fanliLabel.textAlignment = NSTextAlignmentCenter;
    [buttomView addSubview:_fanliLabel];
    UILabel *fanLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_fanliLabel.frame) + 5, KScreenW / 2, 20)];
@@ -226,7 +228,8 @@
    _accountLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];
    _accountLabel.textColor = [UIColor blackColor];
    _accountLabel.font = [UIFont boldSystemFontOfSize:30];
    _accountLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];
//    _accountLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];
    _accountLabel.text = @"";
    _accountLabel.textAlignment = NSTextAlignmentCenter;
    [buttomView addSubview:_accountLabel];
@@ -251,7 +254,8 @@
    _royaltiesedLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];
    _royaltiesedLabel.textColor = [UIColor blackColor];
    _royaltiesedLabel.font = [UIFont boldSystemFontOfSize:30];
    _royaltiesedLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];
//    _royaltiesedLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];
    _royaltiesedLabel.text = @"";
    _royaltiesedLabel.textAlignment = NSTextAlignmentCenter;
    [_royaltiesView addSubview:_royaltiesedLabel];
    UILabel *leijiLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_royaltiesedLabel.frame) + 5, KScreenW / 2, 20)];
@@ -264,7 +268,8 @@
    _royaltiesLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];
    _royaltiesLabel.textColor = [UIColor blackColor];
    _royaltiesLabel.font = [UIFont boldSystemFontOfSize:30];
    _royaltiesLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];
//    _royaltiesLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];
    _royaltiesLabel.text = @"";
    _royaltiesLabel.textAlignment = NSTextAlignmentCenter;
    [_royaltiesView addSubview:_royaltiesLabel];
    
@@ -306,7 +311,7 @@
//    _estimateLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    
    _estimateLabel.textAlignment = NSTextAlignmentCenter;
    _estimateLabel.text = @"---";
    _estimateLabel.text = @"";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_estimateLabel.frame)+ 20, CGRectGetMaxY(_estimateLabel.frame), 60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
@@ -343,7 +348,7 @@
//    _mothLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    
    _mothLabel.textAlignment = NSTextAlignmentCenter;
    _mothLabel.text = @"---";
    _mothLabel.text = @"";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_mothLabel.frame) + 20, CGRectGetMaxY(_mothLabel.frame) ,60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
@@ -379,7 +384,7 @@
    _lastMonLabel.font = [UIFont boldSystemFontOfSize:30];
//    _lastMonLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];
    _lastMonLabel.textAlignment = NSTextAlignmentCenter;
    _lastMonLabel.text = @"---";
    _lastMonLabel.text = @"";
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_lastMonLabel.frame) + 15, CGRectGetMaxY(_lastMonLabel.frame) , 60, 25)];
    label.font = [UIFont systemFontOfSize:13];
    if (KScreenW > 375) {
MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/IncarnateViewController.m
@@ -35,6 +35,8 @@
@property (nonatomic, assign) BOOL isHaveDian;
@property (nonatomic, assign) BOOL isFirstZero;
@property (nonatomic,strong) NSString *maxMoney;
@property (nonatomic,strong) NSString *minMoney;
@property (nonatomic, strong) NSDictionary * alipayBindStateDictionary;
@end
@@ -68,8 +70,11 @@
    
}
- (void)initializeInterface{
    self.balanLabel.text = [NSString stringWithFormat:@"可提现余额%@元",self.datasource[@"myHongBao"]];
    if ([self.datasource[@"myHongBao"]doubleValue] == 0) {
        self.balanLabel.text = [NSString stringWithFormat:@"可提现余额  å…ƒ"];
    }
    _addView.userInteractionEnabled = YES;
    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tap:)];
    [_addView addGestureRecognizer:tap];
@@ -149,24 +154,22 @@
- (IBAction)submitTaped:(id)sender {
    if (self.bindingAccountList.count == 0) {
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"请添加提现账号"];
        ALToastBottom(@"请添加提现账号");
        return;
    }
    self.balanText.text = [self.balanText.text removeSpace];
    if ([self.balanText.text doubleValue] > [self.datasource[@"myHongBao"] doubleValue]) {
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"您的余额不足"];
        ALToastBottom(@"你当前可提现余额不足");
        return;
    }
    if ([self.balanText.text doubleValue] < 20) {
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"单次提现最低不得低于20"];
    if ([self.balanText.text doubleValue] < [self.minMoney doubleValue]) {
        NSString * string = [NSString stringWithFormat:@"单笔提现不低于%@元",self.minMoney];
        ALToastBottom(string);
        return;
    }
    if ([self.balanText.text doubleValue] > 50) {
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showErrorWithStatus:@"单次提现最高不得超过50"];
    if ([self.balanText.text doubleValue] > [self.maxMoney doubleValue]) {
        NSString * string = [NSString stringWithFormat:@"单笔提现不低于%@元",self.maxMoney];
        ALToastBottom(string);
        return;
    }
    NSString *phoneString = _userInfo[@"phone"];
@@ -187,12 +190,12 @@
- (IBAction)nextTaped:(UIButton *)sender {
    
    if (self.zhifuText.text.length ==0) {
        [SVProgressHUD showErrorWithStatus:@"请输入账号"];
        ALToastBottom(@"请输入账号");
        return;
    }
    
    if (self.nameText.text.length ==0) {
        [SVProgressHUD showErrorWithStatus:@"请输入收款人姓名"];
        ALToastBottom(@"请输入收款人姓名");
        return;
    }
    
@@ -207,7 +210,8 @@
        NSLog(@"%@",object);
        //        NSInteger code = [object[@"code"]integerValue];
        //        NSDictionary *dic = object[@"data"];
        [SVProgressHUD showSuccessWithStatus:object[@"data"]];
        ALToastBottom(object[@"data"])
        self.backView.hidden = YES;
        self.addView.hidden = YES;
    } fail:^(id object) {
@@ -244,7 +248,8 @@
            self.alipayBindStateDictionary = dic[@"alipayBindState"];
            self.userInfo = dic[@"user"];
            self->_bindingAccountList = dic[@"bindingAccountList"];
            self.maxMoney = dic[@"maxMoney"];
            self.minMoney = dic[@"minMoney"];
            if (self->_bindingAccountList.count == 0) {
                self.heightLayout.constant = 80;
                self.rightImage.hidden = NO;
MIduo/½çÃæ/ÎÒµÄ/balance/Ã÷ϸ/BalaDetailViewController.m
@@ -51,16 +51,25 @@
        if (code == 0) {
            NSDictionary *dic = object[@"data"];
            [self.datasource addObjectsFromArray:dic[@"list"]];
            NSArray *array = dic[@"list"];
            if (self.datasource.count == 0) {
                self.backView.hidden  = NO;
            }else{
                self.backView.hidden  = YES;
            }
            [self.tableview.mj_footer endRefreshing];
            [self.tableview.mj_header endRefreshing];
            if (array.count < 20) {
                [self.tableview.mj_footer endRefreshingWithNoMoreData];
            }
            [self.tableview reloadData];
        }
       
    } fail:^(id object) {
        NSLog(@"%@",object);
        [self.tableview.mj_footer endRefreshing];
        [self.tableview.mj_header endRefreshing];
    }];
}
@@ -117,7 +126,16 @@
    _tableview.separatorStyle = UITableViewCellSeparatorStyleNone;
    [_tableview registerNib:[UINib nibWithNibName:@"BalaDetailTableViewCell" bundle:nil] forCellReuseIdentifier:@"BalaDetailTableViewCell"];
    _tableview.backgroundColor = [UIColor clearColor];
    return _tableview;
    _tableview .mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
        self->_page = 1;
        [self.datasource removeAllObjects];
        [self getAccountList];
    }];
    _tableview .mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
        self->_page ++;
        [self getAccountList];
    }];
            return _tableview;
}
- (UIView *)backView{
    if (_backView) {
MIduo/½çÃæ/ÍøÒ³ÊÓͼ/SureWebViewController.m
@@ -281,7 +281,7 @@
                    self->_taoBaoHongBaoInfo=[[[result objectForKey:@"data"] objectForKey:@"taobao"] objectForKey:@"taoBaoHongBaoInfo"];
//                    yuanMessage.yy_font=[UIFont boldSystemFontOfSize:15];
//                    yuanMessage.yy_color=YTHColor(255, 48, 68);
                    self->_redBagMessage.textColor = YTHColor(255, 48, 68);
                    self->_redBagMessage.textColor = XYRMainColor;
//                    _redBagMessage.font = [UIFont boldSystemFontOfSize:15];
                    NSInteger type = [self->_taoBaoHongBaoInfo[@"type"]integerValue];
                    if (type == 1) {
@@ -307,7 +307,7 @@
                    //显示红包金额
                    self->_taoBaoHongBaoInfo=[[[result objectForKey:@"data"] objectForKey:@"taobao"] objectForKey:@"taoBaoHongBaoInfo"];
                    [self loadMoneyWith:result[@"data"]];
                    self->_redBagMessage.textColor = YTHColor(229, 0, 93);
                    self->_redBagMessage.textColor = XYRMainColor;
//                    _redBagMessage.font = [UIFont boldSystemFontOfSize:15];
                    NSInteger type = [self->_taoBaoHongBaoInfo[@"type"]integerValue];
                    if (type == 1) {
@@ -566,7 +566,7 @@
        [_redBagTipView addSubview:couImageview];
        UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(couImageview.frame)-10, CGRectGetMaxY(couImageview.frame)+ 3, 45, 20)];
        label.text = @"优惠券";
        label.textColor = SJColor(230, 0, 94, 1);
        label.textColor = XYRMainColor;
        label.tag = 65;
        label.font = [UIFont systemFontOfSize:14];