2.2.0版本发版 此commit置顶

YuMi/Config/ClientConfig.m

@@ -42,7 +42,20 @@
 		if (code == 200) {
 			self.retryCount = 0;
 			NSDictionary * initData = data.data;
+            
+#ifdef DEBUG
+            
             self.canOpen = ![initData[@"aModel"] boolValue];
+            
+#else
+            if(isEnterprise == YES){
+                self.canOpen = ![initData[@"aModel"] boolValue];
+            }else{
+                self.canOpen = YES;
+            }
+#endif
+            
+            
 			self.iosPhoneBind = [initData[@"iosPhoneBind"] boolValue];
 			//糖果树配置
 			self.openCandyTree = [initData[@"openBoxSwitch"] boolValue];

YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m

@@ -105,7 +105,20 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     [self.authBubbleView addSubview:self.authBubbleLabel];
     
     if (@available(iOS 13.0, *)) {
+#ifdef DEBUG
+        
+        
+        
         [self.stackView addArrangedSubview:self.appleButton];
+        
+        
+        
+#else
+        if(isEnterprise == YES){
+            [self.stackView addArrangedSubview:self.appleButton];
+        }
+#endif
+        
     }
     [self.stackView addArrangedSubview:self.googleButtonView];
     [self.stackView addArrangedSubview:self.fbButtonView];
@@ -159,11 +172,28 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         make.left.mas_equalTo(8);
         make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6);
     }];
+    if (@available(iOS 13.0, *)) {
+#ifdef DEBUG
+        
         
         [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.mas_equalTo(kGetScaleWidth(295));
             make.height.mas_equalTo(kGetScaleWidth(46));
         }];
+        
+        
+        
+#else
+        if(isEnterprise == YES){
+            [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.width.mas_equalTo(kGetScaleWidth(295));
+                make.height.mas_equalTo(kGetScaleWidth(46));
+            }];
+        }
+#endif
+        
+    }
+    
     [self.googleButtonView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(kGetScaleWidth(295));
         make.height.mas_equalTo(kGetScaleWidth(46));

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m

@@ -180,7 +180,17 @@
 }
 - (NSArray *)listData{
     if(!_listData){
+#ifdef DEBUG
         _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),@"Apple Pay"];
+#else
+        if(isEnterprise == YES){
+            _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),@"Apple Pay"];
+        }else{
+            _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")];
+        }
+#endif
+        
+        
     }
     return _listData;
 }