修改项说明：

558981b7 · 曹云霄 · ba1ca1b5 · 558981b7 · 558981b7
Commit 558981b7 authored Nov 21, 2016 by 曹云霄
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 146 additions and 78 deletions

PromotionChooseViewController.m Class/PromotionChooseViewController.m +2 -2

OppleMain.storyboard Lighting/OppleMain.storyboard +144 -76

No files found.
--- a/Class/PromotionChooseViewController.m
+++ b/Class/PromotionChooseViewController.m
@@ -70,10 +70,10 @@
    }
    [self.customPromotionDatas enumerateObjectsUsingBlock:^(CustomPromotionModel *model1, NSUInteger index, BOOL * _Nonnull stop) {
        if (![promotionModel.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:promotionModel.type]) {
-            for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
+            for (NSInteger i=0;i<weakSelf.customPromotionDatas.count;i++) {
                CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
                if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type] && ![model2 isEqual:promotionModel]) {
-                    model1.isSelected = YES;
+                    model1.isSelected = YES;break;
                }
            }
        }else {

--- a/Lighting/OppleMain.storyboard
+++ b/Lighting/OppleMain.storyboard