feat:订单详情

Asteria.xcodeproj/project.pbxproj

@@ -201,6 +201,10 @@
 		8810F5292BEE0DEA00346FD4 /* ASCheckoutGoodsItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5282BEE0DEA00346FD4 /* ASCheckoutGoodsItemCell.m */; };
 		8810F52C2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F52B2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m */; };
 		8810F5302BF3678400346FD4 /* ASPaypalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F52F2BF3678400346FD4 /* ASPaypalManager.m */; };
+		8810F5332BF497C400346FD4 /* ASOrderDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5322BF497C400346FD4 /* ASOrderDetailsViewController.m */; };
+		8810F5362BF4998E00346FD4 /* ASOrderDetailsVM.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5352BF4998E00346FD4 /* ASOrderDetailsVM.m */; };
+		8810F5392BF4A6E900346FD4 /* ASOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5382BF4A6E900346FD4 /* ASOrderDetailsModel.m */; };
+		8810F53C2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F53B2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.m */; };
 		8C24ECE114420CDEE7B9B22B /* Pods_Asteria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54DCE8001991D89B696E7D44 /* Pods_Asteria.framework */; };
 		9A1247942A1B082300126226 /* Fuction_Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1247932A1B082300126226 /* Fuction_Tool.m */; };
 		9A1247972A1B0A2800126226 /* AS_ForgotC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1247962A1B0A2800126226 /* AS_ForgotC.m */; };
@@ -724,6 +728,14 @@
 		8810F52B2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASAddGiftGoodsView.m; sourceTree = "<group>"; };
 		8810F52E2BF3678400346FD4 /* ASPaypalManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASPaypalManager.h; sourceTree = "<group>"; };
 		8810F52F2BF3678400346FD4 /* ASPaypalManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASPaypalManager.m; sourceTree = "<group>"; };
+		8810F5312BF497C400346FD4 /* ASOrderDetailsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASOrderDetailsViewController.h; sourceTree = "<group>"; };
+		8810F5322BF497C400346FD4 /* ASOrderDetailsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASOrderDetailsViewController.m; sourceTree = "<group>"; };
+		8810F5342BF4998E00346FD4 /* ASOrderDetailsVM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASOrderDetailsVM.h; sourceTree = "<group>"; };
+		8810F5352BF4998E00346FD4 /* ASOrderDetailsVM.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASOrderDetailsVM.m; sourceTree = "<group>"; };
+		8810F5372BF4A6E900346FD4 /* ASOrderDetailsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASOrderDetailsModel.h; sourceTree = "<group>"; };
+		8810F5382BF4A6E900346FD4 /* ASOrderDetailsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASOrderDetailsModel.m; sourceTree = "<group>"; };
+		8810F53A2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASOrderDetailsInfoCell.h; sourceTree = "<group>"; };
+		8810F53B2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASOrderDetailsInfoCell.m; sourceTree = "<group>"; };
 		9A1247922A1B082300126226 /* Fuction_Tool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fuction_Tool.h; sourceTree = "<group>"; };
 		9A1247932A1B082300126226 /* Fuction_Tool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Fuction_Tool.m; sourceTree = "<group>"; };
 		9A1247952A1B0A2800126226 /* AS_ForgotC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_ForgotC.h; sourceTree = "<group>"; };
@@ -1484,6 +1496,14 @@
 				819349202BF218B6009FDDB2 /* ASOrderListViewModel.m */,
 				819349242BF34722009FDDB2 /* ASOrderListCell.h */,
 				819349252BF34722009FDDB2 /* ASOrderListCell.m */,
+				8810F5312BF497C400346FD4 /* ASOrderDetailsViewController.h */,
+				8810F5322BF497C400346FD4 /* ASOrderDetailsViewController.m */,
+				8810F5342BF4998E00346FD4 /* ASOrderDetailsVM.h */,
+				8810F5352BF4998E00346FD4 /* ASOrderDetailsVM.m */,
+				8810F5372BF4A6E900346FD4 /* ASOrderDetailsModel.h */,
+				8810F5382BF4A6E900346FD4 /* ASOrderDetailsModel.m */,
+				8810F53A2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.h */,
+				8810F53B2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.m */,
 			);
 			path = Orders;
 			sourceTree = "<group>";
