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

iCemarose.xcodeproj/project.pbxproj

@@ -3024,7 +3024,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.kollway.cemarose;
 				PRODUCT_NAME = Cemarose;
-				PROVISIONING_PROFILE = "69b2b79b-9e23-4461-84e1-d6a05cdb90fa";
+				PROVISIONING_PROFILE = "6418b86d-f979-4a16-92fd-3e47c5f5ae06";
 				PROVISIONING_PROFILE_SPECIFIER = ios_distribution_dev_cemarose;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -3096,8 +3096,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.kollway.cemarose;
 				PRODUCT_NAME = Cemarose;
-				PROVISIONING_PROFILE = "69b2b79b-9e23-4461-84e1-d6a05cdb90fa";
-				PROVISIONING_PROFILE_SPECIFIER = ios_distribution_dev_cemarose;
+				PROVISIONING_PROFILE = "de8d5d4b-22ac-4e5d-ab5e-87ac04c3d35b";
+				PROVISIONING_PROFILE_SPECIFIER = ios_distribution_appstore_cemarose;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

iCemarose/Class/AppDelegate+Deeplink.m

@@ -50,14 +50,17 @@ static NSMutableDictionary *controllerCache = nil;
         NSDictionary *brandNames = @{@"amelie-wang":@"Amelie Wang",@"babywalker":@"Babywalker",@"beau-loves":@"Beau Loves",@"billieblush":@"Billieblush",@"billybandit":@"Billybandit",@"bonpoint":@"Bonpoint",@"burberry":@"Burberry",@"caramel":@"Caramel",@"chloe":@"Chloé",@"dolce-gabbana":@"Dolce & Gabbana",@"emile-et-ida":@"Emile et Ida",@"fendi":@"Fendi",@"givenchy":@"Givenchy",@"gucci":@"Gucci",@"hucklebones":@"Hucklebones",@"il-gufo":@"Il Gufo",@"indikidual":@"Indikidual",@"karl-lagerfeld-kids":@"Karl Lagerfeld Kids",@"kenzo":@"Kenzo",@"lanvin":@"Lanvin",@"little-marc-jacobs":@"Little Marc Jacobs",@"loud-apparel":@"Loud Apparel",@"louis-louise":@"Louis Louise",@"louise-misha":@"Louise Misha",@"marie-chantal":@"Marie-Chantal",@"marni":@"Marni",@"mini-melissa":@"Mini Melissa",@"mini-rodini":@"Mini Rodini",@"mischka-aoki":@"Mischka Aoki",@"moncler":@"Moncler",@"moschino":@"MOSCHINO",@"msgm":@"MSGM",@"nailmatic":@"Nailmatic",@"nana-huchy":@"Nana Huchy",@"noukies":@"Noukie's",@"oeuf":@"Oeuf",@"patachou":@"Patachou",@"paul-smith":@"Paul Smith",@"pepe":@"PèPè",@"sons-daughters-eyewear":@"Sons + Daughters Eyewear",@"stella-mccartney-kids":@"Stella McCartney Kids",@"story-loris":@"Story Loris",@"tartine-et-chocolat":@"Tartine et Chocolat",@"the-animals-observatory":@"The Animals Observatory",@"tiny-cottons":@"Tiny Cottons",@"tip-toey-joey":@"Tip Toey Joey",@"veja":@"Veja",@"young-versace":@"Young Versace",@"zadig-voltaire":@"Zadig & Voltaire"};
         //将handle的转化放到这里,转化之前将没转化过的handle存为标题
         NSString *title = handle;
-        handle = [[KWMStringUtil deleteOtherCharExceptLetterWithLine:handle] lowercaseString];
+//        handle = [[KWMStringUtil deleteOtherCharExceptLetterWithLine:handle] lowercaseString];
+        if (parameters[@"title"]) {
+            title = parameters[@"title"];
+        }
         if ([brands containsObject:[handle lowercaseString]]) {
             KWMBrandCaramelVC *brandCaramelVC = [KWMBrandCaramelVC getNewInstance];
             brandCaramelVC.isSale = NO;
             brandCaramelVC.handle = handle;
             //brandCaramelVC.brand = brandNames[[handle lowercaseString]];
-            brandCaramelVC.brand = title;
-            brandCaramelVC.title = brandCaramelVC.brand;
+            brandCaramelVC.brand = brandNames[handle];
+            brandCaramelVC.title = title;
             [self pushViewController:brandCaramelVC];
             [controllerCache setObject:brandCaramelVC forKey:url];
         }else{

iCemarose/Class/UI/NewHome/KWMNewHomeVC.m

@@ -204,6 +204,10 @@ typedef enum{
 }
 
 -(void)kwm_onClickFocusImage {
+//#if DEBUG
+//    [self openURLWithString:@"https://test.cemarose.com/static/wd/weeklydeal.htm"];
+//    return;
+//#endif
     if (![KWMStringUtil isBlank:self.homeData.clothing_sets.action]) {
         [self openURLWithString:self.homeData.clothing_sets.action];
     }

iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m

@@ -276,7 +276,7 @@
 
 -(void)kwm_cancel{
     KWMBeforePayVC *vc = (KWMBeforePayVC *)self.delegate;
-    if (vc.address) {
+    if (![KWMValidateUtil validateAddress:vc.address]) {
         [[self navigationController] popViewControllerAnimated:YES];
     }else{
         NSArray *vcs = [[self navigationController] viewControllers];