修改 配置

GYDemo/GYDemo/Alert/DGUniversalAlertView.m

@@ -262,11 +262,24 @@
 //显示每日福利宝箱奖励
 - (void)configWithWelfareBoxModel:(NSArray *)boxModels;{
     
-    self.firstStackView.hidden = false;
-    self.secondStackView.hidden = false;
-    self.thirdStackView.hidden = false;
+    
 //    self.lightImageView.hidden = false;
+    
+    self.firstStackView.hidden = true;
+    self.secondStackView.hidden = true;
+    self.thirdStackView.hidden = true;
+    
+    if (self.dataSource.count == 1) {
+        self.firstStackView.hidden = false;
+
+    } else if (self.dataSource.count == 2) {
+        self.secondStackView.hidden = false;
 
+    } else if (self.dataSource.count == 3) {
+
+        self.thirdStackView.hidden = false;
+
+    }
     self.topTypeImageView.image = [UIImage imageNamed:@"title_gain_box"];
     self.topTypeImageView.hidden = NO;
     NSInteger index = 0;

GYDemo/GYDemo/Alert/GYOrderAlertView.xib

@@ -28,19 +28,19 @@
                                     <rect key="frame" x="-5" y="-5" width="343" height="410"/>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XsE-NZ-ege">
-                                    <rect key="frame" x="51" y="50" width="231" height="23.5"/>
+                                    <rect key="frame" x="49" y="50" width="235" height="25.5"/>
                                     <attributedString key="attributedText">
                                         <fragment content="完成当前订单将获得钻石">
                                             <attributes>
                                                 <color key="NSColor" red="0.5607843137254902" green="0.29803921568627451" blue="0.0039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
-                                                <font key="NSFont" size="21" name=".PingFangSC-Regular"/>
+                                                <font key="NSFont" metaFont="system" size="21"/>
                                             </attributes>
                                         </fragment>
                                     </attributedString>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="tw6-yx-5Z1">
-                                    <rect key="frame" x="30" y="82.5" width="273" height="297.5"/>
+                                    <rect key="frame" x="30" y="84.5" width="273" height="295.5"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="MaJ-Ce-qfl">
                                         <size key="itemSize" width="128" height="128"/>

GYDemo/GYDemo/Alert/GYTaskAlertView.m

@@ -200,7 +200,7 @@
 //区头的大小
 -(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    return CGSizeMake(collectionView.frame.size.width, 72);
+    return CGSizeMake(collectionView.frame.size.width, 0);
 }
 //区尾的大小
 -(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section

GYDemo/GYDemo/GYPrefixHeader.pch

@@ -15,13 +15,13 @@
 #define GYPrefixHeader_pch
 //测试
 
-#define ServerReport   @"http://reporttest.zhangxinhulian.com"
-#define ServerHost     @"http://feedapitest2.zhangxinhulian.com" // 服务端接口地址
-#define ServerAds      @"http://bstest.zhangxinhulian.com/v4/ads"
+//#define ServerReport   @"http://reporttest.zhangxinhulian.com"
+//#define ServerHost     @"http://feedapitest2.zhangxinhulian.com" // 服务端接口地址
+//#define ServerAds      @"http://bstest.zhangxinhulian.com/v4/ads"
 ////正式
-//#define ServerReport   @"http://report.clouddistribute.net"
-//#define ServerHost     @"https://feedapi.clouddistribute.net" // 服务端接口地址
-//#define ServerAds      @"http://bs.clouddistribute.net/v4/ads"
+#define ServerReport   @"http://report.clouddistribute.net"
+#define ServerHost     @"https://feedapi.clouddistribute.net" // 服务端接口地址
+#define ServerAds      @"http://bs.clouddistribute.net/v4/ads"
 
 
 #define WXAppId         @"wxe7a03eb52cce1b51"

GYDemo/GYDemo/View/GYRankingViewCell.m

@@ -21,7 +21,7 @@
     
     self.nicknameLabel.text = model.nickname;
     self.coinNumberLabel.text = [NSString stringWithFormat:@"%ld", model.drip];
-    self.diamondLabel.text = [NSString stringWithFormat:@"%ld钻", model.award];
+    self.diamondLabel.text = [NSString stringWithFormat:@"%ld%@", model.award,CGUserManager.shared.unityString];
     [self.userProfileView setImageWithURL:[NSURL URLWithString:model.headImg]];
 }
 

GYDemo/GYDemo/ViewController/Welfare/WelfareCenterVC.m

@@ -328,21 +328,24 @@
 //    [alertView showAlertToView:[(AppDelegate *)[UIApplication sharedApplication].delegate getMainWindow]];
 //
 //    return;
-    
+    if(self.coinsProcess < 6){
+        return;
+    }
     WEAKSELF;
     [[CGNetworkTools shared] postWithAction:welfare_task_box parameters:@{} success:^(id  _Nonnull response) {
         if (response) {
             if(weakSelf.coinsProcess >= 6){
                 weakSelf.coinsProcess -= 6;
+                NSArray * array = response[@"result"][@"data"];
+                
+                NSMutableArray * dataArray = [WelfareBoxData mj_objectArrayWithKeyValuesArray:array];
+                
+                DGUniversalAlertView * alertView = [DGUniversalAlertView loadFromNib];
+                [alertView configWithWelfareBoxModel:dataArray];
+                [alertView showAlertToView:weakSelf.view];
             }
             [weakSelf updateUI];
-            NSArray * array = response[@"result"][@"data"];
-            
-            NSMutableArray * dataArray = [WelfareBoxData mj_objectArrayWithKeyValuesArray:array];
             
-            DGUniversalAlertView * alertView = [DGUniversalAlertView loadFromNib];
-            [alertView configWithWelfareBoxModel:dataArray];
-            [alertView showAlertToView:weakSelf.view];
         }
         
     } failure:^(NSError * _Nonnull error) {