删除部分无用代码

Asteria.xcodeproj/project.pbxproj

@@ -300,7 +300,6 @@
 		9ACBEC252A14707400A8F97A /* AS_SignUpC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ACBEC242A14707400A8F97A /* AS_SignUpC.m */; };
 		9ACBEC282A1472AF00A8F97A /* LoginSignUpV.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ACBEC272A1472AF00A8F97A /* LoginSignUpV.m */; };
 		9ACBEC2B2A14CCA300A8F97A /* ThirdPartService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ACBEC292A14CCA200A8F97A /* ThirdPartService.m */; };
-		9AD3459E2A08D545005CA070 /* GoodsDetailSrcView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD3459D2A08D545005CA070 /* GoodsDetailSrcView.m */; };
 		9AD345A72A08D571005CA070 /* TYPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD345A32A08D571005CA070 /* TYPageControl.m */; };
 		9AD345A82A08D571005CA070 /* TYCyclePagerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD345A42A08D571005CA070 /* TYCyclePagerView.m */; };
 		9AD345A92A08D571005CA070 /* TYCyclePagerTransformLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD345A52A08D571005CA070 /* TYCyclePagerTransformLayout.m */; };
@@ -341,7 +340,6 @@
 		9AD346192A08D679005CA070 /* GoodsBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD346182A08D679005CA070 /* GoodsBannerModel.m */; };
 		9AD3461D2A08D6F0005CA070 /* GoodsInformationM.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD3461C2A08D6EF005CA070 /* GoodsInformationM.m */; };
 		9AD346202A08E30E005CA070 /* SelectVCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD3461F2A08E30E005CA070 /* SelectVCollectionViewCell.m */; };
-		9AD364C62A05E73E00452C7A /* AS_GoodsDetailsC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD364C52A05E73E00452C7A /* AS_GoodsDetailsC.m */; };
 		9AD364D12A05EC7800452C7A /* AS_TabBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD364D02A05EC7800452C7A /* AS_TabBarViewController.m */; };
 		9AD4D3972B48E8780086D6FB /* ReviewsTableHearV.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD4D3962B48E8780086D6FB /* ReviewsTableHearV.m */; };
 		9AD4D39E2B48F5680086D6FB /* NSMutableAttributedString+RYText.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD4D39D2B48F5680086D6FB /* NSMutableAttributedString+RYText.m */; };
