暂时提交

QXLive/Tabbar/弹窗/QXNiceGiftPopView.m

@@ -54,7 +54,9 @@
     [self.timeDownbgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.bgImageView).offset(ScaleWidth(117));
         make.left.equalTo(self.bgImageView).offset(9);
-        make.size.mas_equalTo(CGSizeMake(ScaleWidth(179), ScaleWidth(20)));
+        make.right.equalTo(self.bgImageView).offset(-9);
+        make.width.mas_equalTo(ScaleWidth(20));
+        
     }];
     
     self.timeDownLabel = [[UILabel alloc] init];
@@ -172,7 +174,7 @@
     MJWeakSelf
     [QXHomePageNetwork getSkyDropGiftListSuccessBlock:^(QXNiceGiftRechargeModel * _Nonnull model) {
         weakSelf.model = model;
-        weakSelf.timeDownLabel.text = model.effective_time;
+        weakSelf.timeDownLabel.text = [NSString stringWithFormat:@"结束时间:%@",model.effective_time];
         NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:model.counter];
         [attr yy_setColor:QXConfig.themeColor range:[model.counter rangeOfString:model.money]];
         [attr yy_setColor:QXConfig.themeColor range:[model.counter rangeOfString:model.diamond]];
@@ -191,15 +193,15 @@
 -(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
     QXGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXGiftCell" forIndexPath:indexPath];
     cell.cellType = QXGiftCellTypeNiceGift;
-    cell.roomGiftModel = self.model.gift_list[indexPath.row];
+    cell.niceGiftModel = self.model.gift_list[indexPath.row];
     return cell;
 }
 
 
 // 立即领取
 -(void)getAction{
-    if (self.getActionBlock) {
-        self.getActionBlock();
+    if (self.rechargeActionBlock) {
+        self.rechargeActionBlock(self.model.money,self.model.gift_bag_id);
     }
 }
 -(void)closeAction{