0.0.1增加售后

yinqiaojuan
1 parent 400e23ab
Showing 37 changed files with 1301 additions and 566 deletions
CNLiveMyOrderModule.podspec
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/dd_wlcw@2x.png
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/dd_wlcw@3x.png
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/wufalianjie@2x.png
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/wufalianjie@3x.png
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/zhuangtai_kong@2x.png
CNLiveMyOrderModule/Assets/CNLiveMyOrderModule.bundle/zhuangtai_kong@3x.png
CNLiveMyOrderModule/Classes/CNLiveApplyRefundController.h
CNLiveMyOrderModule/Classes/CNLiveApplyRefundController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveApplyRefundController.h
CNLiveMyOrderModule/Classes/Controller/CNLiveApplyRefundController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveEvaluateController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveMyOrderController.h
CNLiveMyOrderModule/Classes/Controller/CNLiveMyOrderController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveOrderDetailController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveRefundController.h
CNLiveMyOrderModule/Classes/Controller/CNLiveRefundController.m
CNLiveMyOrderModule/Classes/Controller/CNLiveServiceOrderController.m
CNLiveMyOrderModule/Classes/Model/DSAddressModel.h
CNLiveMyOrderModule/Classes/Model/DSAddressModel.m
@@ -68,9 +68,9 @@ TODO: Add long description of the pod here.
   #用户库
   s.dependency 'CNLiveUserManagement'
   #IM
- # s.dependency 'CNLiveIMBaseSDK'
+  s.dependency 'CNLiveIMBaseSDK'
   #相册
-#  s.dependency 'CNLiveImagePickerController'
+  s.dependency 'CNLiveImagePickerController'
   #网络请求
   s.dependency 'CNLiveRequestBastKit'
   #三方库
@@ -81,6 +81,8 @@ TODO: Add long description of the pod here.
   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
   s.dependency 'CNLiveTripartiteManagement/MJRefresh'
   s.dependency 'JXCategoryView'
+  s.dependency 'DSCnliveShopSDK'
+  s.dependency 'CNLiveManager'
   s.user_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'
    }
    s.resource_bundles = {
@@ -90,4 +92,5 @@ TODO: Add long description of the pod here.
   # s.public_header_files = 'Pod/Classes/**/*.h'
    s.frameworks = 'UIKit', 'Foundation'
   # s.dependency 'AFNetworking', '~> 2.3'
+  s.static_framework = true
 end
+//
+//  CNLiveApplyRefundController.h
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/26.
+//
+
+#import <CNLiveCommonClass/CNLiveCommonClass.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveApplyRefundController : CNCommonViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveApplyRefundController.m
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/26.
+//
+
+#import "CNLiveApplyRefundController.h"
+
+@interface CNLiveApplyRefundController ()
+
+@end
+
+@implementation CNLiveApplyRefundController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+   
+}
+
+
+
+@end
+//
+//  CNLiveApplyRefundController.h
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/27.
+//
+
+#import <CNLiveCommonClass/CNLiveCommonClass.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveApplyRefundController : CNCommonViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveApplyRefundController.m
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/27.
+//
+
+#import "CNLiveApplyRefundController.h"
+#import "CNLiveMineOrderView.h"
+@interface CNLiveApplyRefundController ()
+
+@end
+
+@implementation CNLiveApplyRefundController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+
+
+@end
@@ -31,6 +31,15 @@
 - (void)dealloc {
     NSLog(@"评论晒单走了dealloc了吗");
 }
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
    self.title = @"评论晒单";
@@ -10,7 +10,9 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveMyOrderController : CNCommonViewController
-- (void)getOrderType:(NSInteger)type;
+//- (void)getOrderType:(NSInteger)type;
+@property (nonatomic, assign) NSInteger status;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -12,12 +12,18 @@
 #import "CNLiveDefinesHeader.h"
 #import <Masonry/Masonry.h>
 #import "CNLiveServiceOrderController.h"
+#import <DSCnliveShopSDK/DSOrderListViewController.h>
+#import <DSCnliveShopSDK/DSROrderListViewController.h>
 static const CGFloat KCategoryViewHeight = 44;
 @interface CNLiveMyOrderController ()<JXCategoryViewDelegate,UIScrollViewDelegate>
 @property (nonatomic, strong) JXCategoryTitleView *titleCategoryView;
 @property (nonatomic, strong) NSArray *titles;
 @property (nonatomic, strong) UIScrollView *scrollView;
-@property (nonatomic, assign) NSInteger status;
+@property (nonatomic, strong) DSOrderListViewController *orderVc; //商品订单
+@property (nonatomic, strong) DSROrderListViewController *foodVc; //餐饮订单
+@property (nonatomic, strong) CNLiveServiceOrderController *serviveVc; //服务订单
+@property (nonatomic, strong) JXCategoryIndicatorLineView *lineView;
+@property (nonatomic, assign) NSInteger index;
 @end
@@ -27,6 +33,10 @@ static const CGFloat KCategoryViewHeight = 44;
     [super viewWillAppear:animated];
      self.navigationController.navigationBarHidden = NO;
 }
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
 #pragma mark - 前一个页面传过来点击哪个
 - (void)getOrderType:(NSInteger)type {
     self.status = type;
@@ -43,17 +53,73 @@ static const CGFloat KCategoryViewHeight = 44;
 - (void)viewDidLayoutSubviews {
      [super viewDidLayoutSubviews];
     self.titleCategoryView.frame = CGRectMake(60, kVerticalStatusHeight, KScreenWidth -120 , KCategoryViewHeight);
+    NSLog(@"打印看看这里的status%d",kVerticalStatusHeight);
+}
+- (JXCategoryTitleView *)myCategoryView {
+    return (JXCategoryTitleView *)self.titleCategoryView;
+}
+
+- (JXCategoryBaseView *)preferredCategoryView {
+    return [[JXCategoryTitleView alloc] init];
 }
 #pragma mark - JXCategoryDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
-    
+    self.index = index;
+    switch (index) {
+        case 0:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"333333");
+            self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"23D41E");
+            [self.scrollView addSubview:self.serviveVc.view];
+            
+        }
+            break;
+        case 1:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"#FF725C");
+            self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"#FF725C");
+            [self.scrollView addSubview:_orderVc.view];
+        }
+            break;
+        case 2:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"#FF725C");
+            self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"#FF725C");
+            [self.scrollView addSubview:self.foodVc.view];
+            
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+- (void)setIndex:(NSInteger)index {
+    _index = index;
+    switch (index) {
+        case 0:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"333333");
+                       self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"23D41E");
+        }
+            break;
+        case 1:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"#FF725C");
+            self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"#FF725C");
+        }
+            break;
+        case 2:{
+            self.lineView.indicatorColor = CNLiveColorWithHexString(@"#FF725C");
+                       self.titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"#FF725C");
+        }
+            break;
+        default:
+            break;
+    }
 }
 #pragma mark - 懒加载
 - (JXCategoryTitleView *)titleCategoryView{
     if (!_titleCategoryView) {
         _titleCategoryView = [[JXCategoryTitleView alloc]initWithFrame:CGRectMake(60, kVerticalStatusHeight, KScreenWidth -120 , KCategoryViewHeight)];
+        NSLog(@"打印看看这里的category高度%d",kVerticalStatusHeight);
         _titleCategoryView.titles = self.titles;
         _titleCategoryView.delegate = self;
         _titleCategoryView.titleColor = CNLiveColorWithHexString(@"333333");
@@ -62,13 +128,13 @@ static const CGFloat KCategoryViewHeight = 44;
         _titleCategoryView.titleLabelZoomScale = 1.0;
         _titleCategoryView.collectionView.scrollEnabled = NO;
         _titleCategoryView.titleLabelZoomEnabled = NO;
+        _titleCategoryView.defaultSelectedIndex = 0;
         _titleCategoryView.cellWidth = 60;
         _titleCategoryView.collectionView.frame = _titleCategoryView.bounds;
-//        _titleCategoryView.selectedIndex = 0
-        JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
-        lineView.indicatorColor = CNLiveColorWithHexString(@"23D41E");
-        lineView.indicatorWidth = JXCategoryViewAutomaticDimension;
-        _titleCategoryView.indicators = @[lineView];
+        self.lineView = [[JXCategoryIndicatorLineView alloc] init];
+        self.lineView.indicatorColor = CNLiveColorWithHexString(@"23D41E");
+        self.lineView.indicatorWidth = JXCategoryViewAutomaticDimension;
+        _titleCategoryView.indicators = @[self.lineView];
         _titleCategoryView.contentScrollView = self.scrollView;
         self.navigationItem.titleView = self.titleCategoryView;
     }
@@ -79,6 +145,7 @@ static const CGFloat KCategoryViewHeight = 44;
     if (!_scrollView) {
         CGFloat scrollW = KScreenWidth;
         CGFloat scrollH = KScreenHeight - kNavigationBarHeight;
+        NSLog(@"打印看看这里的导航栏高度%d",kNavigationBarHeight);
         _scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0,kNavigationBarHeight,scrollW, scrollH)];
         _scrollView.contentSize = CGSizeMake(scrollW *3, scrollH);
         _scrollView.backgroundColor = [UIColor whiteColor];
@@ -88,21 +155,19 @@ static const CGFloat KCategoryViewHeight = 44;
         _scrollView.scrollEnabled = NO;
         _scrollView.delegate = self;
         CNLiveServiceOrderController *serviceVc = [[CNLiveServiceOrderController alloc]init];
-        [self addChildViewController:serviceVc];
         serviceVc.view.frame = CGRectMake(0, 0, scrollW, scrollH);
         serviceVc.status = self.status;
-//        serviceVc.view.backgroundColor = [UIColor cyanColor];
+        self.serviveVc = serviceVc;
         [_scrollView addSubview:serviceVc.view];
-        CNLiveServiceOrderController *goodsVc = [[CNLiveServiceOrderController alloc]init];
-        [self addChildViewController:goodsVc];
-        goodsVc.view.frame = CGRectMake(scrollW, 0, scrollW, scrollH);
-//        goodsVc.view.backgroundColor = [UIColor greenColor];
-        [_scrollView addSubview:goodsVc.view];
-        CNLiveServiceOrderController *foodVc = [[CNLiveServiceOrderController alloc]init];
-        [self addChildViewController:foodVc];
-        foodVc.view.frame = CGRectMake(scrollW *2, 0, scrollW, scrollH);
-//        foodVc.view.backgroundColor = [UIColor purpleColor];
-        [_scrollView addSubview:foodVc.view];
+        DSOrderListViewController *orderVc = [[DSOrderListViewController alloc]init];
+        orderVc.view.frame = CGRectMake(KScreenWidth, 0, scrollW, scrollH);
+        orderVc.display = DSOrderListDisplayTotal;
+        orderVc.isNeedNavigationBar = NO;
+        self.orderVc = orderVc;
+        DSROrderListViewController *foofVc = [[DSROrderListViewController alloc]init];
+        foofVc.view.frame = CGRectMake(KScreenWidth *2, 0, scrollW, scrollH);
+        foofVc.isNeedNavigationBar = NO;
+        self.foodVc = foofVc;
     }
     return _scrollView;