@@ -933,8 +931,6 @@
 		9ACBEC272A1472AF00A8F97A /* LoginSignUpV.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginSignUpV.m; sourceTree = "<group>"; };
 		9ACBEC292A14CCA200A8F97A /* ThirdPartService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdPartService.m; sourceTree = "<group>"; };
 		9ACBEC2A2A14CCA200A8F97A /* ThirdPartService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdPartService.h; sourceTree = "<group>"; };
-		9AD3459C2A08D545005CA070 /* GoodsDetailSrcView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GoodsDetailSrcView.h; sourceTree = "<group>"; };
-		9AD3459D2A08D545005CA070 /* GoodsDetailSrcView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoodsDetailSrcView.m; sourceTree = "<group>"; };
 		9AD345A12A08D571005CA070 /* TYCyclePagerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TYCyclePagerView.h; sourceTree = "<group>"; };
 		9AD345A22A08D571005CA070 /* TYCyclePagerTransformLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TYCyclePagerTransformLayout.h; sourceTree = "<group>"; };
 		9AD345A32A08D571005CA070 /* TYPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TYPageControl.m; sourceTree = "<group>"; };
@@ -1018,8 +1014,6 @@
 		9AD3461E2A08E30E005CA070 /* SelectVCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SelectVCollectionViewCell.h; sourceTree = "<group>"; };
 		9AD3461F2A08E30E005CA070 /* SelectVCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SelectVCollectionViewCell.m; sourceTree = "<group>"; };
 		9AD346212A08E828005CA070 /* ProjectConfigDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProjectConfigDefine.h; sourceTree = "<group>"; };
-		9AD364C42A05E73E00452C7A /* AS_GoodsDetailsC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_GoodsDetailsC.h; sourceTree = "<group>"; };
-		9AD364C52A05E73E00452C7A /* AS_GoodsDetailsC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AS_GoodsDetailsC.m; sourceTree = "<group>"; };
 		9AD364CF2A05EC7800452C7A /* AS_TabBarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_TabBarViewController.h; sourceTree = "<group>"; };
 		9AD364D02A05EC7800452C7A /* AS_TabBarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AS_TabBarViewController.m; sourceTree = "<group>"; };
 		9AD4D3952B48E8780086D6FB /* ReviewsTableHearV.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReviewsTableHearV.h; sourceTree = "<group>"; };
@@ -2135,8 +2129,8 @@
 		9A337E352A04EE1A00D058A5 /* Tatgets */ = {
 			isa = PBXGroup;
 			children = (
-				9A337E362A04EE1A00D058A5 /* Target_B.m */,
 				9A337E372A04EE1A00D058A5 /* Target_B.h */,
+				9A337E362A04EE1A00D058A5 /* Target_B.m */,
 			);
 			path = Tatgets;
 			sourceTree = "<group>";
@@ -2538,8 +2532,6 @@
 			children = (
 				9A31EDFE2B469A73009F11EE /* AS_GoodsReviewsListC.h */,
 				9A31EDFF2B469A73009F11EE /* AS_GoodsReviewsListC.m */,
-				9AD364C42A05E73E00452C7A /* AS_GoodsDetailsC.h */,
-				9AD364C52A05E73E00452C7A /* AS_GoodsDetailsC.m */,
 				9A5F52882B5F56FD007D3791 /* AS_GoodsSizeC.h */,
 				9A5F52892B5F56FD007D3791 /* AS_GoodsSizeC.m */,
 				8810F57C2BF74A2B00346FD4 /* ASGoodsDetailsViewController.h */,
@@ -2551,11 +2543,9 @@
 		9AD364C72A05E76D00452C7A /* V */ = {
 			isa = PBXGroup;
 			children = (
-				9AD3459C2A08D545005CA070 /* GoodsDetailSrcView.h */,
-				9AD3459D2A08D545005CA070 /* GoodsDetailSrcView.m */,
+				9AD3459F2A08D55D005CA070 /* Banner */,
 				9A3F5CB62B3BF90100DDB6A7 /* GoodsDetailsIntroduceV.h */,
 				9A3F5CB72B3BF90100DDB6A7 /* GoodsDetailsIntroduceV.m */,
-				9AD3459F2A08D55D005CA070 /* Banner */,
 				9A3F5CB92B3C192000DDB6A7 /* GoodsDetailsBottomV.h */,
 				9A3F5CBA2B3C192000DDB6A7 /* GoodsDetailsBottomV.m */,
 				8810F57F2BF74A5800346FD4 /* ASGoodsDetailsTableView.h */,
@@ -3086,7 +3076,6 @@
 				81E195182C01664E005471A1 /* APPassForgetNewPassV.m in Sources */,
 				81056D5C2B60F571009219A3 /* ASHelpListUrlModel.m in Sources */,
 				9AD346082A08D60F005CA070 /* ZFIJKPlayerManager.m in Sources */,
-				9AD3459E2A08D545005CA070 /* GoodsDetailSrcView.m in Sources */,
 				81DFA56D2A46D86500DA708B /* ASPointDetailModel.m in Sources */,
 				9AD346022A08D60F005CA070 /* ZFPlayerView.m in Sources */,
 				9A78E01C2B639F4700CA4E32 /* CartTotalsM.m in Sources */,
@@ -3204,7 +3193,6 @@
 				81717D102A3C4AE000648139 /* KWHisAndHotWordsViewModel.m in Sources */,
 				9AD3460D2A08D60F005CA070 /* ZFLandScapeControlView.m in Sources */,
 				8810F5122BEB685500346FD4 /* ASCheckoutPaymentCell.m in Sources */,
-				9AD364C62A05E73E00452C7A /* AS_GoodsDetailsC.m in Sources */,
 				8120211E2B15F2B30026B8B5 /* ASVipUrlTempModel.m in Sources */,
 				8193D5CE2BEA2B8E00B9AB11 /* ASAddressViewModel.m in Sources */,
 				8810F5A22BFF448C00346FD4 /* ASMyCartNoDataView.m in Sources */,

Asteria.xcodeproj/xcshareddata/xcschemes/Asteria.xcscheme

@@ -52,7 +52,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -72,7 +72,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

Asteria/Base/RYNetWork/RYBaseVM.m

@@ -39,10 +39,13 @@
     }];
 }
 -(void)ry_requestGetApi:(NSString *)mark param:(NSDictionary *)param{
+    K_WEAK_SELF;
     [ASNetTools.shared getWithPath:mark param:param success:^(id _Nonnull  json) {
+        K_STRONG_SELF;
         NSLog(@"mark--%@--param-%@\n-json--%@",mark,param,json);
         [self ry_respnsSucessWithPath:mark data:json reqNetType:GetReqNetType];
     } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        K_STRONG_SELF;
         NSLog(@"mark--%@--param-%@\n-Error--%@",mark,param,msg);
         [self ry_reponsFaildWithPath:mark code:code msg:msg reqNetType:GetReqNetType];
     }];

Asteria/Fuction/Cart/Cart_MyCartC.m

@@ -88,6 +88,8 @@
     [self setupTableV:[MyCarlTableV class] Frame:CGRectMake(0, CGRectGetMaxY(self.topBgV.frame), KScreenWidth, KScreenHeight-securityBottom_H - 65- CGRectGetMaxY(self.topBgV.frame)-self.postBtn.mj_h)];
     self.TableV.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
     
+    self.TableV.bounces = NO;
+    
     [self.view addSubview:self.postBtn];
     self.postBtn.mj_y = CGRectGetMaxY(self.TableV.frame);
     
@@ -418,7 +420,6 @@
         _postBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         _postBtn.layer.cornerRadius = 4;
         _postBtn.clipsToBounds = YES;
-        IPhoneXHeigh
         _postBtn.frame = CGRectMake(10, 0, KScreenWidth-20, 45);
         _postBtn.backgroundColor = [UIColor colorWithHexString:@"#000000"];
         [_postBtn setTitleColor:[UIColor colorWithHexString:@"#FFFFFF"] forState:UIControlStateNormal];

Asteria/Fuction/Goods/Revies/V/GoodsReviewsListTableV.m

@@ -15,9 +15,9 @@
     GoodsReviewsListM *objectM =  self.infodata[indexPath.row];
     GoodsReviewsCell *cell = [GoodsReviewsCell cellWithTableView:tableView CellClass:[GoodsReviewsCell class]];
     [cell configData:objectM];
-    @weakify(cell)
+//    @weakify(cell)
     cell.currencyparameterClose = ^(NSInteger type, id Data) {
-        @strongify(cell) //图片选择器展示
+//        @strongify(cell) //图片选择器展示
         
         NSArray *imageArr = (NSArray *)Data;
         NSMutableArray *photos = [[NSMutableArray alloc]init];

Asteria/Fuction/Goods/V/GoodsDetailSrcView.h

@@ -1,22 +0,0 @@
-//
-//  GoodsDetailSrcView.h
-//  Asteria
-//
-//  Created by 王猛 on 2023/5/8.
-//
-
-
-
-NS_ASSUME_NONNULL_BEGIN
-typedef NS_ENUM(NSUInteger,DetailsSrcType){
-    GoodsBannerTag = 1000  ,
-    GoodsReviewsTag = 2000,
-    
-    
-} ;
-
-@interface GoodsDetailSrcView : TT_BaseScrollView
-
-@end
-
-NS_ASSUME_NONNULL_END

Asteria/Fuction/Goods/V/GoodsDetailSrcView.m

@@ -1,449 +0,0 @@
-//
-//  GoodsDetailSrcView.m
-//  Asteria
-//
-//  Created by 王猛 on 2023/5/8.
-//
-
-#import "GoodsDetailSrcView.h"
-#import "WKM_goodsBanner.h"
-#import "GoodsDetailsPayV.h"
-#import "GoodsDetailsIntroduceV.h"
-#import "RadioButton.h"
-
-@interface GoodsDetailSrcView ()<WKNavigationDelegate,TT_BaseTableVDelegate>
-@property (nonatomic, strong) GoodsInformationM *infoModel;
-@property (nonatomic, strong) WKM_goodsBanner *goodsBanner;
-@property (nonatomic, strong) QMUILabel *titleLab;
-@property (nonatomic, strong) QMUILabel *soldLab;
-@property (nonatomic, strong) QMUILabel *reviewsLab;
-@property (nonatomic, strong) QMUILabel *priceLab;
-@property (nonatomic, strong) QMUILabel *saveLab;
-@property (nonatomic, strong) QMUILabel *couponLab;
-@property (nonatomic, strong) QMUILabel *sizeLab;
-@property (nonatomic, strong) GoodsDetailsPayV *datails_payV;
-@property (nonatomic, strong) GoodsDetailsIntroduceV *datails_IntroduceV;
-@property (nonatomic, strong) NSMutableArray *radioBtnAry;
-@property (nonatomic, strong)WKWebView  *wkWebView;
-
-
-
-@end
-
-@implementation GoodsDetailSrcView
-
-- (void)tt_addsubviewS{
-    [self addSubview:self.goodsBanner];
-    [self addSubview:self.titleLab];
-    [self addSubview:self.soldLab];
-    [self addSubview:self.reviewsLab];
-    [self addSubview:self.priceLab];
-    [self addSubview:self.saveLab];
-    [self addSubview:self.couponLab];
-    [self addSubview:self.sizeLab];
-    [self addSubview:self.datails_payV];
-    [self addSubview:self.datails_IntroduceV];
-    
-    [self.goodsBanner mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.top.mas_equalTo(0);
-        make.width.mas_equalTo(KScreenWidth);
-        make.height.mas_equalTo(KScreenWidth+112+10);
-    }];
-    [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.width.mas_equalTo(KScreenWidth-20);
-        make.top.equalTo(self.goodsBanner.mas_bottom).offset(20);
-        make.height.mas_equalTo(45);
-    }];
-    [self.soldLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.height.mas_equalTo(16);
-        make.top.equalTo(self.titleLab.mas_bottom).offset(10);
-    }];
-    [self.reviewsLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.titleLab.mas_right);
-        make.height.mas_equalTo(16);
-        make.top.equalTo(self.titleLab.mas_bottom).offset(10);
-    }];
-    [self.priceLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.top.equalTo(self.reviewsLab.mas_bottom).offset(20);
-        make.height.mas_equalTo(24);
-    }];
-    [self.saveLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.priceLab.mas_right).offset(10);
-        make.height.mas_equalTo(20);
-        make.centerY.equalTo(self.priceLab);
-    }];
-    [self.couponLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.top.equalTo(self.priceLab.mas_bottom).offset(20);
-        make.width.mas_equalTo(KScreenWidth-20);
-        make.height.mas_equalTo(45);
-    }];
-    [self.sizeLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.top.equalTo(self.couponLab.mas_bottom).offset(10);
-        make.width.mas_equalTo(KScreenWidth-20);
-        make.height.mas_equalTo(45);
-    }];
-    [self.datails_payV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.top.equalTo(self.sizeLab.mas_bottom).offset(10);
-        make.width.mas_equalTo(KScreenWidth-20);
-        make.height.mas_equalTo(78);
-    }];
-    [self.datails_IntroduceV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(10);
-        make.top.equalTo(self.datails_payV.mas_bottom).offset(10);
-        make.width.mas_equalTo(KScreenWidth-20);
-        make.height.mas_equalTo(120);
-    }];
-    NSArray *titleAry = @[@"PRODUCT DETAILS",@"REVIEWS"];
-    for (int i= 0; i<titleAry.count; i++) {
-        RadioButton *radBtn= [[RadioButton alloc]init];
-        radBtn.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
-        radBtn.titleLabel.font = [UIFont fontWithName:Rob_Bold size:14];
-        radBtn.layer.cornerRadius = 4;
-        radBtn.clipsToBounds = YES;
-        radBtn.tag = i;
-        [radBtn setTitle:titleAry[i] forState:UIControlStateNormal];
-        [radBtn setTitleColor:[UIColor colorWithHexString:@"#000000"] forState:UIControlStateNormal];
-        [radBtn setTitleColor:[UIColor colorWithHexString:@"#FFFFFF"] forState:UIControlStateSelected];
-        [radBtn addTarget:self action:@selector(xxx_onRadioButtonValueChanged:) forControlEvents:UIControlEventValueChanged];
-        [self addSubview:radBtn];
-        [self.radioBtnAry addObject:radBtn];
-        CGFloat btnWidth = (KScreenWidth -30)/2;
-        [radBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(10+(10+btnWidth)*i);
-            make.height.mas_equalTo(40);
-            make.top.equalTo(self.datails_IntroduceV.mas_bottom).offset(20);
-            make.width.mas_equalTo(btnWidth);
-        }];
-    }
-    RadioButton *firstBtn = self.radioBtnAry[0];
-    [firstBtn setGroupButtons:self.radioBtnAry];
-    [self.radioBtnAry[0] setSelected:YES];
-    [self xxx_onRadioButtonValueChanged:self.radioBtnAry[0]];
-
- 
-    
-    [self addSubview:self.wkWebView];
-    [self.wkWebView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(0);
-        make.top.equalTo(self.datails_IntroduceV.mas_bottom).offset(80);
-        make.width.mas_equalTo(KScreenWidth);
-    }];
-    
-    
-}
-
-- (void)tt_configData:(id)data{
- 
-
-    
-    GoodsInformationM *model = (GoodsInformationM *)data;
-    self.infoModel = model;
-    [self.goodsBanner tt_confignewdata:self.infoModel];
-    self.titleLab.text =MM_str(model.name);
-    self.soldLab.text = [NSString stringWithFormat:@"SOLD: %@",model.sold] ;
-    NSMutableAttributedString *reviewsStr = [[NSMutableAttributedString alloc]
-                                             initWithString:[NSString stringWithFormat:@"REVIEWS：%@",model.review_nums]];
-    NSRange contentRange = {0,[reviewsStr length]};
-    [reviewsStr addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:contentRange];
-    self.reviewsLab.attributedText = reviewsStr;
-    self.reviewsLab.textAlignment = NSTextAlignmentRight;
-    
-    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.final_prices]];
-    [priceAtr addAttribute: NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"#0B0B0B"] range:NSMakeRange(0, priceAtr.length)];
-    [priceAtr addAttribute:NSFontAttributeName value:[UIFont fontWithName:Rob_Bold size:20] range:NSMakeRange(0, priceAtr.length)];
-    NSString *saveStr = @"";
-    if(model.final_prices == model.price){
-        self.saveLab.hidden = YES;
-    }else{
-        self.saveLab.hidden = NO;
-        double savePrice = [model.price doubleValue]-[model.final_prices doubleValue];
-        saveStr = [NSString stringWithFormat:@"Save %@%.2f",model.currency_symbol,savePrice];
-        [priceAtr appendAttributedString:[[NSAttributedString alloc]initWithString:@"  "]];
-        NSMutableAttributedString *priceAtrSub1 = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@",model.price]];
-        [priceAtrSub1 addAttribute:NSForegroundColorAttributeName
-                        value:[UIColor colorWithHexString:@"#8c8c8c"]
-                        range:NSMakeRange(0, priceAtrSub1.length)];
-        [priceAtrSub1 addAttribute:NSFontAttributeName
-                        value:[UIFont fontWithName:Rob_Regular size:14]
-                        range:NSMakeRange(0, priceAtrSub1.length)];
-        [priceAtrSub1 addAttribute:NSStrikethroughStyleAttributeName
-                        value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
-                        range:NSMakeRange(0, priceAtrSub1.length)];
-        [priceAtr appendAttributedString:priceAtrSub1];
-    }
-    self.priceLab.attributedText = priceAtr;
-    self.infoModel.priceAtr = priceAtr;
-    self.saveLab.text = saveStr;
-    self.datails_payV.titleLab.text = [NSString stringWithFormat:@"Pay in 4 interest-free payments of %@%.2f with",model.currency_symbol,[model.final_prices floatValue]/4];
-    NSString *product_details= @"";
-    for (NSDictionary *dic in model.custom_attributes) {
-        NSString *tmpStr= MM_str(dic[@"attribute_code"]);
-        if ([tmpStr isEqualToString:@"feature"]) {
-            product_details = MM_str(dic[@"value"]);
-        }
-    }
-    NSString *htmlStr = [NSString stringWithFormat:@"<html> \n"
-                         "<head> \n"
-                         "<meta charset=\"utf-8\" /> \n"
-                         "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no\" /> \n"
-                         "<style> \n"
-                             "*{ \n"
-                                 "padding: 5; \n"
-                                 "margin: 0; \n"
-                             "} \n"
-                             "table{ \n"
-                                 "width: 100%%; \n"
-                                 "border: 1px solid #A8A8A8; \n"
-                                 "border-collapse:collapse; \n"
-                             "} \n"
-                             "th{ \n"
-                                 "width: 30.42%%; \n"
-                                 "min-height: 36px; \n"
-                                 "padding: 10px; \n"
-                                 "border: 1px solid #A8A8A8; \n"
-                                 "font-size: 12px; \n"
-                                 "font-weight: bold; \n"
-                                 "color: #000; \n"
-                             "} \n"
-                             "td{ \n"
-                                 "width: 69.58%%; \n"
-                                 "min-height: 36px; \n"
-                                 "padding: 10px; \n"
-                                 "border: 1px solid #A8A8A8; \n"
-                                 "font-size: 12px; \n"
-                                 "font-weight: 400; \n"
-                                 "color: #000; \n"
-                                 "line-height: 16px; \n"
-                                 "word-break: break-word; \n"
-                             "} \n"
-                         "</style> \n"
-                         "</head> \n"
-                         "<body style=\"font-family: -apple-system,Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol',sans-serif;\">%@</body> \n"
-                         "</html>",product_details];
-    [self.wkWebView loadHTMLString:htmlStr baseURL:nil];
-}
-
-
-#pragma mark WKNavigationDelegate 计算webView
--(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    @weakify(self)
-    [webView evaluateJavaScript:@"document.body.offsetHeight" completionHandler:^(id _Nullable result, NSError * _Nullable error) {
-        @strongify(self)
-        CGFloat height = [result doubleValue]+40;
-        [self tool_webChangeFrame:height];
-    }];
-}
-
--(void)tool_webChangeFrame:(CGFloat)height{
-    [self.wkWebView mas_updateConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(height);
-    }];
-}
-
-#pragma mark - **************** handle ****************
--(void)xxx_onRadioButtonValueChanged:(RadioButton *)btn{
-    if (btn.selected) {
-        btn.backgroundColor = [UIColor colorWithHexString:@"#113632"];
-    }else{
-        btn.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
-        
-    }
-}
--(void)handle_couponEvent:(UIButton *)btn{
-    //wm_todo  优惠券的展开和合并
-    btn.selected = !btn.selected;
-}
--(void)tap_reviewsClick{
-    [self delegate_configClosetype:GoodsReviewsTag data:@""];
-}
--(void)tap_sizeLab{ ///展开size 规格选择的页面
-    
-}
-
-
-- (void)delegate_configClosetype:(NSInteger)type data:(id)data {
-    if (self.TTscrolldelegate && [self.TTscrolldelegate respondsToSelector:@selector(tengteng_configtapchilds:data:)]) {
-        [self.TTscrolldelegate tengteng_configtapchilds:type data:data];
-    }
-}
-
-
-#pragma mark - **************** lazy ****************
-- (WKM_goodsBanner *)goodsBanner {
-    if (!_goodsBanner) {
-        _goodsBanner = [[WKM_goodsBanner alloc] init];
-    }
-    return _goodsBanner;
-}
-- (QMUILabel *)titleLab {
-    if (!_titleLab) {
-        _titleLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _titleLab.textAlignment = NSTextAlignmentLeft;
-        _titleLab.numberOfLines = 2;
-        _titleLab.textColor = [UIColor colorWithHexString:@"#000000"];
-        _titleLab.font = [UIFont fontWithName:Rob_Bold size:16];
-    }
-    return  _titleLab;
-}
-- (QMUILabel *)soldLab {
-    if (!_soldLab) {
-        _soldLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _soldLab.textAlignment = NSTextAlignmentLeft;
-        _soldLab.textColor = [UIColor colorWithHexString:@"#666666"];
-        _soldLab.font = [UIFont systemFontOfSize:12];
-    }
-    return  _soldLab;
-}
-- (QMUILabel *)reviewsLab {
-    if (!_reviewsLab) {
-        _reviewsLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _reviewsLab.textAlignment = NSTextAlignmentRight;
-        _reviewsLab.textColor = [UIColor colorWithHexString:@"#666666"];
-        _reviewsLab.font = [UIFont fontWithName:Rob_Regular size:12];
-        _reviewsLab.userInteractionEnabled = YES;
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap_reviewsClick)];
-        [_reviewsLab addGestureRecognizer:tap];
-        //    reviewsStr.underlineStyle = NSUnderlineStyleSingle;
-    }
-    return  _reviewsLab;
-}
-- (QMUILabel *)priceLab {
-    if (!_priceLab) {
-        _priceLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _priceLab.textAlignment = NSTextAlignmentLeft;
-        _priceLab.textColor = [UIColor blackColor];
-        _priceLab.font = [UIFont systemFontOfSize:18];
-    }
-    return  _priceLab;
-}
-- (QMUILabel *)saveLab {
-    if (!_saveLab) {
-        _saveLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _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];
-    }
-    return  _saveLab;
-}
-- (QMUILabel *)couponLab {
-    if (!_couponLab) {
-        _couponLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _couponLab.mj_size = CGSizeMake(KScreenWidth-20, 45);
-        _couponLab.backgroundColor = [UIColor colorWithHexString:@"#113632"];
-        _couponLab.textAlignment = NSTextAlignmentLeft;
-        _couponLab.textColor = [UIColor colorWithHexString:@"#FFFFFF"];
-        _couponLab.font = [UIFont fontWithName:Rob_Bold size:14];
-        _couponLab.text = @"COUPON";
-        _couponLab.layer.cornerRadius = 4;
-        _couponLab.clipsToBounds = YES;
-        _couponLab.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
-        UIButton *btn = [[UIButton alloc]init];
-        btn.selected = NO;
-        [btn addTarget:self action:@selector(handle_couponEvent:) forControlEvents:UIControlEventTouchUpInside];
-        btn.frame = CGRectMake(_couponLab.mj_w-45-10, 0, 45, 45);
-        [btn setImage:[UIImage imageNamed:@"base_add_white"] forState:UIControlStateNormal];
-        [btn setImage:[UIImage imageNamed:@"base_subtract_white"] forState:UIControlStateSelected];
-        [_couponLab addSubview:btn];
-    }
-    return  _couponLab;
-}
-- (QMUILabel *)sizeLab {
-    if (!_sizeLab) {
-        _sizeLab = [[QMUILabel alloc] initWithFrame:CGRectZero];
-        _sizeLab.mj_size = CGSizeMake(KScreenWidth-20, 45);
-        _sizeLab.backgroundColor = [UIColor colorWithHexString:@"#113632"];
-        _sizeLab.textAlignment = NSTextAlignmentLeft;
-        _sizeLab.textColor = [UIColor colorWithHexString:@"#FFFFFF"];
-        _sizeLab.font = [UIFont fontWithName:Rob_Bold size:14];
-        _sizeLab.text = @"Size Selection";
-        _sizeLab.layer.cornerRadius = 4;
-        _sizeLab.clipsToBounds = YES;
-        _sizeLab.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
-        _sizeLab.userInteractionEnabled = YES;
-        UIImageView *imgV = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"base_add_white"]];
-        imgV.frame = CGRectMake(_sizeLab.mj_w-45-10, 0, 45, 45);
-        imgV.userInteractionEnabled = YES;
-        imgV.contentMode = UIViewContentModeCenter;
-        [_sizeLab addSubview:imgV];
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tap_sizeLab)];
-        [_sizeLab addGestureRecognizer:tap];
-    }
-    return  _sizeLab;
-}
--(GoodsDetailsPayV *)datails_payV{
-    if (!_datails_payV) {
-        _datails_payV = [[GoodsDetailsPayV alloc]initWithFrame:CGRectMake(10, 0, KScreenWidth-20, 78)];
-        _datails_payV.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
-        _datails_payV.layer.cornerRadius = 4;
-        _datails_payV.clipsToBounds = YES;
-    }
-    return _datails_payV;
-}
-- (GoodsDetailsIntroduceV *)datails_IntroduceV {
-    if (!_datails_IntroduceV) {
-        _datails_IntroduceV = [[GoodsDetailsIntroduceV alloc] initWithFrame:CGRectMake(10, 0, KScreenWidth-20, 120)];
-        _datails_IntroduceV.backgroundColor = _F5F5F5;
-        _datails_IntroduceV.clipsToBounds = YES;
-    }
-    return _datails_IntroduceV;
-}
-
-
-
-- (NSMutableArray *)radioBtnAry {
-    if (!_radioBtnAry) {
-        _radioBtnAry = [[NSMutableArray alloc] init];
-    }
-    return _radioBtnAry;
-}
-- (WKWebView *)wkWebView {
-    if(!_wkWebView){
-        NSString *injectionJSString = @"var script = document.createElement('meta');"
-        "script.name = 'viewport';"
-        "script.content=\"width=device-width, user-scalable=no\";"
-        "document.getElementsByTagName('head')[0].appendChild(script);";
-        
-        // CSS选中样式取消 ---禁用web 长按菜单里的查询、学习、共享等按钮，
-        NSString *css = @"body{-webkit-user-select:none;-webkit-user-drag:none;}";
-        NSMutableString *javascript = [NSMutableString string];
-        [javascript appendString:injectionJSString];
-        [javascript appendString:@"var style = document.createElement('style');"];
-        [javascript appendString:@"style.type = 'text/css';"];
-        [javascript appendFormat:@"var cssContent = document.createTextNode('%@');", css];
-        [javascript appendString:@"style.appendChild(cssContent);"];
-        [javascript appendString:@"document.body.appendChild(style);"];
-        
-        WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:javascript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
-        
-        WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init];
-        config.selectionGranularity = WKSelectionGranularityDynamic;
-        
-        WKUserContentController * wkUController = [[WKUserContentController alloc] init];
-        
-        [wkUController addUserScript:wkUScript];
-        
-        config.userContentController= wkUController;
-        WKPreferences *wkp = [WKPreferences new];
-        wkp.minimumFontSize = 12;
-        config.preferences = wkp;
-        _wkWebView = [[WKWebView alloc] initWithFrame: CGRectMake(0, 0, KScreenWidth, KScreenWidth) configuration:config];
-        _wkWebView.navigationDelegate=self;
-        _wkWebView.backgroundColor=[UIColor colorWithHexString:@"#FFFFFF"];
-        _wkWebView.scrollView.scrollEnabled=NO;
-        _wkWebView.allowsLinkPreview = NO;
-        if(@available(iOS 16.4 , *)){
-            _wkWebView.inspectable = YES;
-        }
-    }
-    return _wkWebView;
-}
-
-@end

