“wangdongchao” před 1 rokem
rodič
revize
3516fef00e

+ 7 - 0
Asteria/ASUI/SimpleBase/ASBaseViewController.m

@@ -236,6 +236,13 @@
     });
 }
 
+- (void)viewDidDisappear:(BOOL)animated {
+    [super viewDidDisappear:animated];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.tabBarController.tabBar.hidden = self.navigationController.viewControllers.count > 1;
+    });
+}
+
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillAppear:animated];
     

+ 17 - 2
Asteria/Fuction/Cart/Cart_CheckoutC.m

@@ -536,14 +536,25 @@
 //下单
 -(void)requestSureOrder{
     
+    self.bottomView.backView.userInteractionEnabled = NO;
+    
+    K_WEAK_SELF;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        K_STRONG_SELF;
+        self.bottomView.backView.userInteractionEnabled = YES;
+    });
+    
     NSString *paymentCode = self.paymentModel.code;
     
     [ASCheckoutPayManager sharedInstance].cartId = self.totalsM.cart_id;
     [ASCheckoutPayManager sharedInstance].addressModel = self.addressCellM.addressModel;
     [[ASCheckoutPayManager sharedInstance] checkoutPayWithMethodType:paymentCode param:@{@"price":self.totalsM.grand_total, @"currency":self.totalsM.currency_symbol}];