@@ -2744,6 +2764,7 @@
 				9A3F5CAF2B3BC11000DDB6A7 /* AlertMyCartDeleteV.m in Sources */,
 				81717C912A3BE39C00648139 /* ASProductSortFilterView.m in Sources */,
 				9AACEE952B7F473200223466 /* Cart_CheckoutC.m in Sources */,
+				8810F53C2BF4ABC300346FD4 /* ASOrderDetailsInfoCell.m in Sources */,
 				81C7962E2A539F4D003083B8 /* ASMessageListCell.m in Sources */,
 				81717D382A3D322700648139 /* KWNoHisWordsCell.m in Sources */,
 				9A2415BF2B678A1100A6E903 /* QtyCountV.m in Sources */,
@@ -2810,6 +2831,7 @@
 				81CE28942AF490C20012AA45 /* ASGiftCardTableView.m in Sources */,
 				81FC41A32BEB4D6E00EB0A85 /* InTableScrollView.m in Sources */,
 				816020132A2EE5A200E4A8F1 /* ASCategaryCollectCell.m in Sources */,
+				8810F5362BF4998E00346FD4 /* ASOrderDetailsVM.m in Sources */,
 				8193D5CB2BEA2A0800B9AB11 /* ASMineAddressModel.m in Sources */,
 				81C796422A551FE9003083B8 /* KWTextField.m in Sources */,
 				9AD346012A08D60F005CA070 /* ZFFloatView.m in Sources */,
@@ -2894,6 +2916,7 @@
 				81717CA52A3C0A5000648139 /* KWProductFilterItemCell.m in Sources */,
 				812021252B185A610026B8B5 /* ASCouponsListViewModel.m in Sources */,
 				9AD345FE2A08D60F005CA070 /* UIScrollView+ZFPlayer.m in Sources */,
+				8810F5392BF4A6E900346FD4 /* ASOrderDetailsModel.m in Sources */,
 				9A65DE512A132FB700BB1269 /* LoginThirdAuthV.m in Sources */,
 				9A788C442A08A663003E0025 /* Target_Goods.m in Sources */,
 				8131A2902B38FF3B00A191BE /* APInputAlertView.m in Sources */,
@@ -2976,6 +2999,7 @@
 				81717D1F2A3C4AE000648139 /* KWMoneyTypeHeadView.m in Sources */,
 				9A3520412B48000F00D097CB /* GoodsReviewsListM.m in Sources */,
 				9AD4D39E2B48F5680086D6FB /* NSMutableAttributedString+RYText.m in Sources */,
+				8810F5332BF497C400346FD4 /* ASOrderDetailsViewController.m in Sources */,
 				81EC47782A3426CE00516573 /* ASHomeLookingCollCell.m in Sources */,
 				81DFA5782A47F28D00DA708B /* ASCouponListCell.m in Sources */,
 				8160201C2A2F101C00E4A8F1 /* ASHomeTipCell.m in Sources */,

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsInfoCell.h

@@ -0,0 +1,19 @@
+//
+//  ASOrderDetailsInfoCell.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import <UIKit/UIKit.h>
+#import "ASOrderDetailsModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASOrderDetailsInfoCell : UITableViewCell
+
+@property (nonatomic, strong) ASOrderDetailsModel *orderModel;
+
+@end
+
+NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsInfoCell.m