Asteria/Fuction/Goods/VC/AS_GoodsDetailsC.h

@@ -1,18 +0,0 @@
-//
-//  AS_GoodsDetailsC.h
-//  Asteria
-//
-//  Created by 王猛 on 2023/5/6.
-//
-
-
-#import <WMBase/WMBase.h>
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface AS_GoodsDetailsC : UCMBaseC
-@property (nonatomic, copy) NSString *entity_id;
-
-@end
-
-NS_ASSUME_NONNULL_END

Asteria/Fuction/Goods/VC/AS_GoodsDetailsC.m

@@ -1,124 +0,0 @@
-//
-//  AS_GoodsDetailsC.m
-//  Asteria
-//
-//  Created by 王猛 on 2023/5/6.
-//
-
-#import "AS_GoodsDetailsC.h"
-#import "GoodsDetailSrcView.h"
-#import "ASGoodsDetailsVM.h"
-#import "GoodsDetailsBottomV.h"
-#import "AS_GoodsReviewsListC.h"
-
-@interface AS_GoodsDetailsC ()<TT_BaseScrollViewDelegate,RY_baseVMprotocol>
-@property (nonatomic, strong) GoodsInformationM *model;
-@property (nonatomic, strong) ASGoodsDetailsVM *VM;
-@property (nonatomic, strong) GoodsDetailSrcView *scrV;
-@property (nonatomic, strong) GoodsDetailsBottomV *bottomV;
-
-@end
-
-@implementation AS_GoodsDetailsC
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self reqNet_GoodsDetails_productGetProduct];
-    [self ucm_subVeiwsTapBlock];
-    
-}
-- (void)initSubviews{
-    [super initSubviews];
-    [self.view addSubview:self.scrV];
-    [self.view addSubview:self.bottomV];
-    
-}
-- (void)ucm_subVeiwsTapBlock{
-    @weakify(self)
-    self.bottomV.ViewtapClose = ^(NSInteger num, id  _Nonnull data) {
-        @strongify(self)
-        [self action_GoodsSizeC];
-    };
-}
-
-- (void)viewDidLayoutSubviews{
-    IPhoneXHeigh
-    [self.scrV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(0);
-        make.width.mas_equalTo(KScreenWidth);
-        make.top.mas_equalTo(securitytop_Y);
-        make.bottom.mas_equalTo(-65-securityBottom_H);
-    }];
-}
-
-- (void)ucm_bindvmmodel{
-    self.VM = [[ASGoodsDetailsVM alloc]initDelegate:self];
-}
--(void)reqNet_GoodsDetails_productGetProduct{
-    NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-//    [params setObject:@"55475" forKey:@"productId"];
-    [params setObject:self.entity_id forKey:@"productId"];
-    [params setObject:@"USD" forKey:@"currencyCode"];
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    [self.VM ry_requestGetApi:Goods_productGetProductsById param:params];
-}
--(void)ry_respnsData:(nullable id)data
-            parseAry:(nullable NSMutableArray *)arry
-              sucess:(BOOL)sucessOrFail
-                mark:(NSString *)mark
-          reqNetType:(ReqNetType)reqNetType{
-    [MBProgressHUD hideHUDForView:self.view animated:YES];
-    if(sucessOrFail){
-        if([mark isEqualToString:Goods_productGetProductsById]){
-            GoodsInformationM *model = (GoodsInformationM *)[arry firstObject];
-            self.model = model;
-            self.title = model.name;
-            [self.scrV tt_configData:model];
-        }
-    }
-}
-
-#pragma mark - **************** TT_BaseScrollViewDelegate ****************
--(void)tengteng_configtapchilds:(NSInteger)num data:(id)data{
-    if(num == GoodsReviewsTag){
-        [self action_GoodsReviewsListC];
-    }
-}
-
-#pragma mark - **************** action ****************
-
--(void)action_GoodsReviewsListC{
-    AS_GoodsReviewsListC *allPic = [[AS_GoodsReviewsListC alloc]init];
-    allPic.goodsM = self.model;
-    [self.navigationController pushViewController:allPic animated:YES];
-}
--(void)action_GoodsSizeC{
-    UIViewController *viewController = [[CTMediator sharedInstance] Goods_GoodsSizeC:@{@"model":self.model}];
-    viewController.modalPresentationStyle = UIModalPresentationFullScreen;
-    [self presentViewController:viewController animated:YES completion:nil];
-}
-
-
-
-#pragma mark - **************** lazy ****************
-
-- (GoodsDetailSrcView *)scrV {
-    if (!_scrV) {
-        _scrV = [[GoodsDetailSrcView alloc] init];
-        _scrV.contentSize = CGSizeMake(KScreenWidth, MAXFLOAT);
-        _scrV.TTscrolldelegate = self;
-    }
-    return _scrV;
-}
-
-- (GoodsDetailsBottomV *)bottomV {
-    if (!_bottomV) {
-        IPhoneXHeigh
-        _bottomV = [[GoodsDetailsBottomV alloc] initWithFrame:CGRectMake(0, KScreenHeight - securityBottom_H-65, KScreenWidth, securityBottom_H+65)];
-        _bottomV.backgroundColor = Col_FFF;
-        
-    }
-    return _bottomV;
-}
-
-@end