@@ -16,16 +16,17 @@
 #import "Masonry.h"
 #import "CNLiveErrorOrNoNetView.h"
 #import "CNLiveOrderEventHandle.h"
-//#import "TIMAdapter.h"
-//#import "CommonLibrary.h"
+#import "TIMAdapter.h"
+#import "CommonLibrary.h"
 #import "CNLiveCommonCategory.h"
 #import "CNLiveAddPopFuncView.h"
 #import "CNLiveOrderDetailContentView.h"
 #import "CNLiveOrderViewModel.h"
 #import "CNLiveEvaluateController.h"
+#import <DSCnliveShopSDK/DSCnliveShopSDK.h>
 #define Default_H   45
 #define OrderIdKey @"OrderIdKey" //订单号
-@interface CNLiveOrderDetailController ()<CNLiveRefundVoucherViewDelegate,CNAddPopFuncViewDelegate>
+@interface CNLiveOrderDetailController ()<CNLiveRefundVoucherViewDelegate,CNAddPopFuncViewDelegate,CNLiveAddressViewDelegate>
 @property (nonatomic, strong) UIScrollView *scrollView;
 @property (strong, nonatomic) UIPageControl * pageControl;
 @property (nonatomic, strong) CNLiveAddPopFuncView *popFunItemView;
@@ -91,6 +92,10 @@
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = NO;
 }
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"订单详情";
@@ -106,7 +111,7 @@
     [self requestData:self.orderId];
 //    [self loadData];
     //底部工具栏响应事件
-//    [self bottomFuncEvent];
+    [self bottomFuncEvent];
 }
 - (void)addSubViews {
     [self.scrollView addSubview:self.statusView];
@@ -446,6 +451,7 @@
         if (!strongSelf) {
             return ;
         }
+        strongSelf.moreBtn.hidden = NO;
         [QMUITips hideAllToastInView:strongSelf.view animated:YES];
         CNLiveOrderListOrderItem *orderItem = list.orderItem;
         CNLiveOrderRefundItem *refundItem = list.refundMsg;
@@ -529,6 +535,11 @@
             else {
                 strongSelf.addressView.list = list;
             }
+            
+
+            [DSAddressRequest postMyFirstAddressWithUid:[IMAPlatform sharedInstance].host.userId storeId:nil result:^(DSAddressModel * _Nonnull addressModel, NSString * _Nonnull errorMessage) {
+                [strongSelf.addressView updateFirstAddress:addressModel];
+            }];
         }
         if (orderItem.status == 7) {
             strongSelf.voucherView.hidden = YES;
@@ -555,7 +566,7 @@
     } failure:^(NSError * _Nonnull error) {
         if (error.code == -1009 || error.code == -1001) {
-            [weakSelf showErrorRetryType:RetryTypeNoNet noNet:YES];
+            [weakSelf showErrorRetryType:OrderRetryTypeNoNet noNet:YES];
         }else if (error.code == 405) {
             weakSelf.scrollView.backgroundColor = kWhiteColor;
             weakSelf.moreBtn.hidden = YES;
@@ -564,12 +575,12 @@
             weakSelf.scrollView.backgroundColor = kWhiteColor;
                                [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"个人订单" detailText:@"该订单不是您的个人订单" buttonTitle:@"点击退出" buttonAction:@selector(exitOrderDetail:)];
         }else {
-            [weakSelf showErrorRetryType:RetryTypeError noNet:NO];
+            [weakSelf showErrorRetryType:OrderRetryTypeError noNet:NO];
         }
     }];
 }
 #pragma mark -展示错误页
