Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose

iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.m

@@ -50,9 +50,9 @@
 
 - (IBAction)onClickBlandBtn:(id)sender;
 
-- (IBAction)onClickBuyNow:(id)sender;
+//- (IBAction)onClickBuyNow:(id)sender;
 
-- (IBAction)onClickAddToShopCart:(id)sender;
+//- (IBAction)onClickAddToShopCart:(id)sender;
 
 @end
 

iCemarose/Class/UI/NewProduct/KWMVariantsVC.m

@@ -56,6 +56,12 @@
     [self initView];
 }
 
+-(void)viewDidLayoutSubviews{
+    [super viewDidLayoutSubviews];
+    //在小屏机/ipad时，uicollectionview初始显示超出宽度的问题。
+    [self.cvVariants reloadData];
+}
+
 -(NSDecimalNumber *)totalPrice{
     if(_totalPrice){
         return _totalPrice;
@@ -381,8 +387,9 @@
 #pragma mark --ProductVariantUtil
 -(BOOL)isSellOut:(BUYProductVariant *)variant adminVariant:(KWMVariants *)adminVariant{
     BOOL isSellOut = NO;
+
     if(variant){
-        isSellOut = variant.availableValue;
+        isSellOut = !variant.availableValue;
     }
     if(adminVariant && !isSellOut){
         isSellOut = adminVariant.inventoryQuantity.integerValue <= 0;

iCemarose/Class/UI/NewProduct/NewProduct.storyboard

@@ -499,7 +499,7 @@
                             <constraint firstItem="qc8-5Y-jmQ" firstAttribute="top" secondItem="fdk-xz-fYd" secondAttribute="bottom" id="lko-ph-zJP"/>
                             <constraint firstItem="fdk-xz-fYd" firstAttribute="leading" secondItem="FcM-Ya-Fa9" secondAttribute="leading" id="mFg-8v-raH"/>
                             <constraint firstAttribute="bottom" secondItem="vHl-zd-90x" secondAttribute="bottom" id="mnh-yu-sbQ"/>
-                            <constraint firstItem="TiG-qk-9ZW" firstAttribute="width" secondItem="fdk-xz-fYd" secondAttribute="width" id="q69-c0-KOs"/>
+                            <constraint firstItem="TiG-qk-9ZW" firstAttribute="width" secondItem="FcM-Ya-Fa9" secondAttribute="width" id="scH-hw-vNk"/>
                             <constraint firstItem="TiG-qk-9ZW" firstAttribute="leading" secondItem="FcM-Ya-Fa9" secondAttribute="leading" id="z0o-6b-ARO"/>
                             <constraint firstItem="vHl-zd-90x" firstAttribute="leading" secondItem="FcM-Ya-Fa9" secondAttribute="leading" id="zee-C0-Fxb"/>
                         </constraints>