@@ -0,0 +1,111 @@
+//
+//  ASOrderDetailsInfoCell.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import "ASOrderDetailsInfoCell.h"
+
+@interface ASOrderDetailsInfoCell()
+
+@property (nonatomic, strong) UIView *backView;
+@property (nonatomic, strong) UIView *lineView;
+
+
+@end
+
+@implementation ASOrderDetailsInfoCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+        self.contentView.backgroundColor = _F8F8F8;
+        
+        _backView = [[UIView alloc] init];
+        _backView.backgroundColor = Col_FFF;
+        TT_ViewRadius(_backView, 3);
+        [self.contentView addSubview:_backView];
+        [_backView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.top.mas_equalTo(10);
+            make.bottom.right.mas_equalTo(-10);
+//            make.height.mas_equalTo(200);
+        }];
+        
+        UILabel *infoLab = [UILabel labelCreateWithText:@"order information" font:[UIFont fontWithName:Rob_Regular size:12] textColor:_0B0B0B];
+        [_backView addSubview:infoLab];
+        [infoLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo (10);
+            make.top.mas_equalTo(28);
+        }];
+        
+        _lineView = [[UIView alloc] init];
+        _lineView.backgroundColor = _F4F4F4;
+        [_backView addSubview:_lineView];
+        [_lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(10);
+            make.right.mas_equalTo(-10);
+            make.height.mas_equalTo(1);
+            make.top.equalTo(infoLab.mas_bottom).offset(22);
+        }];
+        
+        
+        
+    }
+    return self;
+}
+
+- (void)setOrderModel:(ASOrderDetailsModel *)orderModel {
+    _orderModel = orderModel;
+    
+    NSArray *titleArray = @[@"ship to:", @"order number:", @"status:", @"order date:", @"shipping method:", @"Payment method:"];
+    
+    NSArray *valueArray = @[@"Alessandro  6263378809  12941 Ramona Blvd Unit A&B  Irwindale Arizona  91706 United States", @"600465290", @"Processing", @"September 24,2020", @"Same day delivery (Order before 10:30 am)", @"Paypal-express"];
+    
+    UILabel *tempLab = nil;
+    for (int i = 0; i < titleArray.count; i++) {
+        
+        UILabel *rightLab = [UILabel labelCreateWithText:valueArray[i] font:[UIFont fontWithName:Rob_Regular size:12] textColor:_0B0B0B];
+        rightLab.numberOfLines = 0;
+        [_backView addSubview:rightLab];
+
+        if (i == 0) {
+            [rightLab mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.right.mas_equalTo(-10);
+                make.left.mas_equalTo(140);
+                make.top.mas_equalTo(_lineView.mas_bottom).offset(20);
+            }];
+        } else {
+            [rightLab mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.right.mas_equalTo(-10);
+                make.left.mas_equalTo(140);
+                make.top.mas_equalTo(tempLab.mas_bottom).offset(20);
+            }];
+        }
+        
+        tempLab = rightLab;
+        
+        UILabel *leftLab = [UILabel labelCreateWithText:titleArray[i] font:[UIFont fontWithName:Rob_Regular size:12] textColor:_0B0B0B];
+        [_backView addSubview:leftLab];
+        [leftLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(10);
+            make.centerY.mas_equalTo(rightLab);
+        }]; 
+        
+    }
+    
+    UIView *lineView1 = [[UIView alloc] init];
+    lineView1.backgroundColor = _F4F4F4;
+    [_backView addSubview:lineView1];
+    [lineView1 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(1);
+        make.top.equalTo(tempLab.mas_bottom).offset(20);
+        make.bottom.mas_equalTo(-20);
+    }];
+    
+}
+
+@end

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsModel.h

@@ -0,0 +1,25 @@
+//
+//  ASOrderDetailsModel.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import <Foundation/Foundation.h>
+#import "KWMineHomeOrderModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASOrderDetailsModel : NSObject
+
+//内部包含邮寄地址（shipping_assignments）、运输方式、支付方式
+@property (nonatomic, strong) NSDictionary *extension_attributes;
+@property (nonatomic, copy) NSString *shipping_description; //邮寄地址
+@property (nonatomic, copy) NSString *increment_id; //订单号
+@property (nonatomic, copy) NSString *created_at; //订单创建时间
+@property (nonatomic, copy) NSString *status; //订单状态
+@property (nonatomic, strong) NSArray<KWMineOrderProInfoModel *> *items;
+
+@end
+
+NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsModel.m

@@ -0,0 +1,21 @@
+//
+//  ASOrderDetailsModel.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import "ASOrderDetailsModel.h"
+
+@implementation ASOrderDetailsModel
+
++ (NSDictionary *)mj_objectClassInArray{
+    return @{
+        
+        @"items" : [KWMineOrderProInfoModel class],
+        
+    };
+}
+
+
+@end

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsVM.h

@@ -0,0 +1,22 @@
+//
+//  ASOrderDetailsVM.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import <Foundation/Foundation.h>
+#import "ASOrderDetailsModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASOrderDetailsVM : NSObject
+
+///获取购物车列表
+#define Order_details          BaseRequestrUrl(@"orders")
+
+- (void)getOrderDetailsWithOrderid:(NSString *)orderid complete:(void(^)(ASOrderDetailsModel *))completeBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsVM.m