-- (void)showErrorRetryType:(RetryType)type noNet:(BOOL)noNet {
+- (void)showErrorRetryType:(OrderRetryType)type noNet:(BOOL)noNet {
     [CNLiveErrorOrNoNetView showErrorByType:type view:self.view hidenRetry:NO handle:^{
 //        [self requestData:self.orderId];
     }];
@@ -808,7 +819,7 @@
                     return ;
                 }
-                [CNLiveOrderEventHandle submitOrder:weakSelf.list address:weakSelf.addressView.addressModel superView:weakSelf.view complete:^(BOOL ret) {
+                [CNLiveOrderEventHandle submitOrder:weakSelf.list address:weakSelf.addressView. addressModel superView:weakSelf.view complete:^(BOOL ret) {
                     if (ret) {
                         if (ret) {
                             [weakSelf.navigationController popViewControllerAnimated:YES];
@@ -842,7 +853,7 @@
             case CNLiveMineOrderButtonItemTypeContactDaRen: {   //联系达人
                 [CNLiveOrderEventHandle contactUser:weakSelf.list pop:weakSelf.fromChat jumpBlock:^(BOOL isPop) {
-                    
+#pragma mark - TOTO联系达人
                 }];
             }
                 break;
@@ -850,14 +861,14 @@
             case CNLiveMineOrderButtonItemTypePay: {    //去付款
 //                [CNOrderEventHandle pay:weakSelf.list payBlock:nil];
                 [CNLiveOrderEventHandle pay:weakSelf.list payBlock:^(int code) {
-                    
+#pragma mark - 去付款
                 }];
             }
                 break;
             case CNLiveMineOrderButtonItemTypeReminder: { //催单
                 [CNLiveOrderEventHandle reminderOrder:weakSelf.list  superView:weakSelf.view complete:^(NSString *msg) {
-//                    [[HUDHelper sharedInstance] tipMessage:msg];
+                    [[HUDHelper sharedInstance] tipMessage:msg];
                 }];
             }
@@ -902,11 +913,27 @@
     };
 }
+#pragma mark - CNAddressViewDelegate
+- (void)selectedAddressComplete {
+    [self.scrollView layoutSubviews];
+    self.scrollView.contentSize = CGSizeMake(KScreenWidth, self.funcView.bottom);
+}
 #pragma mark - CNAddPopFuncViewDelegate
 - (void)popFuncView:(CNLiveAddPopFuncView *)popView indexPath:(NSInteger)row
 {
 }
+#pragma mark -通知
+- (void)evaluateSuccess {
+    [self requestData:self.orderId];
+}
+- (void)applyRefundSuccess {
+    [self requestData:self.orderId];
+}
+- (void)deleteDefaultAddress {
+    _addressView.addressModel = nil;
+    _addressView.allowEdit = YES;
+}
 #pragma mark -
 #pragma mark - Getter
 - (UIScrollView *)scrollView
@@ -946,7 +973,7 @@
 {
     if (!_addressView) {
         _addressView = [[CNLiveAddressView alloc] init];
-//        _addressView.delegate = self;
+        _addressView.delegate = self;
     }
     return _addressView;
 }
+//
+//  CNLiveRefundController.h
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/25.
+//
+
+#import <CNLiveCommonClass/CNLiveCommonClass.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveRefundController : CNCommonViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveRefundController.m
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/25.
+//
+
+#import "CNLiveRefundController.h"
+#import "CNLiveMineOrderTableViewCell.h"
+#import "CNLiveOrderModel.h"
+#import "CNLiveOrderDetailController.h"
+#import "CNLiveNoOrderView.h"
+#import "UIColor+CNLiveExtension.h"
+#import <DSCnliveShopSDK/DSAfterSaleListViewController.h>
+#import "CNLiveOrderViewModel.h"
+#import "CNLiveNetworking.h"
+#import "JXCategoryTitleView.h"
+#import "JXCategoryIndicatorLineView.h"
+#import "CNLiveDefinesHeader.h"
+#import "UIColor+CNLiveExtension.h"
+#import "MJRefresh.h"
+#import "CNLiveOrderEventHandle.h"
+#import "CNLiveCommonCategory.h"
+#import <DSCnliveShopSDK/DSAfterSaleListViewController.h>
+//#import "TIMAdapter.h"
+//#import "CommonLibrary.h"
+#import "CNLiveRefreshHeader.h"
+#import "HUDHelper.h"
+#import "CNLiveErrorOrNoNetView.h"
+static const CGFloat KCategoryViewHeight = 44;
+@interface CNLiveRefundController ()<UITableViewDelegate,UITableViewDataSource,CNLiveMineOrderTableViewCellDelegate,JXCategoryViewDelegate>
+{
+   
+}
+@property (nonatomic, weak) UIView *line;
+@property (nonatomic, strong) NSMutableArray *titleLists;
+@property (nonatomic, strong) NSMutableArray *listArr;  //数据源
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) CNLiveNoOrderView *noDataView;
+@property (nonatomic, assign) NSInteger page;
+@property (nonatomic, assign) BOOL next;
+@property (nonatomic, strong) NSArray *titles;
+@property (nonatomic, strong) JXCategoryTitleView *titleCategoryView;
+@property (nonatomic, strong) JXCategoryIndicatorLineView *lineView;
+@property (nonatomic, strong) UIScrollView *scrollView;
+@property (nonatomic, assign) NSInteger index;
+@property (nonatomic, strong) DSAfterSaleListViewController *listVc;
+@end
+
+@implementation CNLiveRefundController
+
+- (void)dealloc {
+    NSLog(@"退款/售后走了dealloc吗");
+}
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+//    self.title = @"退款/售后";
+    self.titles = @[@"服务售后",@"商品售后"];
+    _listArr = [NSMutableArray array];
+    _page = 1;
+    self.index = 0;
+    UIBarButtonItem *callItem = [[UIBarButtonItem alloc]initWithImage:[UIImage cnLive_getImageNameWithBundle:@"dd_dianhua" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]] style:UIBarButtonItemStylePlain target:self action:@selector(callItemAction)];
+    self.navigationItem.rightBarButtonItem = callItem;
+//    [self.view addSubview:self.tableView];
+    [self.view addSubview:self.scrollView];
+    [self requestRefundDataWithPage:_page];
+   
+    
+}
+- (void)viewDidLayoutSubviews {
+     [super viewDidLayoutSubviews];
+    self.titleCategoryView.frame = CGRectMake(60, kVerticalStatusHeight, KScreenWidth - 160 , KCategoryViewHeight);
+}
+- (JXCategoryTitleView *)myCategoryView {
+    return (JXCategoryTitleView *)self.titleCategoryView;
+}
+
+- (JXCategoryBaseView *)preferredCategoryView {
+    return [[JXCategoryTitleView alloc] init];
+}
+#pragma mark -打电话
+- (void)callItemAction {
+     NSString *callPhone = [NSString stringWithFormat:@"telprompt://%@",@"010-65832485"];
+        // 大于等于10.0系统使用此openURL方法
+        if (@available(iOS 10.0, *)) {
+            [[UIApplication sharedApplication]openURL:[NSURL URLWithString:callPhone] options:@{} completionHandler:nil];
+        } else {
+           [[UIApplication sharedApplication]openURL:[NSURL URLWithString:callPhone]];
+        }
+}
+#pragma mark - 请求数据
+- (void)requestRefundDataWithPage:(NSInteger)page {
+    if (![CNLiveNetworking isNetworking]) {
+        [QMUITips showError:@"网络不给力" inView:self.view hideAfterDelay:1.5f];
+        return;
+    }
+    __weak typeof(self) weakSelf = self;
+//    [QMUITips showLoadingInView:self.view];
+    [CNLiveOrderViewModel requestRefundDataWithPage:page success:^(NSMutableArray * _Nonnull array, BOOL haveNext) {
+//        [QMUITips hideAllToastInView:self.view animated:YES];
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) {
+            return ;
+        }
+        if ([strongSelf.tableView.mj_header isRefreshing]) {
+            [strongSelf.tableView.mj_header endRefreshing];
+        }
+        if ([strongSelf.tableView.mj_footer isRefreshing]) {
+            [strongSelf.tableView.mj_footer endRefreshing];
+        }
+        self.next = haveNext;
+        strongSelf.tableView.mj_footer.hidden = !strongSelf.next;
+        if (haveNext) {
+            strongSelf.page ++;
+        }else {
+            [strongSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+        }
+        [strongSelf.listArr addObjectsFromArray:array];
+        if (strongSelf.listArr.count == 0) {
+            [strongSelf.view addSubview:self.noDataView];
+        }else {
+            [strongSelf.noDataView removeFromSuperview];
+            [strongSelf.tableView reloadData];
+        }
+        
+    } failure:^(NSError * _Nonnull error) {
+        weakSelf.tableView.mj_footer.hidden = YES;
+        [weakSelf.tableView.mj_footer endRefreshing];
+        [weakSelf.tableView.mj_header endRefreshing];
+        if (weakSelf.listArr.count > 0) {
+            [QMUITips showWithText:error.localizedDescription inView:self.view hideAfterDelay:1.5f];
+        } else {
+            if (error.code == -1009 || error.code == -1001) {
+                [self showErrorRetryType:OrderRetryTypeNoNet noNet:YES];
+            } else {
+                [self showErrorRetryType:OrderRetryTypeError noNet:NO];
+            }
+            
+        }
+    }];
+}
+#pragma mark -显示错误页
+- (void)showErrorRetryType:(OrderRetryType)type noNet:(BOOL)noNet {
+    [CNLiveErrorOrNoNetView showErrorByType:type view:self.view hidenRetry:self.listArr.count > 0 handle:^{
+        [self retryLoadData];
+    }];
+}
+
+#pragma mark - 下拉刷新
+-(void)refreshData {
+    _page = 1;
+    if (self.listArr.count > 0) {
+        [self.listArr removeAllObjects];
+    }
+    [self requestRefundDataWithPage:_page];
+}
+#pragma mark - 上拉加载更多
+- (void)loadMoreData {
+    [self requestRefundDataWithPage:_page];
+}
+#pragma mark - 重试
+- (void)retryLoadData {
+    _page = 1;
+    if (self.listArr.count > 0) {
+        [self.listArr removeAllObjects];
+    }
+    [self requestRefundDataWithPage:_page];
+}
+#pragma mark -JXCategoryViewDelegate
+- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
+    self.index = index;
+    switch (index) {
+        case 0:{
+            [self.tableView reloadData];
+        }
+            break;
+        case 1:{
+            [self.scrollView addSubview:self.listVc.view];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+#pragma mark - CNMineOrderTableViewCellDelegate
+- (void)cellWithOrderModel:(CNLiveOrderList *)model type:(CNLiveMineOrderButtonItemType)type {
+    switch (type) {
+        case CNLiveMineOrderButtonItemTypeContactDaRen:
+        {
+#pragma mark -TODO联系达人(这里需要)CNChatViewController还没有封装
+            
+        }
+        break;
+        case CNLiveMineOrderButtonItemTypeRefundDetail: {
+            [CNLiveOrderEventHandle refundDetail:model jumpBlock:^(NSString * _Nonnull orderId) {
+                CNLiveOrderDetailController *vc = [[CNLiveOrderDetailController alloc]init];
+                vc.orderId = orderId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }];
+        }
+            break;
+        case CNLiveMineOrderButtonItemTypeReminder:{
+            [CNLiveOrderEventHandle reminderOrder:model superView:self.view complete:^(NSString * _Nonnull msg) {
+                [[HUDHelper sharedInstance]tipMessage:msg];
+            }];
+        }
+            break;
+        case CNLiveMineOrderButtonItemTypeRefund:{
+#pragma mark -申请退款
+        }
+            break;
+        case CNLiveMineOrderButtonItemTypeConfirmReceipt: { //确认收货
+            [CNLiveOrderEventHandle confirmRecv:model itemId:@"" superView:self.view complete:^(BOOL ret) {
+                if (ret) {
+#pragma mark -这里要在看看,为什么传0呢
+                    [self requestRefundDataWithPage:0];
+                }
+            }];
+        }
+            break;
+        default:
+            break;
+    }
+}
+#pragma mark - UITableViewDelegate,UITableViewDataSource
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.listArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *cellId = @"CNMineOrderTableViewCell";
+    CNLiveMineOrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId];
+    if (!cell) {
+        cell = [[CNLiveMineOrderTableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellId];
+    }
+    CNLiveOrderList *model = self.listArr[indexPath.row];
+    cell.delegate = self;
+    [cell configOrderList:model delegate:self];
+    return cell;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    CNLiveOrderList *model = self.listArr[indexPath.row];
+    return [model.orderItem cellHeight];
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [self.tableView qmui_clearsSelection];
+    CNLiveMineOrderTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    [CNLiveOrderEventHandle orderDetail:cell.list orderBlock:^(NSString * _Nonnull orderId) {
+        CNLiveOrderDetailController *vc= [[CNLiveOrderDetailController alloc]init];
+        vc.orderId = orderId;
+        [self.navigationController pushViewController:vc animated:YES];
+    }];
+}
+#pragma mark - lazy
+- (JXCategoryTitleView *)titleCategoryView{
+    if (!_titleCategoryView) {
+        _titleCategoryView = [[JXCategoryTitleView alloc]initWithFrame:CGRectMake(60, kVerticalStatusHeight, KScreenWidth -160 , KCategoryViewHeight)];
+        _titleCategoryView.titles = self.titles;
+        _titleCategoryView.delegate = self;
+        _titleCategoryView.titleColor = CNLiveColorWithHexString(@"333333");
+        _titleCategoryView.titleSelectedColor = CNLiveColorWithHexString(@"23D41E");
+        _titleCategoryView.titleFont = [UIFont systemFontOfSize:16];
+        _titleCategoryView.titleLabelZoomScale = 1.0;
+        _titleCategoryView.collectionView.scrollEnabled = NO;
+        _titleCategoryView.titleLabelZoomEnabled = NO;
+        _titleCategoryView.defaultSelectedIndex = 0;
+        _titleCategoryView.cellWidth = 60;
+        _titleCategoryView.collectionView.frame = _titleCategoryView.bounds;
+        self.lineView = [[JXCategoryIndicatorLineView alloc] init];
+        self.lineView.indicatorColor = CNLiveColorWithHexString(@"23D41E");
+        self.lineView.indicatorWidth = JXCategoryViewAutomaticDimension;
+        _titleCategoryView.indicators = @[self.lineView];
+        _titleCategoryView.contentScrollView = self.scrollView;
+        self.navigationItem.titleView = self.titleCategoryView;
+    }
+    return _titleCategoryView;
+}
+- (UIScrollView *)scrollView {
+    
+    if (!_scrollView) {
+        CGFloat scrollW = KScreenWidth;
+        CGFloat scrollH = KScreenHeight - kNavigationBarHeight;
+        _scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0,kNavigationBarHeight,scrollW, scrollH)];
+        _scrollView.contentSize = CGSizeMake(scrollW *2, scrollH);
+        _scrollView.backgroundColor = [UIColor whiteColor];
+        _scrollView.showsHorizontalScrollIndicator = NO;
+        _scrollView.showsVerticalScrollIndicator = NO;
+        _scrollView.pagingEnabled = NO;
+        _scrollView.scrollEnabled = NO;
+        _scrollView.delegate = self;
+        [_scrollView addSubview:self.tableView];
+    }
+    return _scrollView;
+}
+- (UITableView *)tableView {
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight-kNavigationBarHeight) style:UITableViewStylePlain];
+        _tableView.backgroundColor = [UIColor whiteColor];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshData)];
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
+    }
+    return _tableView;
+}
+- (DSAfterSaleListViewController *)listVc{
+    if (!_listVc) {
+        _listVc = [[DSAfterSaleListViewController alloc]init];
+        _listVc.view.frame = CGRectMake(KScreenWidth, 0, KScreenWidth, KScreenHeight - kNavigationBarHeight);
+        _listVc.isNeedNavigationBar = YES;
+    }
+    return _listVc;
+}
+- (CNLiveNoOrderView *)noDataView {
+    if (!_noDataView) {
+        _noDataView = [[CNLiveNoOrderView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight - kNavigationBarHeight)];
+        [_noDataView setImageName:[UIImage cnLive_getImageNameWithBundle:@"dd_wutuikuan" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]] title:@"您还没有相关退款的订单" customTopH:109];
+    }
+    return _noDataView;
+}
+
+@end
@@ -34,15 +34,36 @@ static const CGFloat KCategoryViewHeight = 44;
 - (void)dealloc {
     NSLog(@"订单页面dealloc走了吗");
 }
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = NO;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.titles = @[@"全部",@"待付款",@"待收货",@"待评价"];
     [self addSubViews];
-    [self.allTblView refreshData:self.status];
-    [self cellDidSelected];
-    [self evaluateOrderAction];
 }
-
+- (void)setStatus:(NSInteger)status {
+    _status  = status;
+    _categoryView.defaultSelectedIndex = status;
+    if (self.status == 0) {
+        [self.allTblView refreshData:0];
+         [self allJumpAction];
+    }else if (self.status == 1) {
+        [self.payTblView refreshData:1];
+         [self allJumpAction];
+    }else if (self.status == 2) {
+        [self.goodsTblView refreshData:2];
+         [self allJumpAction];
+    }else if (self.status == 3){
+        [self.evaluateTblView refreshData:3];
+         [self allJumpAction];
+    }
+}
 #pragma mark - initView
 - (void)addSubViews {
     [self.view addSubview:self.scrollView];
@@ -61,6 +82,11 @@ static const CGFloat KCategoryViewHeight = 44;
         make.height.mas_equalTo(1);
     }];
 }
+#pragma mark -各种跳转
+- (void)allJumpAction {
+    [self cellDidSelected];
+    [self evaluateOrderAction];
+}
 #pragma mark -CategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     self.status = index;
@@ -69,29 +95,25 @@ static const CGFloat KCategoryViewHeight = 44;
         {
             //全部订单
             [_allTblView refreshData:0];
-            [self cellDidSelected];
-            [self evaluateOrderAction];
+            [self allJumpAction];
         }
             break;
         case 1:{
             //待付款
             [_payTblView refreshData:1];
-            [self cellDidSelected];
-            [self evaluateOrderAction];
+            [self allJumpAction];
         }
             break;
         case 2:{
             //待收货
             [_goodsTblView refreshData:2];
-            [self cellDidSelected];
-            [self evaluateOrderAction];
+            [self allJumpAction];
         }
             break;
         case 3:{
             //待评价
             [_evaluateTblView refreshData:3];
-            [self cellDidSelected];
-            [self evaluateOrderAction];
+            [self allJumpAction];
         }
             break;
         default:
@@ -191,6 +213,7 @@ static const CGFloat KCategoryViewHeight = 44;
         _categoryView.collectionView.frame = _categoryView.bounds;
         _categoryView.separatorLineShowEnabled = YES;
 //        _titleCategoryView.selectedIndex = 0
+        _categoryView.defaultSelectedIndex = self.status;
         JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
         lineView.indicatorColor = CNLiveColorWithHexString(@"23D41E");
         lineView.indicatorWidth = JXCategoryViewAutomaticDimension;
-//
-//  DSAddressModel.h
-//  CNLiveMyOrder
-//
-//  Created by 殷巧娟 on 2019/6/13.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSAddressModel : NSObject
-/**
- 地址id
-*/
-@property (nonatomic,copy) NSString * id;
-/**
-  名称
-*/
-@property (nonatomic,copy) NSString * name;
-/**
-  联系电话
-*/
-@property (nonatomic,copy) NSString * phone;
-/**
-  用户填写的详细地址
-*/
-@property (nonatomic,copy) NSString * write_address;
-/**
-  详细地址
-*/
-@property (nonatomic,copy) NSString * address;
-/**
-  省id 0为没选择
-*/
-@property (nonatomic,copy) NSString * province_id;
-/**
-  市id 0为没选择
-*/
-@property (nonatomic,copy) NSString * city_id;
-/**
-  区县id 0为没选择
-*/
-@property (nonatomic,copy) NSString * area_id;
-/**
-  2为默认地址 其他为普通
-*/
-@property (nonatomic,assign) NSUInteger state;
-/**
-  用户id
- */
-@property (nonatomic,copy) NSString * uid;
-/**
-  省市县名称
-*/
-@property (nonatomic,copy) NSString * city_name;
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  DSAddressModel.m
-//  CNLiveMyOrder
-//
-//  Created by 殷巧娟 on 2019/6/13.
-//
-
-#import "DSAddressModel.h"
-
-@implementation DSAddressModel
-
-@end
@@ -6,10 +6,8 @@
 //
 #import <Foundation/Foundation.h>
-#import <CNLiveBeeHive/BeeHive.h>
 NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveOrderModule : NSObject<BHModuleProtocol>
+@interface CNLiveOrderModule : NSObject
 @end
@@ -6,7 +6,12 @@
 //
 #import "CNLiveOrderModule.h"
