diff --git a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m index d36eb08..93a78cc 100644 --- a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m +++ b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m @@ -470,7 +470,12 @@ AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; if (self.cartCookie) { [manager.requestSerializer setHTTPShouldHandleCookies:NO]; - NSString *cookie = [[KWMHttpUtil buildRequestCookieString] stringByReplacingOccurrencesOfRegex:@"cart=.*?;" withString:[NSString stringWithFormat:@"cart=%@;",self.cartCookie]]; + NSString *cookie = [KWMHttpUtil buildRequestCookieString]; + if ([cookie isMatchedByRegex:@"cart=.*?;"]) { + cookie = [cookie stringByReplacingOccurrencesOfRegex:@"cart=.*?;" withString:[NSString stringWithFormat:@"cart=%@;",self.cartCookie]]; + }else{ + cookie = [NSString stringWithFormat:@"cart=%@; %@",self.cartCookie,cookie]; + } [manager.requestSerializer setValue:cookie forHTTPHeaderField:@"Cookie"]; } [manager setTaskWillPerformHTTPRedirectionBlock:^NSURLRequest * _Nonnull(NSURLSession * _Nonnull session, NSURLSessionTask * _Nonnull task, NSURLResponse * _Nonnull response, NSURLRequest * _Nonnull request) { @@ -502,7 +507,7 @@ this.checkout = checkout; [this initData]; [this.userDao saveCheckoutCache:responseObject[@"checkout"]]; - if(!this.checkout.shippingRate) { + if(this.checkout.shippingAddress && !this.checkout.shippingRate) { [this requestShippingData]; } } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { diff --git a/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m b/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m index 926cf43..10daa08 100644 --- a/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m +++ b/iCemarose/Class/UI/ShopCart/KWMShopCartVC.m @@ -50,12 +50,17 @@ [self setTotalPrice]; __weak typeof(self) this = self; - [[KWMShoppingCart sharedInstance] allItemsWithCallback:^(NSError *error, KWMCartResult *cart) { - [this refresh]; - }]; + + dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)); + dispatch_after(delay, dispatch_get_main_queue(), ^{ + [[KWMShoppingCart sharedInstance] allItemsWithCallback:^(NSError *error, KWMCartResult *cart) { + [this refresh]; + }]; + }); } + -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ if (_shopCartList.count == 0) {