@@ -0,0 +1,30 @@
+//
+//  ASOrderDetailsVM.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import "ASOrderDetailsVM.h"
+
+@implementation ASOrderDetailsVM
+
+
+- (void)getOrderDetailsWithOrderid:(NSString *)orderid complete:(void(^)(ASOrderDetailsModel *))completeBlock {
+    NSMutableDictionary *para = [NSMutableDictionary dictionaryWithDictionary: @{
+        @"url": [NSString stringWithFormat:@"/V1/orders/%@", orderid],
+    }];
+    [ASNetTools.shared postWithPath:getAllOrders param:para success:^(id _Nonnull json) {
+        NSLog(@"---orderDetails---result:%@------",json);
+        
+        ASOrderDetailsModel *orderModel = [ASOrderDetailsModel mj_objectWithKeyValues:json];
+        
+        completeBlock(orderModel);
+        
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        NSLog(@"---orderDetails---code:%@--msg:%@----", code, msg);
+        completeBlock(nil);
+    }];
+}
+
+@end

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsViewController.h

@@ -0,0 +1,18 @@
+//
+//  ASOrderDetailsViewController.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import "ASBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASOrderDetailsViewController : ASBaseViewController
+
+@property (nonatomic, copy) NSString *orderId;
+
+@end
+
+NS_ASSUME_NONNULL_END

Asteria/Fuction/UserCenter/Orders/ASOrderDetailsViewController.m

@@ -0,0 +1,108 @@
+//
+//  ASOrderDetailsViewController.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/15.
+//
+
+#import "ASOrderDetailsViewController.h"
+
+#import "ASOrderDetailsVM.h"
+
+#import "ASOrderDetailsModel.h"
+
+#import "ASOrderDetailsInfoCell.h"
+
+@interface ASOrderDetailsViewController ()<UITableViewDelegate, UITableViewDataSource>
+
+@property (nonatomic, strong) UITableView *tableView;
+
+@property (nonatomic, strong) ASOrderDetailsVM *orderDetailsVM;
+
+@property (nonatomic, strong) ASOrderDetailsModel *orderDetailsModel;
+
+@end
+
+@implementation ASOrderDetailsViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.titleStr = @"Orders inf";
+    self.statusBgV.backgroundColor = Col_FFF;
+    self.customNavBar.backgroundColor = Col_FFF;
+    
+    self.orderDetailsVM = [ASOrderDetailsVM new];
+    
+    [self requestOrderDetailsData];
+    
+//    [self.view addSubview:self.tableView];
+    [self loadSubV];
+}
+
+- (void)requestOrderDetailsData {
+    [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    @weakify(self)
+    [self.orderDetailsVM getOrderDetailsWithOrderid:self.orderId complete:^(ASOrderDetailsModel *orderModel) {
+        @strongify(self)
+        [MBProgressHUD hideHUDForView:self.view animated:true];
+        
+        self.orderDetailsModel = orderModel;
+        
+        [self.tableView reloadData];
+        
+        [self checkEmpty];
+    }];
+}
+
+- (void)checkEmpty {
+    if (!self.orderDetailsModel) {
+        [self showEmptyV: self.tableView];
+    } else {
+        [self hiddenEmpty];
+    }
+}
+
+#pragma mark - UITableViewDelegate,UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    ASOrderDetailsInfoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ASOrderDetailsInfoCell" forIndexPath:indexPath];
+    cell.orderModel = self.orderDetailsModel;
+    
+    return cell;
+    
+}
+
+// MARK: - loadSubv
+- (void)loadSubV {
+    [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.customNavBar.mas_bottom);
+        make.leading.trailing.bottom.equalTo(self.view);
+    }];
+}
+
+// MARK: - subvs
+- (UITableView *)tableView {
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        [_tableView registerClass:[ASOrderDetailsInfoCell class] forCellReuseIdentifier:@"ASOrderDetailsInfoCell"];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.backgroundColor = _F8F8F8;
+        _tableView.estimatedRowHeight = 50;
+    }
+    return _tableView;
+}
+
+
+@end

Asteria/Fuction/UserCenter/Orders/ASOrderListCell.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ASOrderListCell : UITableViewCell
 
 // type 0: view Order 1: trackOrder 2: reorder  3: pay now 
-@property (nonatomic, copy) void(^viewOrderCall)(NSInteger type) ;
+@property (nonatomic, copy) void(^viewOrderCall)(NSInteger type, KWMineHomeOrderModel *model) ;
 
 - (void)setData:(KWMineHomeOrderModel *)model;
 

Asteria/Fuction/UserCenter/Orders/ASOrderListCell.m