+#import "BeeHive.h"
+@BeeHiveMod(CNLiveOrderModule)
+@interface CNLiveOrderModule ()<BHModuleProtocol>
+
+@end
 @implementation CNLiveOrderModule
 - (void)modSetUp:(BHContext *)context {
@@ -8,6 +8,7 @@
 #import "CNLiveOrderService.h"
 #import "CNLiveOrderServiceProtocol.h"
 #import "CNLiveMyOrderController.h"
+#import "CNLiveRefundController.h"
 #import <CNLiveBeeHive/BeeHive.h>
 #import <UIKit/UIKit.h>
 @interface CNLiveOrderService ()<CNLiveOrderServiceProtocol>
@@ -23,9 +24,20 @@
 #pragma mark -跳转到订单页面
 - (void)pushToOrderViewController:(NSInteger)index {
     CNLiveMyOrderController *orderVc = [[CNLiveMyOrderController alloc]init];
-    [orderVc getOrderType:index];
+    orderVc.status = index;
+//    [orderVc getOrderType:index];
     [[self navigationViewController]pushViewController:orderVc animated:YES];
 }
+#pragma mark - 获取售后控制器
+- (UIViewController *)getRefundViewController {
+    CNLiveRefundController *refundVc = [[CNLiveRefundController alloc]init];
+    return refundVc;
+}
+#pragma mark - 跳转到售后页面
+- (void)pushToRefundViewController:(NSInteger)index {
+    CNLiveRefundController *refundVc = [[CNLiveRefundController alloc]init];
+    [[self navigationViewController]pushViewController:refundVc animated:YES];
+}
 #pragma mark -获取当前导航栏
 - (UINavigationController *)navigationViewController {
@@ -8,16 +8,16 @@
 #import <UIKit/UIKit.h>
 typedef void(^RetryHandle)(void);
-typedef NS_ENUM(NSUInteger, RetryType) {
-    RetryTypeError  = 0,
-    RetryTypeNoNet,
+typedef NS_ENUM(NSUInteger, OrderRetryType) {
+    OrderRetryTypeError  = 0,
+    OrderRetryTypeNoNet,
 };
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveErrorOrNoNetView : UIView
-+ (CNLiveErrorOrNoNetView *)showErrorByType:(RetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle;
++ (CNLiveErrorOrNoNetView *)showErrorByType:(OrderRetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle;
-+ (CNLiveErrorOrNoNetView *)showErrorByType:(RetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle frame:(CGRect)frame;
++ (CNLiveErrorOrNoNetView *)showErrorByType:(OrderRetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle frame:(CGRect)frame;
 @end
 NS_ASSUME_NONNULL_END
@@ -26,7 +26,7 @@ static const char retryKey;
     NSLog(@"CNLiveErrorOrNoNetView dealloc");
 }
-- (instancetype)initWithView:(UIView *)view type:(RetryType)type
+- (instancetype)initWithView:(UIView *)view type:(OrderRetryType)type
 {
     self = [super initWithFrame:view.bounds];
     if (self) {
@@ -36,7 +36,7 @@ static const char retryKey;
         [self addSubview:self.tipLab];
         [self addSubview:self.retryBtn];
-        if (type == RetryTypeError) {
+        if (type == OrderRetryTypeError) {
             self.errorLab.text = @"接口请求错误";
         } else {
             self.errorLab.text = @"无法连接网络";
@@ -47,10 +47,10 @@ static const char retryKey;
     return self;
 }
-+ (CNLiveErrorOrNoNetView *)showErrorByType:(RetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle {
++ (CNLiveErrorOrNoNetView *)showErrorByType:(OrderRetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle {
     if (hidenRetry) {
-        if (type == RetryTypeError) {
+        if (type == OrderRetryTypeError) {
             [QMUITips showError:@"接口请求失败，请稍后再试！" inView:view hideAfterDelay:1.5];
         } else {
             [QMUITips showError:@"网络连接失败，请稍后再试！" inView:view hideAfterDelay:1.5];
@@ -84,10 +84,10 @@ static const char retryKey;
 }
-+ (CNLiveErrorOrNoNetView *)showErrorByType:(RetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle frame:(CGRect)frame {
++ (CNLiveErrorOrNoNetView *)showErrorByType:(OrderRetryType)type view:(UIView *)view hidenRetry:(BOOL)hidenRetry handle:(RetryHandle)handle frame:(CGRect)frame {
     if (hidenRetry) {
-        if (type == RetryTypeError) {
+        if (type == OrderRetryTypeError) {
             [QMUITips showError:@"接口请求失败，请稍后再试！" inView:view hideAfterDelay:1.5];
         } else {
             [QMUITips showError:@"网络连接失败，请稍后再试！" inView:view hideAfterDelay:1.5];
@@ -108,7 +108,7 @@ static const char retryKey;
     return tipView;
 }
-- (instancetype)initWithView:(UIView *)view type:(RetryType)type frame:(CGRect)frame
+- (instancetype)initWithView:(UIView *)view type:(OrderRetryType)type frame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
@@ -118,7 +118,7 @@ static const char retryKey;
         [self addSubview:self.tipLab];
         [self addSubview:self.retryBtn];
-        if (type == RetryTypeError) {
+        if (type == OrderRetryTypeError) {
             self.errorLab.text = @"接口请求错误";
         } else {
             self.errorLab.text = @"无法连接网络";
@@ -12,12 +12,13 @@
 #import <QMUIKit/QMUIKit.h>
 #import "CNLiveCommonCategory.h"
 #import "CNLiveBaseKit.h"
-//#import "TIMAdapter.h"
+#import "TIMAdapter.h"
 #import <SDWebImage/SDWebImage.h>
-#import "DSAddressModel.h"
+#import <DSCnliveShopSDK/DSCnliveShopSDK.h>
 #import "CNLiveSelectRefundButton.h"
 #import "CNLiveMineOrderItem.h"
 #import "CNLiveOrderList.h"
+#import "HUDHelper.h"
 #define Large_Font      [UIFont systemFontOfSize:15.0f]
 #define Default_Font    [UIFont systemFontOfSize:15.0f]
 #define Small_Font      [UIFont systemFontOfSize:14.0f]
@@ -882,7 +883,6 @@
 }
 @end
 #pragma mark - CNLiveAddressView
-#import "DSAddressModel.h"
 @interface CNLiveAddressView ()
 @property (nonatomic, strong) QMUILabel *nameLab;
 @property (nonatomic, strong) QMUILabel *phoneLab;
@@ -1438,8 +1438,8 @@
     UIPasteboard*pasteboard = [UIPasteboard generalPasteboard];
     pasteboard.string = orderItem.orderId;
-//    [[HUDHelper sharedInstance] tipMessage:@"复制成功且可以粘贴对应编号"];
-    [QMUITips showWithText:@"复制成功且可以粘贴对应编号" inView:self hideAfterDelay:1.5f];
+    [[HUDHelper sharedInstance] tipMessage:@"复制成功且可以粘贴对应编号"];
+//    [QMUITips showWithText:@"复制成功且可以粘贴对应编号" inView:self hideAfterDelay:1.5f];
 }
 - (void)updateCutdown:(NSInteger)seconds {
@@ -18,10 +18,11 @@
 #import "MJExtension.h"
 #import "CNUserInfoManager.h"
 //#import "TIMAdapter.h"
-//#import "CommonLibrary.h"
+#import "HUDHelper.h"
 #import "CNLiveCommonCategory.h"
 #import "CNLiveOrderViewModel.h"
 #import "CNLiveOrderList.h"
+#import "CNLiveRefreshHeader.h"
 static const CGFloat KCategoryViewHeight = 44;
 @interface CNLiveOrderListCommonView ()<UITableViewDelegate,UITableViewDataSource,CNLiveMineOrderTableViewCellDelegate>
 @property (nonatomic, strong) NSMutableArray *listArr;  //数据源
@@ -67,6 +68,7 @@ static const CGFloat KCategoryViewHeight = 44;
         }
         if (dataSource.count > 0) {
             [strongSelf.noDataView removeFromSuperview];
+            strongSelf.isHaveNext = isHaveNet;
             strongSelf.tableView.mj_footer.hidden = !strongSelf.isHaveNext;
               [self.listArr addObjectsFromArray:dataSource];
             if (strongSelf.isHaveNext) {
@@ -77,7 +79,6 @@ static const CGFloat KCategoryViewHeight = 44;
         } else {
             [strongSelf.tableView addSubview:strongSelf.noDataView];
         }
-        strongSelf.isHaveNext = isHaveNet;
         strongSelf.tableView.mj_footer.hidden = !strongSelf.isHaveNext;
         [strongSelf.tableView reloadData];
@@ -88,9 +89,9 @@ static const CGFloat KCategoryViewHeight = 44;
             [QMUITips showError:error.localizedDescription inView:self hideAfterDelay:1.5f];
         } else {
             if (error.code == -1009 || error.code == -1001) {
-                [weakSelf showErrorRetryType:RetryTypeNoNet];
+                [weakSelf showErrorRetryType:OrderRetryTypeNoNet];
             }else {
-                [weakSelf showErrorRetryType:RetryTypeError];
+                [weakSelf showErrorRetryType:OrderRetryTypeError];
             }
         }
     }];
@@ -145,7 +146,7 @@ static const CGFloat KCategoryViewHeight = 44;
     }
 }
 #pragma mark - 展示错误页
-- (void)showErrorRetryType:(RetryType)type {
+- (void)showErrorRetryType:(OrderRetryType)type {
     __weak typeof(self) weakSelf = self;
     [CNLiveErrorOrNoNetView showErrorByType:type view:self hidenRetry:self.listArr.count > 0 handle:^{
         [weakSelf loadMoreData];
@@ -211,7 +212,7 @@ static const CGFloat KCategoryViewHeight = 44;
         case CNLiveMineOrderButtonItemTypeReminder: { //催单
             [CNLiveOrderEventHandle reminderOrder:model superView:self complete:^(NSString *msg) {
-//                [[HUDHelper sharedInstance] tipMessage:msg];
+                [[HUDHelper sharedInstance] tipMessage:msg];
             }];
         }
         break;
@@ -277,7 +278,6 @@ static const CGFloat KCategoryViewHeight = 44;
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [self.tableView qmui_clearsSelection];
-    
     CNLiveMineOrderTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     [CNLiveOrderEventHandle orderDetail:cell.list orderBlock:^(NSString * _Nonnull orderId) {
         if (self.orderDetaielCellDidSelectedBlock) {
@@ -295,7 +295,7 @@ static const CGFloat KCategoryViewHeight = 44;
         _tableView.dataSource = self;
         _tableView.tableFooterView = [UIView new];
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
+        _tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
         _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(refreshMoreData)];
     }
     return _tableView;
+//
+//  CNLiveSelectedRefundReasonView.h
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/27.
+//
+
+#import <UIKit/UIKit.h>
+NS_ASSUME_NONNULL_BEGIN
+typedef void(^ReasonBlock)(NSString *reason);
+@interface CNLiveSelectedRefundReasonView : UIView
+-(instancetype)initWithFrame:(CGRect)frame completionBlock:(ReasonBlock)completion;
+- (void)show;
+- (void)dismiss;
+@end
+
+@interface CNLiveSelectedRefundReasonCell : UITableViewCell
+@property (nonatomic, strong) NSString *text;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveSelectedRefundReasonView.m
+//  CNLiveMyOrderModule
+//
+//  Created by 殷巧娟 on 2019/11/27.
+//
+
+#import "CNLiveSelectedRefundReasonView.h"
+#define Cell_H  55
+
+@interface CNLiveSelectedRefundReasonView ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic, strong) NSMutableArray *listArr;
+@property (nonatomic, assign) CGFloat height;
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, copy)   ReasonBlock reasonBlock;
+@property (nonatomic, strong) UIButton *closeBtn;
+@property (nonatomic, strong) UIView *bgView;
+@end
+
+@implementation CNLiveSelectedRefundReasonView
+
+- (instancetype)initWithFrame:(CGRect)frame completionBlock:(ReasonBlock)completion
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+    }
+    return self;
+}
+
+@end
@@ -6,34 +6,34 @@
 //
 #import "CNLiveUploadVoucher.h"
-//#import <CNLiveImagePickerController/TZImagePickerController.h>
-//#import "TZImageManager.h"
-//#import "LxGridViewFlowLayout.h"
-//#import "TZTestCell.h"
-//#import <AssetsLibrary/AssetsLibrary.h>
-//#import <Photos/Photos.h>
-//#import <YYKit/YYKit.h>
-//#import "CNImagePickerController.h"
-//#import "CNLiveBaseKit.h"
-//#import <QMUIKit/QMUIKit.h>
-//#import <Masonry/Masonry.h>
-//#import "CNLiveCommonCategory.h"
-@interface CNLiveUploadVoucher ()<UINavigationControllerDelegate,UIImagePickerControllerDelegate,UICollectionViewDataSource,UICollectionViewDelegate,UIActionSheetDelegate>{
+#import <CNLiveImagePickerController/TZImagePickerController.h>
+#import "TZImageManager.h"
+#import "LxGridViewFlowLayout.h"
+#import "TZTestCell.h"
+#import <AssetsLibrary/AssetsLibrary.h>
+#import <Photos/Photos.h>
+#import <YYKit/YYKit.h>
+#import "CNImagePickerController.h"
+#import "CNLiveBaseKit.h"
+#import <QMUIKit/QMUIKit.h>
+#import <Masonry/Masonry.h>
+#import "CNLiveCommonCategory.h"
+@interface CNLiveUploadVoucher ()<TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate,UICollectionViewDataSource,UICollectionViewDelegate,UIActionSheetDelegate>{
 }
-//@property (nonatomic, strong) UIImagePickerController *imagePickerVc;
-//
-//@property (nonatomic, strong) UILabel *titleLab;
-//@property (nonatomic, strong) UICollectionView *collectionView;
-//@property (nonatomic, strong) LxGridViewFlowLayout *layout;
-//@property (nonatomic, strong) CLLocation *location;
-//@property (nonatomic, strong) NSMutableArray *selectedPhotos;
-//@property (nonatomic, strong) NSMutableArray *selectedAssets;
-//@property (nonatomic, assign) BOOL isSelectOriginalPhoto;
-//@property (nonatomic, assign) CGFloat itemWH;
-//@property (nonatomic, assign) CGFloat margin;
-//@property (nonatomic, assign) CGFloat collHeight;
-//@property (nonatomic, assign) CGFloat add; //是否隐藏加号
-//@property (nonatomic, assign) CGFloat colTop; //collectionView 距离顶部坐标
+@property (nonatomic, strong) UIImagePickerController *imagePickerVc;
+
+@property (nonatomic, strong) UILabel *titleLab;
+@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) LxGridViewFlowLayout *layout;
+@property (nonatomic, strong) CLLocation *location;
+@property (nonatomic, strong) NSMutableArray *selectedPhotos;
+@property (nonatomic, strong) NSMutableArray *selectedAssets;
+@property (nonatomic, assign) BOOL isSelectOriginalPhoto;
+@property (nonatomic, assign) CGFloat itemWH;
+@property (nonatomic, assign) CGFloat margin;
+@property (nonatomic, assign) CGFloat collHeight;
+@property (nonatomic, assign) CGFloat add; //是否隐藏加号
+@property (nonatomic, assign) CGFloat colTop; //collectionView 距离顶部坐标
 @end
 @implementation CNLiveUploadVoucher
 #pragma clang diagnostic push
@@ -47,9 +47,9 @@
     self = [super initWithFrame:frame];
     if (self) {
         self.backgroundColor = [UIColor whiteColor];
-//        _add = 1;
-//        _selectedPhotos = [[NSMutableArray alloc] init];
-//        _selectedAssets = [[NSMutableArray alloc] init];
+        _add = 1;
+        _selectedPhotos = [[NSMutableArray alloc] init];
+        _selectedAssets = [[NSMutableArray alloc] init];
         [self configCollectionView];
     }
     return self;
@@ -57,386 +57,386 @@
 #pragma mark - 添加collectionView
 - (void)configCollectionView {
     // 如不需要长按排序效果，将LxGridViewFlowLayout类改成UICollectionViewFlowLayout即可
-//    _layout = [[LxGridViewFlowLayout alloc] init];
-//    _margin = 8;
-//    _itemWH = (KScreenWidth - 20 - 2 * _margin - 4) / 3 - _margin;
-//    _layout.itemSize = CGSizeMake(_itemWH, _itemWH);
-//    _layout.minimumInteritemSpacing = _margin;
-//    _layout.minimumLineSpacing = _margin;
-//    _colTop = 20;
-//    if (self.titleLabel) {
-//        _colTop += self.titleLabel.height+15;
-//        [self addSubview:self.titleLabel];
-//    }
-//    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(10, _colTop, KScreenWidth-20, _itemWH+10) collectionViewLayout:_layout];
-//    _collectionView.alwaysBounceVertical = YES;
-//    _collectionView.backgroundColor = [UIColor whiteColor];
-//    _collectionView.contentInset = UIEdgeInsetsMake(4, 4, 4, 4);
-//    _collectionView.dataSource = self;
-//    _collectionView.delegate = self;
-//    _collectionView.scrollEnabled = NO;
-//    _collectionView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
-//    [self addSubview:_collectionView];
-//    [_collectionView registerClass:[TZTestCell class] forCellWithReuseIdentifier:@"TZTestCell"];
+    _layout = [[LxGridViewFlowLayout alloc] init];
+    _margin = 8;
+    _itemWH = (KScreenWidth - 20 - 2 * _margin - 4) / 3 - _margin;
+    _layout.itemSize = CGSizeMake(_itemWH, _itemWH);
+    _layout.minimumInteritemSpacing = _margin;
+    _layout.minimumLineSpacing = _margin;
+    _colTop = 20;
+    if (self.titleLabel) {
+        _colTop += self.titleLabel.height+15;
+        [self addSubview:self.titleLabel];
+    }
+    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(10, _colTop, KScreenWidth-20, _itemWH+10) collectionViewLayout:_layout];
+    _collectionView.alwaysBounceVertical = YES;
+    _collectionView.backgroundColor = [UIColor whiteColor];
+    _collectionView.contentInset = UIEdgeInsetsMake(4, 4, 4, 4);
+    _collectionView.dataSource = self;
+    _collectionView.delegate = self;
+    _collectionView.scrollEnabled = NO;
+    _collectionView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
+    [self addSubview:_collectionView];
+    [_collectionView registerClass:[TZTestCell class] forCellWithReuseIdentifier:@"TZTestCell"];
 }
 #pragma mark - Action
 #pragma mark - Action
-//- (void)deleteBtnClik:(UIButton *)sender {
-//    __weak typeof(self) weakSelf = self;
-//    [_selectedPhotos removeObjectAtIndex:sender.tag];
-//    [_selectedAssets removeObjectAtIndex:sender.tag];
-//    [_collectionView performBatchUpdates:^{
-//        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:sender.tag inSection:0];
-//        [weakSelf.collectionView deleteItemsAtIndexPaths:@[indexPath]];
-//    } completion:^(BOOL finished) {
-//        weakSelf.add = 1;
-//        [weakSelf updateHeight];
-//    }];
-//    
-//}
-//
-//#pragma mark - UICollectionViewdelegate
-//
-//- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-//    return self.selectedPhotos.count + self.add;
-//}
-//- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-//    TZTestCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZTestCell" forIndexPath:indexPath];
-//    cell.videoImageView.hidden = YES;
-//    cell.gifLable.hidden = YES;
-//
-//    if (indexPath.row == _selectedPhotos.count) {
-//        cell.imageView.image = [UIImage cnLive_getImageNameWithBundle:@"pj_tianjiazhaopian" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]];
-//        cell.deleteBtn.hidden = YES;
-//    } else {
-//        cell.imageView.image = _selectedPhotos[indexPath.row];
-//        cell.asset = _selectedAssets[indexPath.row];
-//        cell.deleteBtn.hidden = NO;
-//    }
-//
-//    cell.deleteBtn.tag = indexPath.row;
-//    [cell.deleteBtn addTarget:self action:@selector(deleteBtnClik:) forControlEvents:UIControlEventTouchUpInside];
-//    return cell;
-//}
-//
-//- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-//    __weak typeof(self) weakSelf = self;
-//    if (indexPath.row == _selectedPhotos.count) {
-//        
-//        [self createAlertViewTitleArray:@[@"拍照",@"从相册选取"] textColor:KTextBlackColor font:UIFontMake(15) actionBlock:^(UIButton *button, NSInteger didRow) {
-//
-//            switch (didRow) {
-//                case 0: {
-//                    [self takePhoto];
-//                }
-//                    break;
-//
-//                case 1: {
-//                    [self pushTZImagePickerController];
-//                }
-//                    break;
-//
-//                default:
-//                    break;
-//            }
-//
-//        }];
-//        
-//    } else { //预览照片
-//        CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:indexPath.row];
-//        [imagePickerVc configTZImagePicker];
-//        imagePickerVc.maxImagesCount = 9;
-//        imagePickerVc.allowPickingGif = NO;
-//        imagePickerVc.allowPickingOriginalPhoto = YES;
-//        imagePickerVc.allowPickingMultipleVideo = NO;
-//        imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
-//        [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-//            weakSelf.selectedPhotos = [NSMutableArray arrayWithArray:photos];
-//            weakSelf.selectedAssets = [NSMutableArray arrayWithArray:assets];
-//            weakSelf.isSelectOriginalPhoto = isSelectOriginalPhoto;
-//           [weakSelf.collectionView reloadData];
-//            weakSelf.collectionView.contentSize = CGSizeMake(0, ((weakSelf.selectedPhotos.count + 2) / 3 ) * (weakSelf.margin + weakSelf.itemWH));
-//        }];
-//        [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
-//
-//    }
-//}
-//#pragma mark - LxGridViewDataSource
-///// 以下三个方法为长按排序相关代码
-//- (BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath {
-//    return indexPath.item < _selectedPhotos.count;
-//}
-//
-//- (BOOL)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath canMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
-//    return (sourceIndexPath.item < _selectedPhotos.count && destinationIndexPath.item < _selectedPhotos.count);
-//}
-//
-//- (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath didMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
-//    UIImage *image = _selectedPhotos[sourceIndexPath.item];
-//    [_selectedPhotos removeObjectAtIndex:sourceIndexPath.item];
-//    [_selectedPhotos insertObject:image atIndex:destinationIndexPath.item];
-//    
-//    id asset = _selectedAssets[sourceIndexPath.item];
-//    [_selectedAssets removeObjectAtIndex:sourceIndexPath.item];
-//    [_selectedAssets insertObject:asset atIndex:destinationIndexPath.item];
-//    
-//    [_collectionView reloadData];
-//    
-//    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
-//        [self.delegate updateImages:_selectedAssets];
-//    }
-//}
-//
-//#pragma mark - UIImagePickerController
-//- (void)takePhoto {
-//    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
-//    if ((authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied) && iOS7Later) {
-//        // 无相机权限 做一个友好的提示
-//        if (iOS8Later) {
-//            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法使用相机" message:@"请在iPhone的“设置-隐私-相机“中允许访问相机" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
-//            
-//            [alert show];
-//        }
-//    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
-//        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
-//        if (iOS7Later) {
-//            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
-//                if (granted) {
-//                    dispatch_sync(dispatch_get_main_queue(), ^{
-//                        [self takePhoto];
-//                    });
-//                }
-//            }];
-//        } else {
-//            [self takePhoto];
-//        }
-//        // 拍照之前还需要检查相册权限
-//    } else if ([TZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
-//        if (iOS8Later) {
-//            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的“设置-隐私-相册“中允许访问相册" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
-//            [alert show];
-//        }
-//    } else if ([TZImageManager authorizationStatus] == 0) { // 未请求过相册权限
-//        [[TZImageManager manager] requestAuthorizationWithCompletion:^{
-//            [self takePhoto];
-//        }];
-//    } else {
-//        [self pushImagePickerController];
-//    }
-//}
-//// 调用相机
-//- (void)pushImagePickerController {
-//    UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
-//    if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
-//        self.imagePickerVc.sourceType = sourceType;
-//        if(iOS8Later) {
-//            _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
-//        }
-//        [self.viewController presentViewController:_imagePickerVc animated:YES completion:nil];
-//    } else {
-//        NSLog(@"模拟器中无法打开照相机,请在真机中使用");
-//    }
-//}
-//#pragma mark - TZImagePickerController
-////- (void)pushTZImagePickerController {
-////    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc]initWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES];
-////    [imagePickerVc configTZImagePicker];//配置
-////#pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
-////    imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
-////
-////    imagePickerVc.selectedAssets = _selectedAssets;     //目前已经选中的图片数组
-////    imagePickerVc.allowTakePicture = NO;                //在内部显示拍照按钮
-////    imagePickerVc.allowPickingVideo = NO;               //是否允许选择视频
-////    imagePickerVc.allowPickingImage = YES;              //是否允许选择图片
-////    imagePickerVc.allowPickingOriginalPhoto = YES;      //选择原图
-////    imagePickerVc.allowPickingGif = NO;                 //选择Gif
-////    imagePickerVc.allowPickingMultipleVideo = NO;       // 是否可以多选视频
-////    imagePickerVc.sortAscendingByModificationDate = YES;//排序
-////    imagePickerVc.showSelectBtn = NO;
-////    imagePickerVc.allowCrop = NO;                       //是否允许裁剪
-////    imagePickerVc.needCircleCrop = NO;                  //是否使用圆形裁剪
-////
-////    // 你可以通过block或者代理，来得到用户选择的照片.
-////    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-////
-////    }];
-////    [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
-////}
-//- (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
-//    [picker dismissViewControllerAnimated:YES completion:nil];
-//    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
-//    if ([type isEqualToString:@"public.image"]) {
-//        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
-//        tzImagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
-//        tzImagePickerVc.sortAscendingByModificationDate = YES;
-//        [tzImagePickerVc showProgressHUD];
-//        UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
-//        
-//        // save photo and get asset / 保存图片，获取到asset
-//        [[TZImageManager manager] savePhotoWithImage:image location:nil completion:^(NSError *error){
-//            [tzImagePickerVc hideProgressHUD];
-//            if (error) {
-//                [tzImagePickerVc hideProgressHUD];
-//                NSLog(@"图片保存失败 %@",error);
-//            } else {
-//                [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(TZAlbumModel *model) {
-//                    [[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
-//                        [tzImagePickerVc hideProgressHUD];
-//                        TZAssetModel *assetModel = [models firstObject];
-//                        if (tzImagePickerVc.sortAscendingByModificationDate) {
-//                            assetModel = [models lastObject];
-//                        }
-//                        
-//                        [self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
-//                        
-//                    }];
-//                }];
-//            }
-//        }];
-//    }
-//}
-//
-//- (void)refreshCollectionViewWithAddedAsset:(id)asset image:(UIImage *)image {
-//    [_selectedAssets addObject:asset];
-//    [_selectedPhotos addObject:image];
-//    [_collectionView reloadData];
-//    
-//    if (_selectedPhotos.count == 9) {
-//        _add = 0;
-//    } else {
-//        _add = 1;
-//    }
-//    
-//    [self updateHeight];
-//    
-//}
-//- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
-//    if ([picker isKindOfClass:[UIImagePickerController class]]) {
-//        [picker dismissViewControllerAnimated:YES completion:nil];
-//    }
-//}
-//
-//#pragma mark - UIActionSheetDelegate
-//
-//- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
-//    if (buttonIndex == 0) { // take photo / 去拍照
-//        [self takePhoto];
-//    } else if (buttonIndex == 1) {
-//        [self pushTZImagePickerController];
-//    }
-//}
-//
-//#pragma mark - UIAlertViewDelegate
-//- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
-//    if (buttonIndex == 1) { // 去设置界面，开启相机访问权限
-//        if (iOS8Later) {
-//            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
-//        }
-//    }
-//}
-//
-//#pragma mark - TZImagePickerControllerDelegate
-//- (void)tz_imagePickerControllerDidCancel:(TZImagePickerController *)picker {
-//    // NSLog(@"cancel");
-//}
-//
-//- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
-//    _selectedPhotos = [NSMutableArray arrayWithArray:photos];
-//    _selectedAssets = [NSMutableArray arrayWithArray:assets];
-//    _isSelectOriginalPhoto = isSelectOriginalPhoto;
-//
-//    if (_selectedPhotos.count == 9) {
-//        _add = 0;
-//    } else {
-//        _add = 1;
-//    }
-//
-//    [self updateHeight];
-//
-//}
-//
-////更新自身高度
-//- (void)updateHeight {
-//    
-//    NSInteger num = 0;
-//    if (_selectedAssets.count == 9) {
-//        num = 9;
-//    } else {
-//        num = _selectedAssets.count+1;
-//    }
-//    
-//    NSInteger integer = num/3;
-//    NSInteger remainder = num%3;
-//    
-//    if (remainder > 0) {
-//        integer += 1;
-//    }
-//    
-//    _collectionView.frame = CGRectMake(10, _colTop, KScreenWidth-20, _itemWH*integer + integer*_margin +10);
-//    [_collectionView reloadData];
-//    
-//    CGFloat h = _collectionView.height + integer*_margin + 60;
-//    [self mas_updateConstraints:^(MASConstraintMaker *make) {
-//        make.height.mas_equalTo(h);
-//    }];
-//    
-//    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
-//        [self.delegate updateImages:_selectedPhotos];
-//    }
-//    
-//}
-//
-//
-//// Decide album show or not't
-//// 决定相册显示与否
-//- (BOOL)isAlbumCanSelect:(NSString *)albumName result:(id)result {
-//    return YES;
-//}
-//
-//// Decide asset show or not't
-//// 决定asset显示与否
-//- (BOOL)isAssetCanSelect:(id)asset {
-//    return YES;
-//}
-//
-//#pragma mark -
-//#pragma mark - Getter
-//- (UILabel *)titleLab
-//{
-//    if (!_titleLab) {
-//        _titleLab = [[UILabel alloc] init];
-//        _titleLab.font = [UIFont systemFontOfSize:15];
-//        _titleLab.text = @"上传照片";
-//    }
-//    return _titleLab;
-//}
-//
-//- (UIImagePickerController *)imagePickerVc {
-//    if (_imagePickerVc == nil) {
-//        _imagePickerVc = [[UIImagePickerController alloc] init];
-//        _imagePickerVc.delegate = self;
-//        // set appearance / 改变相册选择页的导航栏外观
-//        if (iOS7Later) {
-//            _imagePickerVc.navigationBar.barTintColor = self.viewController.navigationController.navigationBar.barTintColor;
-//        }
-//        _imagePickerVc.navigationBar.tintColor = self.viewController.navigationController.navigationBar.tintColor;
-//        UIBarButtonItem *tzBarItem, *BarItem;
-//        if (iOS9Later) {
-//            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
-//            BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
-//        } else {
-//            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
-//            BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
-//        }
-//        NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];
-//        [BarItem setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
-//        
-//    }
-//    return _imagePickerVc;
-//}
-//
-//#pragma clang diagnostic pop
+- (void)deleteBtnClik:(UIButton *)sender {
+    __weak typeof(self) weakSelf = self;
+    [_selectedPhotos removeObjectAtIndex:sender.tag];
+    [_selectedAssets removeObjectAtIndex:sender.tag];
+    [_collectionView performBatchUpdates:^{
+        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:sender.tag inSection:0];
+        [weakSelf.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+    } completion:^(BOOL finished) {
+        weakSelf.add = 1;
+        [weakSelf updateHeight];
+    }];
+    
+}
+
+#pragma mark - UICollectionViewdelegate
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return self.selectedPhotos.count + self.add;
+}
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    TZTestCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZTestCell" forIndexPath:indexPath];
+    cell.videoImageView.hidden = YES;
+    cell.gifLable.hidden = YES;
+
+    if (indexPath.row == _selectedPhotos.count) {
+        cell.imageView.image = [UIImage cnLive_getImageNameWithBundle:@"pj_tianjiazhaopian" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]];
+        cell.deleteBtn.hidden = YES;
+    } else {
+        cell.imageView.image = _selectedPhotos[indexPath.row];
+        cell.asset = _selectedAssets[indexPath.row];
+        cell.deleteBtn.hidden = NO;
+    }
+
+    cell.deleteBtn.tag = indexPath.row;
+    [cell.deleteBtn addTarget:self action:@selector(deleteBtnClik:) forControlEvents:UIControlEventTouchUpInside];
+    return cell;
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    __weak typeof(self) weakSelf = self;
+    if (indexPath.row == _selectedPhotos.count) {
+        
+        [self createAlertViewTitleArray:@[@"拍照",@"从相册选取"] textColor:KTextBlackColor font:UIFontMake(15) actionBlock:^(UIButton *button, NSInteger didRow) {
+
+            switch (didRow) {
+                case 0: {
+                    [self takePhoto];
+                }
+                    break;
+
+                case 1: {
+                    [self pushTZImagePickerController];
+                }
+                    break;
+
+                default:
+                    break;
+            }
+
+        }];
+        
+    } else { //预览照片
+        CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:indexPath.row];
+        [imagePickerVc configTZImagePicker];
+        imagePickerVc.maxImagesCount = 9;
+        imagePickerVc.allowPickingGif = NO;
+        imagePickerVc.allowPickingOriginalPhoto = YES;
+        imagePickerVc.allowPickingMultipleVideo = NO;
+        imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
+        [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+            weakSelf.selectedPhotos = [NSMutableArray arrayWithArray:photos];
+            weakSelf.selectedAssets = [NSMutableArray arrayWithArray:assets];
+            weakSelf.isSelectOriginalPhoto = isSelectOriginalPhoto;
+           [weakSelf.collectionView reloadData];
+            weakSelf.collectionView.contentSize = CGSizeMake(0, ((weakSelf.selectedPhotos.count + 2) / 3 ) * (weakSelf.margin + weakSelf.itemWH));
+        }];
+        [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
+
+    }
+}
+#pragma mark - LxGridViewDataSource
+/// 以下三个方法为长按排序相关代码
+- (BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath {
+    return indexPath.item < _selectedPhotos.count;
+}
+
+- (BOOL)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath canMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
+    return (sourceIndexPath.item < _selectedPhotos.count && destinationIndexPath.item < _selectedPhotos.count);
+}
+
+- (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath didMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
+    UIImage *image = _selectedPhotos[sourceIndexPath.item];
+    [_selectedPhotos removeObjectAtIndex:sourceIndexPath.item];
+    [_selectedPhotos insertObject:image atIndex:destinationIndexPath.item];
+    
+    id asset = _selectedAssets[sourceIndexPath.item];
+    [_selectedAssets removeObjectAtIndex:sourceIndexPath.item];
+    [_selectedAssets insertObject:asset atIndex:destinationIndexPath.item];
+    
+    [_collectionView reloadData];
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
+        [self.delegate updateImages:_selectedAssets];
+    }
+}
+
+#pragma mark - UIImagePickerController
+- (void)takePhoto {
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+    if ((authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied) && iOS7Later) {
+        // 无相机权限 做一个友好的提示
+        if (iOS8Later) {
+            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法使用相机" message:@"请在iPhone的“设置-隐私-相机“中允许访问相机" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
+            
+            [alert show];
+        }
+    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
+        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
+        if (iOS7Later) {
+            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+                if (granted) {
+                    dispatch_sync(dispatch_get_main_queue(), ^{
+                        [self takePhoto];
+                    });
+                }
+            }];
+        } else {
+            [self takePhoto];
+        }
+        // 拍照之前还需要检查相册权限
+    } else if ([TZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
+        if (iOS8Later) {
+            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的“设置-隐私-相册“中允许访问相册" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
+            [alert show];
+        }
+    } else if ([TZImageManager authorizationStatus] == 0) { // 未请求过相册权限
+        [[TZImageManager manager] requestAuthorizationWithCompletion:^{
+            [self takePhoto];
+        }];
+    } else {
+        [self pushImagePickerController];
+    }
+}
+// 调用相机
+- (void)pushImagePickerController {
+    UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
+    if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
+        self.imagePickerVc.sourceType = sourceType;
+        if(iOS8Later) {
+            _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+        }
+        [self.viewController presentViewController:_imagePickerVc animated:YES completion:nil];
+    } else {
+        NSLog(@"模拟器中无法打开照相机,请在真机中使用");
+    }
+}
+#pragma mark - TZImagePickerController
+- (void)pushTZImagePickerController {
+    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc]initWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES];
+    [imagePickerVc configTZImagePicker];//配置
+#pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
+    imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
+
+    imagePickerVc.selectedAssets = _selectedAssets;     //目前已经选中的图片数组
+    imagePickerVc.allowTakePicture = NO;                //在内部显示拍照按钮
+    imagePickerVc.allowPickingVideo = NO;               //是否允许选择视频
+    imagePickerVc.allowPickingImage = YES;              //是否允许选择图片
+    imagePickerVc.allowPickingOriginalPhoto = YES;      //选择原图
+    imagePickerVc.allowPickingGif = NO;                 //选择Gif
+    imagePickerVc.allowPickingMultipleVideo = NO;       // 是否可以多选视频
+    imagePickerVc.sortAscendingByModificationDate = YES;//排序
+    imagePickerVc.showSelectBtn = NO;
+    imagePickerVc.allowCrop = NO;                       //是否允许裁剪
+    imagePickerVc.needCircleCrop = NO;                  //是否使用圆形裁剪
+    
+    // 你可以通过block或者代理，来得到用户选择的照片.
+    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+        
+    }];
+    [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
+}
+- (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+    [picker dismissViewControllerAnimated:YES completion:nil];
+    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
+    if ([type isEqualToString:@"public.image"]) {
+        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
+        tzImagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
+        tzImagePickerVc.sortAscendingByModificationDate = YES;
+        [tzImagePickerVc showProgressHUD];
+        UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
+        
+        // save photo and get asset / 保存图片，获取到asset
+        [[TZImageManager manager] savePhotoWithImage:image location:nil completion:^(NSError *error){
+            [tzImagePickerVc hideProgressHUD];
+            if (error) {
+                [tzImagePickerVc hideProgressHUD];
+                NSLog(@"图片保存失败 %@",error);
+            } else {
+                [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(TZAlbumModel *model) {
+                    [[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
+                        [tzImagePickerVc hideProgressHUD];
+                        TZAssetModel *assetModel = [models firstObject];
+                        if (tzImagePickerVc.sortAscendingByModificationDate) {
+                            assetModel = [models lastObject];
+                        }
+                        
+                        [self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
+                        
+                    }];
+                }];
+            }
+        }];
+    }
+}
+
+- (void)refreshCollectionViewWithAddedAsset:(id)asset image:(UIImage *)image {
+    [_selectedAssets addObject:asset];
+    [_selectedPhotos addObject:image];
+    [_collectionView reloadData];
+    
+    if (_selectedPhotos.count == 9) {
+        _add = 0;
+    } else {
+        _add = 1;
+    }
+    
+    [self updateHeight];
+    
+}
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    if ([picker isKindOfClass:[UIImagePickerController class]]) {
+        [picker dismissViewControllerAnimated:YES completion:nil];
+    }
+}
+
+#pragma mark - UIActionSheetDelegate
+
+- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
+    if (buttonIndex == 0) { // take photo / 去拍照
+        [self takePhoto];
+    } else if (buttonIndex == 1) {
+        [self pushTZImagePickerController];
+    }
+}
+
+#pragma mark - UIAlertViewDelegate
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+    if (buttonIndex == 1) { // 去设置界面，开启相机访问权限
+        if (iOS8Later) {
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+        }
+    }
+}
+
+#pragma mark - TZImagePickerControllerDelegate
+- (void)tz_imagePickerControllerDidCancel:(TZImagePickerController *)picker {
+    // NSLog(@"cancel");
+}
+
+- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
+    _selectedPhotos = [NSMutableArray arrayWithArray:photos];
+    _selectedAssets = [NSMutableArray arrayWithArray:assets];
+    _isSelectOriginalPhoto = isSelectOriginalPhoto;
+
+    if (_selectedPhotos.count == 9) {
+        _add = 0;
+    } else {
+        _add = 1;
+    }
+
+    [self updateHeight];
+
+}
+
+//更新自身高度
+- (void)updateHeight {
+    
+    NSInteger num = 0;
+    if (_selectedAssets.count == 9) {
+        num = 9;
+    } else {
+        num = _selectedAssets.count+1;
+    }
+    
+    NSInteger integer = num/3;
+    NSInteger remainder = num%3;
+    
+    if (remainder > 0) {
+        integer += 1;
+    }
+    
+    _collectionView.frame = CGRectMake(10, _colTop, KScreenWidth-20, _itemWH*integer + integer*_margin +10);
+    [_collectionView reloadData];
+    
+    CGFloat h = _collectionView.height + integer*_margin + 60;
+    [self mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(h);
+    }];
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
+        [self.delegate updateImages:_selectedPhotos];
+    }
+    
+}
+
+
+// Decide album show or not't
+// 决定相册显示与否
+- (BOOL)isAlbumCanSelect:(NSString *)albumName result:(id)result {
+    return YES;
+}
+
+// Decide asset show or not't
+// 决定asset显示与否
+- (BOOL)isAssetCanSelect:(id)asset {
+    return YES;
+}
+
+#pragma mark -
+#pragma mark - Getter
+- (UILabel *)titleLab
+{
+    if (!_titleLab) {
+        _titleLab = [[UILabel alloc] init];
+        _titleLab.font = [UIFont systemFontOfSize:15];
+        _titleLab.text = @"上传照片";
+    }
+    return _titleLab;
+}
+
+- (UIImagePickerController *)imagePickerVc {
+    if (_imagePickerVc == nil) {
+        _imagePickerVc = [[UIImagePickerController alloc] init];
+        _imagePickerVc.delegate = self;
+        // set appearance / 改变相册选择页的导航栏外观
+        if (iOS7Later) {
+            _imagePickerVc.navigationBar.barTintColor = self.viewController.navigationController.navigationBar.barTintColor;
+        }
+        _imagePickerVc.navigationBar.tintColor = self.viewController.navigationController.navigationBar.tintColor;
+        UIBarButtonItem *tzBarItem, *BarItem;
+        if (iOS9Later) {
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
+            BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
+        } else {
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
+            BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
+        }
+        NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];
+        [BarItem setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
+        
+    }
+    return _imagePickerVc;
+}
+
+#pragma clang diagnostic pop
@@ -9,7 +9,7 @@
 #import "CNLiveOrderListOrderItem.h"
 #import "QMUIKit.h"
 #import "MJExtension.h"
-#import "DSAddressModel.h"
+#import <DSCnliveShopSDK/DSCnliveShopSDK.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
@@ -32,6 +32,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param success 成功
 /// @param failure 失败
 + (void)uploadEvaluationwithDarenId:(NSString *)darenId orderId:(NSString *)orderId score:(NSInteger)score comment:(NSString *)comment images:(NSArray *)images success:(void (^)(NSString *success))success failure:(void (^)(NSError *error))failure;
+
+/// 申请退款请求
+/// @param page 页码
+/// @param success 成功
+/// @param failure 失败
++ (void)requestRefundDataWithPage:(NSInteger)page success:(void (^)(NSMutableArray *array, BOOL haveNext))success failure:(void (^)(NSError *error))failure;
 @end
 NS_ASSUME_NONNULL_END
@@ -77,7 +77,7 @@
         @"sid":@"10511059",
         @"darenId":darenId,
         @"orderId":orderId,
-        @"grade":[NSString stringWithFormat:@"%d",score],
+        @"grade":[NSString stringWithFormat:@"%ld",score],
         @"comment":comment,
         @"plat":@"i"
     };
