优化提交

QXLive/Mine(音域)/View/充值/QXRechargeView.m

@@ -191,7 +191,7 @@
 }
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
     if (indexPath.section == 0 && !self.isOnlyDisplayPayType) {
-        return CGSizeMake((SCREEN_WIDTH-16*2-12*2)/3, 76);
+        return CGSizeMake((SCREEN_WIDTH-16*2-12*2-1)/3, 76);
     }
     return CGSizeMake(SCREEN_WIDTH, 40);
 }
@@ -272,7 +272,7 @@
         if (weakSelf.selectedPayTypeModel.type.intValue == 2) {
             NSDictionary *resultDict = dict[@"data"];
             NSString *order = [NSString stringWithFormat:@"%@",resultDict[@"ali"]];
-            [[AlipaySDK defaultService] payOrder:order fromScheme:@"qxlive" callback:^(NSDictionary *resultDic) {
+            [[AlipaySDK defaultService] payOrder:order fromScheme:@"midilive" callback:^(NSDictionary *resultDic) {
                 NSLog(@"支付宝H5支付回调 - %@", resultDic);
                
             }];

QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m

@@ -72,6 +72,7 @@
 ////    }
 //}
 -(void)setModel:(QXRoomListModel *)model{
+    
     _model = model;
     [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:model.room_cover] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]];
     self.nickNameLabel.text = model.room_name;
@@ -84,11 +85,11 @@
     NSString *come = [NSString qx_showHotCountNum:model.visit_num.longLongValue];
     self.comeCountLabel.text = [NSString stringWithFormat:@"访问:%@",come];
     if (self.type == 0) {
-        self.todayLabel.text = @"今日收益";
+        self.todayLabel.text = @"今日流水";
     }else{
         self.todayLabel.text = [NSString stringWithFormat:@"收益分成比例:%@%%",model.ratio];
     }
-    NSString *money = [NSString qx_showHotCountNum:model.today_profit.longLongValue];
+    NSString *money = [NSString stringWithFormat:@"%.4f",model.today_profit.doubleValue];
     self.moneyLabel.text = [NSString stringWithFormat:@"%@",money];
     [self.typeImageView sd_setImageWithURL:[NSURL URLWithString:model.label_icon] placeholderImage:nil];
     if (model.apply_status.intValue == 1) {

QXLive/Mine(音域)/View/设置/QXPasswordView.h

@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 typedef NS_ENUM(NSInteger) {
     QXPasswordViewTypeChirldMode = 0,
+    QXPasswordViewTypeChirldModeTwice,
     QXPasswordViewTypeRoom
 }QXPasswordViewType;
 NS_ASSUME_NONNULL_BEGIN

QXLive/Mine(音域)/View/设置/QXPasswordView.m

@@ -102,17 +102,17 @@ CGFloat labelHeight = 63;
         make.centerX.centerY.equalTo(self.label1);
         make.width.height.mas_equalTo(1);
     }];
-    self.forgotBtn = [[UIButton alloc] init];
-    [self.forgotBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
-    self.forgotBtn.titleLabel.font = [UIFont systemFontOfSize:12];
-    [self.forgotBtn setTitle:[NSString stringWithFormat:@"%@?%@",QXText(@"忘记密码"),QXText(@"请联系客服")] forState:(UIControlStateNormal)];
-    [self.forgotBtn addTarget:self action:@selector(forgotAction) forControlEvents:(UIControlEventTouchUpInside)];
-    [self addSubview:self.forgotBtn];
-    [self.forgotBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.label1.mas_bottom).offset(10);
-        make.height.mas_equalTo(38);
-        make.centerX.equalTo(self);
-    }];
+//    self.forgotBtn = [[UIButton alloc] init];
+//    [self.forgotBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
+//    self.forgotBtn.titleLabel.font = [UIFont systemFontOfSize:12];
+//    [self.forgotBtn setTitle:[NSString stringWithFormat:@"%@?%@",QXText(@"忘记密码"),QXText(@"请联系客服")] forState:(UIControlStateNormal)];
+//    [self.forgotBtn addTarget:self action:@selector(forgotAction) forControlEvents:(UIControlEventTouchUpInside)];
+//    [self addSubview:self.forgotBtn];
+//    [self.forgotBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(self.label1.mas_bottom).offset(10);
+//        make.height.mas_equalTo(38);
+//        make.centerX.equalTo(self);
+//    }];
 }
 -(void)forgotAction{
     
@@ -201,6 +201,10 @@ CGFloat labelHeight = 63;
             self.titleLabel.text = QXText(@"请输入监护密码");
         }
             break;
+        case QXPasswordViewTypeChirldModeTwice:{
+            self.titleLabel.text = QXText(@"请确认监护密码");
+        }
+            break;
         case QXPasswordViewTypeRoom:{
             self.titleLabel.text = QXText(@"请输入房间密码");
         }

QXLive/Mine(音域)/View/钱包/QXCornRecordCell.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *reasonLabel;
 @property (weak, nonatomic) IBOutlet UILabel *timeLabel;
 @property (weak, nonatomic) IBOutlet UILabel *priceLabel;
+@property (nonatomic,assign)BOOL isCoin;
 @property (nonatomic,strong) QXCoinDetailModel *model;
 +(instancetype)cellWithTableView:(UITableView *)tableView;
 @end

QXLive/Mine(音域)/View/钱包/QXCornRecordCell.m

@@ -18,6 +18,9 @@
     }
     return cell;
 }
+-(void)setIsCoin:(BOOL)isCoin{
+    _isCoin = isCoin;
+}
 -(void)setModel:(QXCoinDetailModel *)model{
     _model = model;
     self.reasonLabel.text = model.remarks;
@@ -26,7 +29,12 @@
     formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     NSString*time = [formatter stringFromDate:date];
     self.timeLabel.text = time;
-    self.priceLabel.text = [NSString stringWithFormat:@"%.2f",model.change_value.doubleValue];
+    if (self.isCoin) {
+        self.priceLabel.text = [NSString stringWithFormat:@"%.2f",model.change_value.doubleValue];
+    }else{
+        self.priceLabel.text = [NSString stringWithFormat:@"%.4f",model.change_value.doubleValue];
+    }
+    
 }
 - (void)awakeFromNib {
     [super awakeFromNib];