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

iCemarose/Class/Api/KWMAPIManager.m

@@ -891,7 +891,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) saveWish:(NSDictionary *)parameters
                                  success:(void(^)(NSURLSessionDataTask *task,KWMAdditionalListResult *result))success
                                  failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-save",@"test.cemarose.com"];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-save",WishList_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters
@@ -911,7 +911,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) getWishList:(NSDictionary *)parameters
                                 success:(void(^)(NSURLSessionDataTask *task,KWMAdditionalListResult *result))success
                                 failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist",@"test.cemarose.com"];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist",WishList_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodGET
                           apiPath:apiPath
                        parameters:parameters
@@ -931,7 +931,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) removeWish:(NSDictionary *)parameters
                                success:(void(^)(NSURLSessionDataTask *task,KWMAdditionalListResult *result))success
                                failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-prune",@"test.cemarose.com"];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-prune",WishList_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters
@@ -950,7 +950,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) clearWishList:(NSDictionary *)parameters
                               success:(void(^)(NSURLSessionDataTask *task,KWMAdditionalListResult *result))success
                               failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-delete",@"test.cemarose.com"];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/wishlist-delete",WishList_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters

iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsCell.h

@@ -13,4 +13,6 @@
 
 @property(nonatomic) BUYProduct *product;
 
+@property(nonatomic) BOOL isMore;
+
 @end

iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsCell.m

@@ -10,6 +10,9 @@
 #import "KWMStringUtil.h"
 #import "KWMImageUtil.h"
 #import "UIImageView+WebCache.h"
+#import "BUYProductVariant+Currency.h"
+#import "UIView+Prettify.h"
+#import "UIColor+SAMAdditions.h"
 
 
 @interface KWMClothingSetsCell()
@@ -18,14 +21,22 @@
 
 @property(nonatomic,weak) IBOutlet UILabel *lbPrice;
 
+@property(nonatomic,weak) IBOutlet UILabel *lbComparePrice;
+
 @property(nonatomic,weak) IBOutlet UIImageView *ivProduct;
 
+@property(nonatomic,weak) IBOutlet UIView *vMore;
+
+@property(nonatomic,weak) IBOutlet UIView *vContent;
+
+
 @end
 
 @implementation KWMClothingSetsCell
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    [self.vMore setBorder:0.5 cornerRadius:0 borderColor:[UIColor sam_colorWithHex:@"D8DBDE"]];
 }
 
 -(void)setProduct:(BUYProduct *)product{
@@ -37,9 +48,24 @@
         self.lbName.text = product.title;
         if(product.variantsArray.count>0){
             BUYProductVariant *variant = product.variantsArray.firstObject;
-            self.lbPrice.text = [KWMStringUtil price:variant.price];
+            self.lbPrice.text = variant.price.priceValueFormatted;
+            if(variant.compareAtPrice){
+                self.lbComparePrice.hidden = NO;
+                NSString *priceString = variant.compareAtPriceFormatted;
+                NSDictionary *attribtDic = @{NSStrikethroughStyleAttributeName: [NSNumber numberWithInteger:NSUnderlineStyleSingle]};
+                NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:priceString attributes:attribtDic];
+                self.lbComparePrice.attributedText = attribtStr;
+            }else{
+                self.lbComparePrice.hidden = YES;
             }
         }
+    }
+}
+
+-(void)setIsMore:(BOOL)isMore{
+    _isMore = isMore;
+    self.vMore.hidden = !isMore;
+    self.vContent.hidden = isMore;
 }
 
 @end

iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsHeader.h

@@ -13,6 +13,8 @@
 
 - (void)kwm_onClickProduct:(BUYProduct *)product;
 
+- (void)kwm_gotoClothingSetsPage;
+
 @end
 
 @interface KWMClothingSetsHeader : UIView<UICollectionViewDataSource,UICollectionViewDelegate>

iCemarose/Class/UI/NewHome/Cell/KWMClothingSetsHeader.m

@@ -91,12 +91,13 @@
     
     BUYProduct *product = [self.productArray objectAtIndex:indexPath.row];
     cell.product = product;
+    cell.isMore = indexPath.row == 9;
     
     return cell;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    CGSize size = CGSizeMake(66, 100);
+    CGSize size = CGSizeMake(66, 117);
     return size;
 }
 
@@ -105,11 +106,18 @@
 }
 
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
+    if(self.productArray && self.productArray.count > 9){
+        return 10;
+    }
     return self.productArray?self.productArray.count:0;
 }
 
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    if(indexPath.row == 9){
+        [self.delegate kwm_gotoClothingSetsPage];
+    }else{
         [self.delegate kwm_onClickProduct:self.productArray[indexPath.item]];
+    }
 }
 
 

iCemarose/Class/UI/NewHome/KWMNewHomeVC.m

@@ -57,6 +57,8 @@ typedef enum{
 
 @property(nonatomic) NSMutableDictionary *dataMapping;
 
+@property(nonatomic) NSString *clotingSetsHandle;
+
 @end
 
 @implementation KWMNewHomeVC
@@ -181,6 +183,10 @@ typedef enum{
     [self openURLWithString:@"https://cemarose.myshopify.com/collections/hot-sell-app?title=主推单品"];
 }
 
+-(void)kwm_gotoClothingSetsPage{
+    [self openURLWithString:[NSString stringWithFormat:@"https://cemarose.myshopify.com/collections/%@",self.clotingSetsHandle]];
+}
+
 #pragma mark - KWMRecommendDelegate KWMClothingSetsDelegate KWMHotSalesDelegate
 -(void)kwm_onClickProduct:(BUYProduct *)product{
 //    NSLog(@"product");
@@ -382,6 +388,7 @@ typedef enum{
         NSString *handle = clothingParam.count > 1 ? clothingParam[1] : nil;
         NSArray *tags = clothingParam.count > 2 ? [clothingParam[2] componentsSeparatedByString:@"+"] : nil;
         if (handle) {
+            self.clotingSetsHandle = handle;
             [self requestProductWithHandle:handle tags:tags valueKeyPath:@"clothingSetsHeader.productArray"];
         }
     }

iCemarose/Header-Prefix.h

@@ -70,6 +70,8 @@
 //额外api domain
 #define Additional_API_DOMAIN @"liang.tofnews.com"
 
+#define WishList_API_DOMAIN @"test.cemarose.com"
+
 #define Pay_API_DOMAIN @"liang.tofnews.com"
 
 //Shopify对应的key（测试用）
@@ -84,6 +86,8 @@
 
 #define Additional_API_DOMAIN @"apps.cemarose.com"
 
+#define WishList_API_DOMAIN @"apps.cemarose.com"
+
 #define Pay_API_DOMAIN @"alipay.cemarose.com"
 
 //Shopify对应的key（正式）