fix bug,fix address back

iCemarose/Class/UI/NewProduct/KWMNewProductVC.m

@@ -226,6 +226,10 @@
         [self kwm_onClickSizeBtn];
         return;
     }
+    if(buyNow) {
+        [self addShopWithVariantId:self.variant.identifier quantity:self.count variant:self.variant buyNow:YES callback:^(BOOL _){}];
+        return;
+    }
     __weak KWMNewProductVC *this = self;
     // TODO: this
     NSArray<KWMShopCartModel *> *items = [[KWMShoppingCart sharedInstance] items];

iCemarose/Class/UI/ShopCart/KWMSelectAddressVC.m

@@ -275,7 +275,14 @@
 }
 
 -(void)kwm_cancel{
-    [[self navigationController] popViewControllerAnimated:YES];
+    KWMBeforePayVC *vc = (KWMBeforePayVC *)self.delegate;
+    if (vc.address) {
+        [[self navigationController] popViewControllerAnimated:YES];
+    }else{
+        NSArray *vcs = [[self navigationController] viewControllers];
+        id top = [vcs objectAtIndex:vcs.count - 3];
+        [[self navigationController] popToViewController:top animated:YES];
+    }
 }
 
 -(BOOL) navigationShouldPopOnBackButton {

iCemarose/Header-Prefix.h

@@ -76,6 +76,8 @@
 #define WishList_API_DOMAIN @"test.cemarose.com"
 
 #define Pay_API_DOMAIN @"liang.tofnews.com"
+// Chris Test
+#define Pay_API_DOMAIN @"chris.tofnews.com"
 
 //Shopify对应的key（测试用）
 #define Shopify_SHOP_DOMAIN @"cemarose-test.myshopify.com"
@@ -91,10 +93,8 @@
 
 #define WishList_API_DOMAIN @"apps.cemarose.com"
 
-// Chris Test
-#define Pay_API_DOMAIN @"chris.tofnews.com"
 // Production
-//#define Pay_API_DOMAIN @"alipay.cemarose.com"
+#define Pay_API_DOMAIN @"alipay.cemarose.com"
 
 
 //Shopify对应的key（正式）