-    K_WEAK_SELF;
+//    K_WEAK_SELF;
     [ASCheckoutPayManager sharedInstance].payFinishBlock = ^(NSString * _Nonnull payMethod, NSUInteger isSucess, id  _Nonnull payData) {
         K_STRONG_SELF;
+        
+        
+        
         NSLog(@"payData======%@", payData);
         NSDictionary *payDic = (NSDictionary *)payData;
         if (isSucess == 1) {
@@ -576,6 +587,10 @@
             
             NSString *msg = [NSString stringWithFormat:@"%@", [payDic objectForKey:@"msg"]];
             
+            if (!AS_String_valid(msg)) {
+                return;
+            }
+            
             if ([msg isEqualToString:@"Payment anomaly"] && [payMethod isEqualToString:@"klarna_kco"]) {
                 [self.view makeToast:msg duration:0.5 position:CSToastPositionCenter];
                 
@@ -587,7 +602,7 @@
                 return;
             }
             
-            [self.view makeToast:@"Payment Failed" duration:0.5 position:CSToastPositionCenter];
+            [self.view makeToast:msg duration:0.5 position:CSToastPositionCenter];
             K_WEAK_SELF;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 K_STRONG_SELF;

+ 1 - 1
Asteria/Fuction/Cart/Cell/MyCartGrandTotalCell.m

@@ -82,7 +82,7 @@
             //wm_todo 需要 获取丢件险状态 carts/mine/fees-information 
             
         }else if ([code isEqualToString:@"grand_total"]){ //subBottomV
-            NSString *priceStr = [NSString stringWithFormat:@"%@%@",model.currency_symbol,dic[@"value"]];
+            NSString *priceStr = [NSString stringWithFormat:@"%@%.2f",model.currency_symbol,[dic[@"value"] floatValue]];
             [self.subBottomV xxx_configTips:dic[@"title"] price:priceStr];
         }else{ //stackSubTopV
             NSString *priceStr = @"0";

+ 1 - 1
Asteria/Fuction/Cart/Checkout/ASAddGiftGoodsView.m

@@ -99,7 +99,7 @@
 
 - (void)_closeClick {
     if (self.addBlock) {
-        self.addBlock(0);
+        self.addBlock(1);
     }
 }
 

+ 2 - 0
Asteria/Fuction/Cart/Checkout/ASCheckoutBottomView.h

@@ -13,6 +13,8 @@ typedef void(^ASCheckoutBottomBlock)(void);
 
 @interface ASCheckoutBottomView : UIView
 
+@property (nonatomic, strong) UIView *backView;
+
 @property (nonatomic, copy) ASCheckoutBottomBlock bottomBlock;
 
 - (void)setBottomPayStyle:(NSString *)payCode;

+ 1 - 1
Asteria/Fuction/Cart/Checkout/ASCheckoutBottomView.m

@@ -9,7 +9,7 @@
 
 @interface ASCheckoutBottomView()
 
-@property (nonatomic, strong) UIView *backView;
+
 @property (nonatomic, strong) UILabel *titleLab;
 @property (nonatomic, strong) UIImageView *titleImageView;
 

+ 2 - 0
Asteria/Fuction/Cart/Checkout/ASCheckoutPointApplyCell.m

@@ -126,6 +126,8 @@
     
     if ([model.usePrice floatValue] > 0.00) {
         self.priceLab.text = [NSString stringWithFormat:@"-%@%@", model.priceSymbol, model.usePrice];
+    } else {
+        self.priceLab.text = @"";
     }
     
     

+ 59 - 30
Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m

@@ -21,6 +21,8 @@
 @property (nonatomic, strong) KlarnaPaymentView *klarna_payV;
 @property (nonatomic, strong) NSString *client_token;
 
+@property (nonatomic, strong) UIViewController *topVC;
+
 @end
 
 
@@ -40,24 +42,27 @@ static ASCheckoutPayManager *_instance = nil;
     
     self.payType = payType;
     
-    UIViewController *topVC = topViewController();
+    self.topVC = topViewController();
     
     if ([payType isEqualToString:@"paypal_express"]) {//paypal
         K_WEAK_SELF;
-        [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+        [MBProgressHUD showHUDAddedTo:self.topVC.view animated:YES];
         [ASNetTools.shared getWithPath:Chectout_Pay_Paypal_Url param:@{} success:^(id _Nonnull json) {
             K_STRONG_SELF;
-            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
             
             NSDictionary *dataDic = (NSDictionary *)json;
             NSString *urlStr = AS_String_NotNull(dataDic[@"url"]);
             dispatch_async(dispatch_get_main_queue(), ^{
-                [self tool_gotoWebPay:urlStr withVC:topVC];
+                [self tool_gotoWebPay:urlStr withVC:self.topVC];
             });
         } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
 //            K_STRONG_SELF;
-            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
-            [topVC.view makeToast:msg duration:2 position:CSToastPositionCenter];
+            [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
+            [self.topVC.view makeToast:msg duration:2 position:CSToastPositionCenter];
+            if (self.payFinishBlock) {
+                self.payFinishBlock(self.payType, 0, @{@"msg":@""});
+            }
         }];
         
     } else if ([payType isEqualToString:@"stripe_payments"]) {//visa
@@ -97,10 +102,10 @@ static ASCheckoutPayManager *_instance = nil;
     } else if ([payType isEqualToString:@"klarna_kco"]) {//klarna
                 
         K_WEAK_SELF;
-        [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+        [MBProgressHUD showHUDAddedTo:self.topVC.view animated:YES];
         [ASNetTools.shared getWithPath:Chectout_Pay_Klarna_Url param:@{} success:^(id _Nonnull json) {
             K_STRONG_SELF;
-            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
             
             NSDictionary *dataDic = (NSDictionary *)json;
             self.client_token = AS_String_NotNull(dataDic[@"client_token"]);
@@ -110,8 +115,12 @@ static ASCheckoutPayManager *_instance = nil;
             NSLog(@"=====%@", json);
         } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
             /*K_STRONG_SELF*/;
-            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
+            [self.topVC.view makeToast:msg duration:2 position:CSToastPositionCenter];
             
+            if (self.payFinishBlock) {
+                self.payFinishBlock(self.payType, 0, @{@"msg":@""});
+            }
         }];
     } else {
         //货到付款
@@ -122,7 +131,6 @@ static ASCheckoutPayManager *_instance = nil;
 #pragma mark ----- stripe支付 、 货到付款方式-----
 //stripe支付(二次校验后生成订单)
 - (void)stripePayCreateOrderid:(NSString *)payid {
-    UIViewController *topVC = topViewController();
     
     NSDictionary *requestParams = nil;
     if ([payid isEqualToString:@""]) {//货到付款方式
@@ -135,11 +143,11 @@ static ASCheckoutPayManager *_instance = nil;
         requestParams = @{@"paymentMethod":param};
     }
     
-    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    [MBProgressHUD showHUDAddedTo:self.topVC.view animated:YES];
     K_WEAK_SELF;
     [ASNetTools.shared putWithPath:Chectout_PUT_sureOrder param:requestParams success:^(id _Nonnull json) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
         
         NSString *orderid = (NSString *)json;
         if (self.payFinishBlock) {
@@ -148,9 +156,10 @@ static ASCheckoutPayManager *_instance = nil;
         
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
+        [self.topVC.view makeToast:msg duration:2 position:CSToastPositionCenter];
         if (self.payFinishBlock) {
-            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+            self.payFinishBlock(self.payType, 0, @{@"msg":@""});
         }
     }];
 }
@@ -167,6 +176,9 @@ static ASCheckoutPayManager *_instance = nil;
             [self requestVerifyPaypalToken:webData];
         } else {
             [tmpvc.view makeToast:[(NSDictionary *)webData objectForKey:@"title"] duration:2 position:CSToastPositionCenter];
+            if (self.payFinishBlock) {
+                self.payFinishBlock(self.payType, 0, @{@"msg":@""});
+            }
         }
     };
     [vc xxx_dsWebLoadUrl:urlStr];
@@ -176,39 +188,57 @@ static ASCheckoutPayManager *_instance = nil;
 
 //paypal支付 Token验证
 - (void)requestVerifyPaypalToken:(NSDictionary *)dic {
-    UIViewController *topVC = topViewController();
     
     NSDictionary *params = @{@"token":[dic objectForKey:@"token"]};
-    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    [MBProgressHUD showHUDAddedTo:self.topVC.view animated:YES];
     K_WEAK_SELF;
-    [ASNetTools.shared postWithPath:Chectout_Verify_PayToken param:params success:^(id _Nonnull json) {
+    [ASNetTools.shared getWithPath:Chectout_Verify_PayToken param:params success:^(id _Nonnull json) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
+        
         
         NSDictionary *payReturnDic = (NSDictionary *)json;
-        NSString *orderid = [payReturnDic objectForKey:@"id"];
+        
+        NSString *orderid = [payReturnDic objectForKey:@"incrementId"];
         if (self.payFinishBlock) {
             self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
         }
-        
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
         if (self.payFinishBlock) {
             self.payFinishBlock(self.payType, 0, @{@"msg":msg});
         }
     }];
+    
+    
+//    [ASNetTools.shared postWithPath:Chectout_Verify_PayToken param:params success:^(id _Nonnull json) {
+//        K_STRONG_SELF;
+//        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+//        
+//        
+//        NSDictionary *payReturnDic = (NSDictionary *)json;
+//        NSString *orderid = [payReturnDic objectForKey:@"id"];
+//        if (self.payFinishBlock) {
+//            self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
+//        }
+//        
+//    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+//        K_STRONG_SELF;
+//        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+//        if (self.payFinishBlock) {
+//            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+//        }
+//    }];
 }
 
 #pragma mark ----- klarna支付验证 -----
 //klarna支付验证
 -(void)tool_verifyOrderAutoken:(NSString *)authToken{
-    
-    UIViewController *topVC = topViewController();
-    
+        
     NSDictionary *params = @{@"authorization_token":authToken};
     
-    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    [MBProgressHUD showHUDAddedTo:self.topVC.view animated:YES];
     K_WEAK_SELF;
     [ASNetTools.shared postWithPath:Chectout_Verify_KlarnaCart param:params success:^(id _Nonnull json) {
         K_STRONG_SELF;
@@ -226,7 +256,7 @@ static ASCheckoutPayManager *_instance = nil;
         
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
         
         if (self.payFinishBlock) {
             self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment anomaly"});
@@ -236,7 +266,6 @@ static ASCheckoutPayManager *_instance = nil;
 
 //klarna支付
 -(void)tool_creatOrderAutoken:(NSString *)authToken{
-    UIViewController *topVC = topViewController();
 
     self.client_token = authToken;
     
@@ -252,7 +281,7 @@ static ASCheckoutPayManager *_instance = nil;
     K_WEAK_SELF;
     [ASNetTools.shared postWithPath:Chectout_Verify_KlarnaToken param:params success:^(id _Nonnull json) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
         
         NSString *orderid = (NSString *)json;
         NSLog(@"=======%@", orderid);
@@ -262,7 +291,7 @@ static ASCheckoutPayManager *_instance = nil;
         
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        [MBProgressHUD hideHUDForView:self.topVC.view animated:YES];
         
         if (self.payFinishBlock) {
             self.payFinishBlock(self.payType, 0, @{@"msg":msg});
@@ -291,7 +320,7 @@ static ASCheckoutPayManager *_instance = nil;
         
     } else {
         if (self.payFinishBlock) {
-            self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment Failed"});
+            self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment Failed/Cancel"});
         }
         NSLog(@"klarna 授权支付失败");
     }

+ 17 - 11
Asteria/Fuction/Goods/VC/AS_GoodsSizeC.m

@@ -95,19 +95,24 @@
         make.height.mas_equalTo(40);
     }];
     
-    [self.saveLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-10);
-        make.height.mas_equalTo(20);
-        make.centerY.equalTo(self.priceLab);
-    }];
-    
     [self.priceLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.sel_headImg.mas_right).offset(10);
-        make.right.equalTo(self.saveLab.mas_left).offset(-4);
+//        make.right.equalTo(self.saveLab.mas_left).offset(-4);
+        make.width.mas_lessThanOrEqualTo((KScreenWidth - 128)/3 * 2);
         make.bottom.equalTo(self.sel_headImg);
         make.height.mas_equalTo(24);
     }];
     
+    [self.saveLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.priceLab.mas_right).offset(5);
+        make.height.mas_equalTo(20);
+        make.centerY.equalTo(self.priceLab);
+        make.width.mas_lessThanOrEqualTo((KScreenWidth - 128)/3);
+
+    }];
+    
+    
+    
     CGFloat tableVorgY = CGRectGetMaxY(self.sel_headImg.frame)+20;
     [self setupTableV:[GoodsSizeSelectTableV class] Frame:CGRectMake(0, tableVorgY, KScreenWidth, KScreenHeight-tableVorgY-self.bottomV.mj_h)];
     
@@ -129,7 +134,7 @@
     }else{
         self.saveLab.hidden = NO;
         double savePrice = [model.price doubleValue]-[model.final_prices doubleValue];
-        self.saveLab.text = [NSString stringWithFormat:@"Save %@%.2f",model.currency_symbol,savePrice];
+        self.saveLab.text = [NSString stringWithFormat:@"  Save %@%.2f  ",model.currency_symbol,savePrice];
     }
     for (OptionsModel *optM in model.options) {
         optM.optionSelectTag = 0;
@@ -159,7 +164,7 @@
         add_price  =  add_price + valuesM.price;
     }
     