Asteria/Fuction/Login/VC/AS_LoginC.m

@@ -84,7 +84,7 @@
         [self.view makeToast:@"Please input a password" duration:2 position:CSToastPositionCenter];
         return;
     }
-    NSString *urlStr = [NSString stringWithFormat:@"%@V1/integration/customer/token",AS_Server];
+//    NSString *urlStr = [NSString stringWithFormat:@"%@V1/integration/customer/token",AS_Server];
     NSMutableDictionary *params = [[NSMutableDictionary alloc]init];
     params[@"username"] = self.xxx_emailTFV.xxx_emailTF.text;
     params[@"password"] = self.xxx_passwordV.xxx_passwordTF.text;

Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m

@@ -177,7 +177,7 @@
                     @"title":@"Faq",
                     @"url":HelpFaqsWebUrl,
                 }];
-                [weakSelf.navigationController pushViewController:vc animated:true];
+                [self.navigationController pushViewController:vc animated:true];
             }
         };
         _paySuccessView.frame = CGRectMake(0, 0, KScreenWidth, [_paySuccessView getViewHeight]);

Asteria/Fuction/UserCenter/Points/ASPointDetailViewController.m

@@ -33,7 +33,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.vm = [ASPointsViewModel new];
+    self.vm = [[ASPointsViewModel alloc] init];
     self.allPage = 1;
     self.usedPage = 1;
     [self loadSubVs];

