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

iCemarose/Class/UI/NewProduct/KWMNewProductVC.m

@@ -280,6 +280,8 @@
     }
     self.product = product;
     self.productId = product.identifier;
+    self.colorMeterfield = nil;
+    self.adminProduct = nil;
     [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
     [self initView];
     [self clearSelect];
@@ -427,11 +429,17 @@
             [weakSelf showError:error];
         }else if(product){
             weakSelf.product = product;
+            weakSelf.productId = product.identifier;
             [weakSelf initMidViewHight];
             weakSelf.midDetailView.product = product;
             [weakSelf.detailView1 setData:product];
             [self requestBrandProducts:1];
             [self requestCategoryProducts:1];
+            
+            if(self.handle){
+                [self requestAdminProduct];
+                [self requestColorMetafield];
+            }
         }
     };
     if (self.handle) {
@@ -500,6 +508,9 @@
 #pragma mark  -- API KWMApimanager
 -(void)requestAdminProduct{
     NSNumber *productId = self.product?self.product.identifier:self.productId;
+    if(!productId){
+        return;
+    }
     __weak KWMNewProductVC *weakSelf = self;
     void(^failure)(NSURLSessionDataTask *,NSError *) = ^(NSURLSessionDataTask *task,NSError *error){
     };
@@ -515,9 +526,12 @@
 
 -(void)requestColorMetafield{
     NSNumber *productId = self.product?self.product.identifier:self.productId;
+    if(!productId){
+        return;
+    }
     __weak KWMNewProductVC *weakSelf = self;
     void(^failure)(NSURLSessionDataTask *,NSError *) = ^(NSURLSessionDataTask *task,NSError *error){
-        [weakSelf showError:error];
+//        [weakSelf showError:error];
     };
     void(^success)(NSURLSessionDataTask *,KWMMetafieldResult *) = ^(NSURLSessionDataTask *task,KWMMetafieldResult *result){
         if(!result.metafields){