@@ -115,4 +115,38 @@
     }];
 }
+#pragma mark -申请退款接口
++ (void)requestRefundDataWithPage:(NSInteger)page success:(void (^)(NSMutableArray *array, BOOL haveNext))success failure:(void (^)(NSError *error))failure {
+    NSDictionary *param = @{
+                            @"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"status":@"4",
+                            @"pageNo":[NSString stringWithFormat:@"%ld", (long)page],
+                            @"pageSize":@"15"
+                            };
+    
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetOrderListUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (!error) {
+            NSMutableArray *array = [NSMutableArray array];
+            
+            if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
+                NSString *errorCode = [responseObject objectForKey:@"errorCode"];
+                if ([errorCode isEqualToString:@"0"]) {
+                    NSDictionary *data = [responseObject objectForKey:@"data"];
+                    CNLiveOrderModel *model = [CNLiveOrderModel mj_objectWithKeyValues:data];
+                    for (CNLiveOrderList *orderList in model.orderList) {
+                        [array addObject:orderList];
+                    }
+                    !success ?  :success(array,model.hasNext);
+                    
+                }
+            }
+        }else {
+            !failure ?  :failure(error);
+        }
+    }];
+}
 @end
@@ -7,6 +7,8 @@
 	objects = {
 /* Begin PBXBuildFile section */
+		4EBA88F62389368D009C36CF /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EBA88F52389368D009C36CF /* CoreMotion.framework */; };
+		4EBA88F72389369C009C36CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
 		5848D8B58D0419A91C38A5BF /* Pods_CNLiveMyOrderModule_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DB9FD5E2848D814B8D85B9 /* Pods_CNLiveMyOrderModule_Example.framework */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