Asteria/Fuction/UserCenter/UserCenterHome/ASUserCenterViewController.m

@@ -140,7 +140,7 @@
             case 4: {
                 NSURL *url = [NSURL URLWithString:mailServiceUrlStr];
                 if (url != nil && [UIApplication.sharedApplication canOpenURL:url]) {
-                    [UIApplication.sharedApplication openURL:url options:nil completionHandler:nil];
+                    [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
                 }
             }
                 break;

Asteria/Fuction/UserCenter/UserCenterHome/views/ASSginView.m

@@ -27,12 +27,14 @@
 @implementation ASSginView
 
 - (void)signBtAction {
+    
+    UIViewController *topVC = topViewController();
     K_WEAK_SELF;
-    [MBProgressHUD showHUDAddedTo:UIApplication.sharedApplication.keyWindow animated:true];
+    [MBProgressHUD showHUDAddedTo:topVC.view animated:true];
     [self.vm signToday:^{
         K_STRONG_SELF;
         [ASUserInfoManager.shared getInfo];
-        [MBProgressHUD hideHUDForView:UIApplication.sharedApplication.keyWindow animated:true];
+        [MBProgressHUD hideHUDForView:topVC.view animated:true];
         
         [self requestUserIsSignData];
     }];
@@ -49,7 +51,9 @@
 }
 
 - (void)requestUserIsSignData {
+    K_WEAK_SELF;
     [self.vm requestGetUserIsSign:^(BOOL isSign) {
+        K_STRONG_SELF;
         self.signBt.backgroundColor = isSign ? Col_999 : Col_000;
         self.signBt.userInteractionEnabled = !isSign;
     }];
@@ -145,7 +149,7 @@
     if (self) {
         self.bgV.frame = CGRectMake(10, 10, frame.size.width-20, frame.size.height-20);
         self.colorBgV.frame = self.bgV.bounds;
-        self.vm = [ASSginViewModel new];
+        self.vm = [[ASSginViewModel alloc] init];
         [self loadSubV];
     }
     return self;

Asteria/Fuction/UserCenter/UserCenterHome/views/KWMineMoreProductsCell.h

@@ -35,8 +35,6 @@ typedef void(^ASGoodsAddCartBlock)(ASProductBaseModel *model);
 
 @property (nonatomic, copy) ASGoodsAddCartBlock addCartBlock;
 
-//
--(void)setData:(KWMineMoreProductModel *)model;
 
 @end
 

Asteria/Fuction/UserCenter/UserCenterHome/views/KWMineMoreProductsCell.m

@@ -54,21 +54,6 @@
     [self.collectV reloadData];
 }
 
-//-(void)setData:(KWMineMoreProductModel *)model {
-//    self.model = model;
-//    for (HomeFilterModel *type in self.model.keysArr) {
-//        if (type.selected) {
-//            self.currentKey = type;
-//        }
-//    }
-//    if (!self.currentKey) {
-//        self.currentKey = self.model.keysArr.firstObject;
-//    }
-//    self.titleLb.text = self.model.title;
-//    [self calulateItemWidth];
-//    [self.typeCollectV reloadData];
-//    [self.collectV reloadData];
-//}
 
 -(void)calulateItemWidth {
     NSMutableArray<NSNumber *> *tempArr = [NSMutableArray array];