Przeglądaj źródła

fix:bug修改

“wangdongchao” 1 rok temu
rodzic
commit
0d5022aea1

+ 1 - 1
Asteria.xcodeproj/xcshareddata/xcschemes/Asteria.xcscheme

@@ -72,7 +72,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

+ 2 - 2
Asteria/Fuction/UserCenter/Address/ASAddressViewModel.m

@@ -11,7 +11,7 @@
 
 - (void)upAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL,NSString *))complate {
     [ASNetTools.shared formData_postWithPath:saveAddress param:addressModel.params success:^(id _Nonnull json) {
-        [ASUserInfoManager.shared getInfo];
+//        [ASUserInfoManager.shared getInfo];
         complate(true, @"");
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         complate(false, msg);
@@ -28,7 +28,7 @@
 //    }];
     
     [ASNetTools.shared formData_postWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
-        [ASUserInfoManager.shared getInfo];
+//        [ASUserInfoManager.shared getInfo];
         complate(true, @"");
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
         complate(false, msg);

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

@@ -33,7 +33,10 @@
 
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
-    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    if (self.isPay) {
+        //支付成功页面禁止侧滑返回
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
 }
 
 - (void)viewDidAppear:(BOOL)animated {

+ 1 - 16
Asteria/Fuction/UserCenter/Orders/View/ASOrderDetailsItemsCell.m

@@ -13,7 +13,6 @@
 @property (nonatomic, strong) UILabel *nameLab;
 @property (nonatomic, strong) UILabel *countLab;
 @property (nonatomic, strong) UILabel *realPriceLab;
-@property (nonatomic, strong) UILabel *priceLab;
 @property (nonatomic, strong) UILabel *optLab;
 
 @property (nonatomic, strong) UILabel *giftLab;
@@ -64,18 +63,11 @@
             make.left.equalTo(_goodsImage.mas_right).offset(10);
         }];
         
-        _priceLab = [UILabel labelCreateWithText:@"123" font:[UIFont fontWithName:Rob_Regular size:12] textColor:[UIColor colorWithHexString:@"#8c8c8c"]];
-        [backView addSubview:_priceLab];
-        [_priceLab mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerY.mas_equalTo(_countLab);
-            make.right.mas_equalTo(-10);
-        }];
-        
         _realPriceLab = [UILabel labelCreateWithText:@"" font:[UIFont fontWithName:Rob_Bold size:14] textColor:_0B0B0B];
         [backView addSubview:_realPriceLab];
         [_realPriceLab mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.mas_equalTo(_countLab);
-            make.right.mas_equalTo(_priceLab.mas_left).offset(-6);
+            make.right.mas_equalTo(-10);
         }];
         
         _optLab = [UILabel labelCreateWithText:@"" font:[UIFont fontWithName:Rob_Regular size:12] textColor:_0B0B0B];
@@ -114,23 +106,16 @@
         _giftLab.hidden = NO;
         _countLab.hidden = YES;
         _realPriceLab.hidden = YES;
-        _priceLab.hidden = YES;
     }else{
         _giftLab.hidden = YES;
         _countLab.hidden = NO;
         _realPriceLab.hidden = NO;
-        _priceLab.hidden = NO;
     }
     
     _nameLab.text = AS_String_NotNull(_itemModel.name);
     _countLab.text = [NSString stringWithFormat:@"X%@", AS_String_NotNull(_itemModel.qty_ordered)];
     _realPriceLab.text = [NSString stringWithFormat:@"%@%.2f", AS_String_NotNull(_itemModel.currency_symbol), [AS_String_NotNull(_itemModel.price) floatValue]];
     
-    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%.2f",AS_String_NotNull(_itemModel.currency_symbol),  [AS_String_NotNull(_itemModel.original_price) floatValue]]];
-    [priceAtr addAttribute:NSStrikethroughStyleAttributeName
-                    value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
-                    range:NSMakeRange(0, priceAtr.length)];
-    _priceLab.attributedText = priceAtr;
     
     
     NSArray *array = [Current_normalTool arrFromjsonStr:_itemModel.sku];

+ 1 - 1
Asteria/Fuction/UserCenter/Orders/View/ASOrderListCell.m

@@ -40,7 +40,7 @@
     self.statusLb.text = model.state;
     self.timeLB.text = [NSString stringWithFormat:@"Date: %@", model.created_at];
     self.orderNoLB.text = model.increment_id;
-    self.totalNumLb.text = [NSString stringWithFormat:@"%@%@", model.currency_symbol, model.grand_total];
+    self.totalNumLb.text = [NSString stringWithFormat:@"%@%.2f", model.currency_symbol, [model.grand_total floatValue]];
     for (UIView*item in self.prodStackV.arrangedSubviews) {
         if (item.superview) {
             [item removeFromSuperview];

+ 1 - 1
Asteria/Fuction/UserCenter/UserCenterHome/views/KWMineHomeOrderSubView.m

@@ -29,7 +29,7 @@
 - (void)setData:(KWMineOrderProInfoModel *)model canEdit:(BOOL)canEdit {
     self.m = model;
     self.titleLB.text = model.name;
-    self.priceLb.text = [NSString stringWithFormat:@"%@%@",  model.currency_symbol, model.price];
+    self.priceLb.text = [NSString stringWithFormat:@"%@%.2f",  model.currency_symbol, [model.price floatValue]];
     self.numLB.text = model.qty_ordered;
     NSString *imageStr = [NSString stringWithFormat:@"https:%@%@%@",HostPath,ProductImgPath,model.image];
     [self.imgV sd_setImageWithURL:[NSURL URLWithString:imageStr.urlEncode] placeholderImage:[UIImage imageNamed:@"product_defualtImg"]];

+ 5 - 4
Asteria/Tabber/AS_TabBarViewController.m

@@ -76,11 +76,12 @@
             if (![ASUserInfoManager.shared isLogin]) {
                 [Fuction_Tool pop_toLoginVC];
                 return false;
-            } else {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [ASUserInfoManager.shared getInfo];
-                });
             }
+//            else {
+//                dispatch_async(dispatch_get_main_queue(), ^{
+//                    [ASUserInfoManager.shared getInfo];
+//                });
+//            }
         }else if ([vc isKindOfClass:[[CTMediator.sharedInstance Cart_MyCartC:@{}] class]]){
             if (![ASUserInfoManager.shared isLogin]) {
                 [Fuction_Tool pop_toLoginVC];