-    float discount = 0;
+    float discount = [self.model.percent floatValue];
     if (discount == 0) {
         //优惠价
         CGFloat add_final_price_f = (add_price + [self.model.final_prices floatValue]) * self.xxx_quantityNum;
@@ -180,7 +185,7 @@
     self.priceLab.attributedText = [ASGoodsDetailsVM tool_addOptionPrice:add_price quantity:self.xxx_quantityNum infoMoel:self.model];
     
     CGFloat savePrice = ([self.model.show_prices doubleValue]-[self.model.show_final_prices doubleValue]);
-    self.saveLab.text = [NSString stringWithFormat:@"Save %@%.2f",self.model.currency_symbol,savePrice];
+    self.saveLab.text = [NSString stringWithFormat:@"  Save %@%.2f  ",self.model.currency_symbol,savePrice];
     
     CGFloat add_final_price_f = [self.model.show_final_prices doubleValue];
     [self refresh_PayViewchangeValueCell:add_final_price_f];
@@ -282,11 +287,12 @@
 - (QMUILabel *)saveLab {
     if (!_saveLab) {
         _saveLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _saveLab.contentEdgeInsets= UIEdgeInsetsMake(10, 10, 10, 10);
+//        _saveLab.contentEdgeInsets= UIEdgeInsetsMake(10, 10, 10, 10);
         _saveLab.backgroundColor = [UIColor colorWithHexString:@"#E0FFF5"];
         _saveLab.textAlignment = NSTextAlignmentCenter;
         _saveLab.textColor = [UIColor colorWithHexString:@"#113632"];
         _saveLab.font = [UIFont fontWithName:Rob_Bold size:12];
+        _saveLab.adjustsFontSizeToFitWidth = YES;
     }
     return  _saveLab;
 }

+ 15 - 1
Asteria/Fuction/UserCenter/Address/ASAddressViewModel.m

@@ -19,12 +19,26 @@
 }
 
 - (void)deleteAnAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL,NSString *))complate {
-    [ASNetTools.shared getWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
+    
+//    [ASNetTools.shared postWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
+//        [ASUserInfoManager.shared getInfo];
+//        complate(true, @"");
+//    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+//        complate(false, msg);
+//    }];
+    
+    [ASNetTools.shared formData_postWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
         [ASUserInfoManager.shared getInfo];
         complate(true, @"");
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         complate(false, msg);
     }];
+    
+//    [ASNetTools.shared getWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
+//        
+//    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+//        
+//    }];
 }
 
 - (void)getCountryList:(void(^)(void))success  {

+ 1 - 1
Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m

@@ -60,7 +60,7 @@
     
     [self loadSubV];
     
-//    [self requestOrderDetailsData];
+    [self requestOrderDetailsData];
 }
 
 - (void)requestOrderDetailsData {

+ 2 - 0
Asteria/Fuction/UserCenter/Points/ASPointDetailViewController.m

@@ -286,6 +286,7 @@
 - (ASPointDetailTableView *)allTableV {
     if (!_allTableV) {
         ASPointDetailTableView *v = [[ASPointDetailTableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        v.estimatedRowHeight = 50;
         _allTableV = v;
     }
     return _allTableV;
@@ -294,6 +295,7 @@
 - (ASPointDetailTableView *)usedTableV {
     if (!_usedTableV) {
         ASPointDetailTableView *v = [[ASPointDetailTableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        v.estimatedRowHeight = 50;
         _usedTableV = v;
     }
     return _usedTableV;

+ 5 - 2
Asteria/Fuction/UserCenter/Points/view/ASPointDetailCell.m

@@ -61,7 +61,7 @@
     
     [self.bgV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self.contentView);
-        make.height.equalTo(@80);
+//        make.height.equalTo(@80);
     }];
     
     [self.bgV addSubview:self.lineV];
@@ -74,9 +74,11 @@
     [self.titleLb mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgV).offset(10);
         make.top.equalTo(self.bgV).offset(20);
+        make.right.equalTo(self.bgV).offset(-120);
         make.height.greaterThanOrEqualTo(@17);
     }];
     [self.dateLb mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.titleLb.mas_bottom).offset(12);
         make.left.equalTo(self.bgV).offset(10);
         make.height.equalTo(@14);
         make.bottom.equalTo(self.bgV).offset(-20);
@@ -87,7 +89,7 @@
         make.left.equalTo(self.titleLb.mas_right).offset(30);
         make.top.equalTo(self.titleLb);
         make.height.equalTo(@14);
-        make.width.greaterThanOrEqualTo(@60);
+        make.width.mas_equalTo(@100);
     }];
     
     [self.elsePointsLb setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
@@ -120,6 +122,7 @@
         lb.numberOfLines = 1;
         [lb setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
         _pointsLb = lb;
+        _pointsLb.adjustsFontSizeToFitWidth = YES;
     }
     return _pointsLb;
 }

+ 2 - 2
Asteria/NetTools/ASNetTools.m

@@ -542,8 +542,8 @@
                     faild(status, msg);
                 }
             } else {
-//                NSString *msg = @"failed";
-//                faild(0, nil);
+                NSString *msg = @"failed";
+                faild(0, @"");
             }
             
         });