@@ -339,7 +339,7 @@
 -(void)viewBtAction:(UIButton *)bt {
     
     if (self.viewOrderCall) {
-        self.viewOrderCall(bt.tag-10000);
+        self.viewOrderCall(bt.tag-10000, self.m);
     }
     
 }

Asteria/Fuction/UserCenter/Orders/ASOrderListSubController.m

@@ -9,6 +9,8 @@
 #import "ASOrderListCell.h"
 #import "ASOrderListViewModel.h"
 
+#import "ASOrderDetailsViewController.h"
+
 @interface ASOrderListSubController ()<UITableViewDelegate, UITableViewDataSource>
 
 @property (nonatomic, strong) UITableView *tableV;
@@ -125,7 +127,8 @@
     KWMineHomeOrderModel *m = self.orderArr[indexPath.row];
     [cell setData:m];
     @weakify(self);
-    [cell setViewOrderCall:^(NSInteger type){
+    [cell setViewOrderCall:^(NSInteger type, KWMineHomeOrderModel *model){
+        @strongify(self)
         // type 0: view Order 1: trackOrder 2: reorder  3: pay now
         if (![ASUserInfoManager.shared isLogin]) {
             [self popAndToLogin];
@@ -133,6 +136,11 @@
         }
         // 查看订单
         NSLog(@"查看订单 view order");
+        
+        ASOrderDetailsViewController *orderDetailsVC = [[ASOrderDetailsViewController alloc] init];
+        orderDetailsVC.orderId = model.entity_id;
+        [self.navigationController pushViewController:orderDetailsVC animated:YES];
+        
         //            KWM_OrderViewC *vc = [[KWM_OrderViewC alloc]init];
         //            vc.order_id = m.orderId;
         //            [[Current_normalTool topViewController].navigationController pushViewController:vc animated:YES];

Asteria/Fuction/UserCenter/UserCenterHome/ASUserCenterViewController.m

@@ -18,6 +18,7 @@
 #import "ASSettingViewController.h"
 #import "ASUserCenterViewModel.h"
 #import "ASOrderListViewController.h"
+#import "ASOrderDetailsViewController.h"
 
 
 @interface ASUserCenterViewController ()<UITableViewDelegate,UITableViewDataSource>
@@ -156,17 +157,24 @@
         KWMineHomeOrderModel *m = self.orderArr[indexPath.row];
         [cell setData:m];
         @weakify(self);
-        [cell setViewOrderCall:^{
+        cell.viewOrderCall = ^(NSInteger type, KWMineHomeOrderModel * _Nonnull model) {
+            @strongify(self)
             if (![ASUserInfoManager.shared isLogin]) {
                 [self popAndToLogin];
                 return;
             }
             // 查看订单
             NSLog(@"查看订单 view order");
+            
+            ASOrderDetailsViewController *orderDetailsVC = [[ASOrderDetailsViewController alloc] init];
+            orderDetailsVC.orderId = model.entity_id;
+            [self.navigationController pushViewController:orderDetailsVC animated:YES];
+            
 //            KWM_OrderViewC *vc = [[KWM_OrderViewC alloc]init];
 //            vc.order_id = m.orderId;
 //            [[Current_normalTool topViewController].navigationController pushViewController:vc animated:YES];
-        }];
+        };
+        
         return cell;
     }
     KWMineMoreProductsCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KWMineMoreProductsCell" forIndexPath:indexPath];

Asteria/Fuction/UserCenter/UserCenterHome/models/KWMineHomeOrderModel.h

@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *state;
 /// 编号
 @property (nonatomic, copy) NSString *increment_id;
+/// 订单id
+@property (nonatomic, copy) NSString *entity_id;
 /// 时间
 @property (nonatomic, copy) NSString *created_at;
 /// 金额

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

@@ -13,7 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KWMineHomeOrderListCell : UITableViewCell
 
-@property (nonatomic, copy) btnClickBlock viewOrderCall;
+@property (nonatomic, copy) void(^viewOrderCall)(NSInteger type, KWMineHomeOrderModel *model) ;
+//@property (nonatomic, copy) btnClickBlock viewOrderCall;
 
 - (void)setData:(KWMineHomeOrderModel *)model;
 

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

@@ -189,7 +189,7 @@
 -(void)viewBtAction {
     
     if (self.viewOrderCall) {
-        self.viewOrderCall();
+        self.viewOrderCall(0, self.m);
     }
     
 }