@@ -41,6 +43,11 @@
 		1DA79A6989B0B8955B2D49F4 /* Pods-CNLiveMyOrderModule_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveMyOrderModule_Tests.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveMyOrderModule_Tests/Pods-CNLiveMyOrderModule_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		3326D32649FED325F629D45F /* CNLiveMyOrderModule.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CNLiveMyOrderModule.podspec; path = ../CNLiveMyOrderModule.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		4E6714822F5F5131320B5EDF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
+		4EBA88F32389365E009C36CF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		4EBA88F42389366D009C36CF /* libc.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libc.tbd; path = usr/lib/libc.tbd; sourceTree = SDKROOT; };
+		4EBA88F52389368D009C36CF /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
+		4EBA88F8238936B1009C36CF /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
+		4EBA88F9238936C1009C36CF /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 		6003F58A195388D20070C39A /* CNLiveMyOrderModule_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveMyOrderModule_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -74,9 +81,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4EBA88F72389369C009C36CF /* CoreGraphics.framework in Frameworks */,
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
+				4EBA88F62389368D009C36CF /* CoreMotion.framework in Frameworks */,
 				5848D8B58D0419A91C38A5BF /* Pods_CNLiveMyOrderModule_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -119,6 +128,11 @@
 		6003F58C195388D20070C39A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4EBA88F9238936C1009C36CF /* libsqlite3.tbd */,
+				4EBA88F8238936B1009C36CF /* libsqlite3.0.tbd */,
+				4EBA88F52389368D009C36CF /* CoreMotion.framework */,
+				4EBA88F42389366D009C36CF /* libc.tbd */,
+				4EBA88F32389365E009C36CF /* libc++.tbd */,
 				6003F58D195388D20070C39A /* Foundation.framework */,
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F591195388D20070C39A /* UIKit.framework */,
@@ -208,6 +222,7 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				845F81D6903EC723010F3D5B /* [CP] Embed Pods Frameworks */,
+				614BDD3EBE6EF20995FDFDF3 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -320,6 +335,24 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		614BDD3EBE6EF20995FDFDF3 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		845F81D6903EC723010F3D5B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -328,43 +361,83 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/BKCycleScrollView/BKCycleScrollView.framework",
+				"${BUILT_PRODUCTS_DIR}/BKPickerView/BKPickerView.framework",
+				"${BUILT_PRODUCTS_DIR}/BKTimer/BKTimer.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
+				"${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePaySDK.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework",
+				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
+				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
+				"${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
+				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
+				"${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
+				"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
+				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BKCycleScrollView.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BKPickerView.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BKTimer.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSCnliveShopSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8,6 +8,11 @@
 #import "CNLIVEAppDelegate.h"
 #import "CNLIVEViewController.h"
+#import <CommonCrypto/CommonDigest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "CNLiveEnvironment.h"
+#import <DSCnliveShopSDK/DSCnliveShopSDK.h>
+static NSString * uuid;
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -18,9 +23,60 @@
    UINavigationController *nav =[[UINavigationController alloc]initWithRootViewController:vc];
    self.window.rootViewController = nav;
    [self.window makeKeyAndVisible];
+    [self networkParamAction];
     return YES;
 }
+- (void)networkParamAction {
+    
+    
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:@"10511059" forKey:@"loginSid"];
+    if (TestEnvironment) {
+        [mDict setValue:@"com.cnlive.CNLiveNetAdd.debug"forKey:@"platform_id"];
+    }else{
+        [mDict setValue:@"com.cnlive.CNLiveNetAdd"forKey:@"platform_id"];
+    }
+    [mDict setValue:[self appUUIDString] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:@"1.7.8.19.10.30.15"forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    NSLog(@"打印appkey%@",APPKey);
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+    [[DSCnliveShopSDKManager sharedManager] loginUser:@"10511059"];
+    [[DSCnliveShopSDKManager sharedManager]initWithAppId:AppId appKey:APPKey isDebug:TestEnvironment];
+}
+- (NSString *)appUUIDString
+    {
+        static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            uuid = [[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
+        });
+        return uuid;
+    }
+    + (NSString*)sha1:(NSString *)string
+    {
+        NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+        
+        uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+        
+        CC_SHA1(data.bytes, (unsigned int)data.length, digest);
+        
+        NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+        
+        for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
+            [output appendFormat:@"%02x", digest[i]];
+        
+        while ([[output substringToIndex:1] isEqualToString:@"0"]) {
+            output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
+        }
+        
+        return output;
+    }
 - (void)applicationWillResignActive:(UIApplication *)application
 {
@@ -8,6 +8,8 @@
 #import "CNLIVEViewController.h"
 #import "CNLiveMyOrderController.h"
+#import "CNLiveOrderServiceProtocol.h"
+#import "CNLiveRefundController.h"
 @interface CNLIVEViewController ()
 @end
@@ -16,16 +18,27 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-    button.frame = CGRectMake(100, 100, 100, 100);
-    button.backgroundColor = [UIColor cyanColor];
-    [button addTarget:self action:@selector(buttonClicked) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:button];
-	// Do any additional setup after loading the view, typically from a nib.
+    NSArray *array = @[@"订单",@"待付款",@"待收货",@"待评价",@"售后退款"];
+    for (int i = 0; i <5; i++) {
+        UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+        button.frame = CGRectMake((10+70)*i, 100, 70, 40);
+        button.tag = 100 + i;
+        button.titleLabel.font = [UIFont systemFontOfSize:15.0f];
+        [button setTitle:array[i] forState:UIControlStateNormal];
+        button.backgroundColor = [UIColor cyanColor];
+        [button addTarget:self action:@selector(buttonClicked:) forControlEvents:UIControlEventTouchUpInside];
+        [self.view addSubview:button];
+    }
 }
-- (void)buttonClicked {
-    CNLiveMyOrderController *vc = [[CNLiveMyOrderController alloc]init];
-    [self.navigationController pushViewController:vc animated:nil];
+- (void)buttonClicked:(UIButton *)button {
+    if ((button.tag - 100) == 4) {
+        CNLiveRefundController *refundVc = [[CNLiveRefundController alloc]init];
+        [self.navigationController pushViewController:refundVc animated:YES];
+    }else {
+        id<CNLiveOrderServiceProtocol> service = [[BeeHive shareInstance]createService:@protocol(CNLiveOrderServiceProtocol)];
+        [service pushToOrderViewController:button.tag - 100];
+    }
+    
 }
 - (void)didReceiveMemoryWarning
@@ -13,6 +13,9 @@ target &#39;CNLiveMyOrderModule_Example&#39; do
 #  pod 'CNLiveUserManagement'
 #  pod 'CNLiveEnvironment'
 #  pod 'CNLiveRequestBastKit'
+ pod 'CNLiveBeeHive'
+ pod 'CNLiveServices'
+ pod 'CNLiveEnvironment'
   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
   end
   target 'CNLiveMyOrderModule_Tests' do