处理冲突

KuDianProject.xcodeproj/project.pbxproj

@@ -76,6 +76,7 @@
 		C53FD3FE22D33BD400687706 /* KDPForecastOrderListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C53FD3FD22D33BD400687706 /* KDPForecastOrderListVC.m */; };
 		C53FD40122D33C7A00687706 /* KDPForecastOrderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C53FD40022D33C7A00687706 /* KDPForecastOrderCell.m */; };
 		C53FD40422D34DBD00687706 /* KDPDrawerListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C53FD40322D34DBD00687706 /* KDPDrawerListCell.m */; };
+		C5AAE2F122D850C70080DFBE /* KDPServiceView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AAE2F022D850C70080DFBE /* KDPServiceView.m */; };
 		C5BAD0AF22D42EBA0084663A /* KDPCollectHistoryVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0AE22D42EBA0084663A /* KDPCollectHistoryVC.m */; };
 		C5BAD0B222D42ECA0084663A /* KDPIDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0B122D42ECA0084663A /* KDPIDViewController.m */; };
 		C5BAD0B522D42ED50084663A /* KDPSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0B422D42ED50084663A /* KDPSetViewController.m */; };
@@ -95,6 +96,9 @@
 		C5BAD0E022D4845B0084663A /* KDPTodayListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0DF22D4845B0084663A /* KDPTodayListCell.m */; };
 		C5BAD0E322D48C600084663A /* SSWLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0E122D48C600084663A /* SSWLineChartView.m */; };
 		C5BAD0E622D49AC80084663A /* KDPIDTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0E522D49AC80084663A /* KDPIDTipView.m */; };
+		C5BEABCF22D821F800FE0CF3 /* KDPOderDetailListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BEABCE22D821F800FE0CF3 /* KDPOderDetailListVC.m */; };
+		C5BEABD222D8267A00FE0CF3 /* KDPOrderDetailListNewVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BEABD122D8267A00FE0CF3 /* KDPOrderDetailListNewVC.m */; };
+		C5BEABD522D8296600FE0CF3 /* KDPOrderTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BEABD422D8296600FE0CF3 /* KDPOrderTitleCell.m */; };
 		C5CEB25A22D71D4A00FA11B1 /* KDPPasteView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CEB25922D71D4A00FA11B1 /* KDPPasteView.m */; };
 		C5D561FC22CD97840035A714 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D561FB22CD97840035A714 /* AppDelegate.m */; };
 		C5D561FF22CD97840035A714 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D561FE22CD97840035A714 /* ViewController.m */; };
@@ -285,6 +289,8 @@
 		C53FD40022D33C7A00687706 /* KDPForecastOrderCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPForecastOrderCell.m; sourceTree = "<group>"; };
 		C53FD40222D34DBD00687706 /* KDPDrawerListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPDrawerListCell.h; sourceTree = "<group>"; };
 		C53FD40322D34DBD00687706 /* KDPDrawerListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPDrawerListCell.m; sourceTree = "<group>"; };
+		C5AAE2EF22D850C70080DFBE /* KDPServiceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPServiceView.h; sourceTree = "<group>"; };
+		C5AAE2F022D850C70080DFBE /* KDPServiceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPServiceView.m; sourceTree = "<group>"; };
 		C5BAD0AD22D42EBA0084663A /* KDPCollectHistoryVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPCollectHistoryVC.h; sourceTree = "<group>"; };
 		C5BAD0AE22D42EBA0084663A /* KDPCollectHistoryVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPCollectHistoryVC.m; sourceTree = "<group>"; };
 		C5BAD0B022D42ECA0084663A /* KDPIDViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPIDViewController.h; sourceTree = "<group>"; };
@@ -323,6 +329,12 @@
 		C5BAD0E222D48C600084663A /* SSWLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSWLineChartView.h; sourceTree = "<group>"; };
 		C5BAD0E422D49AC80084663A /* KDPIDTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPIDTipView.h; sourceTree = "<group>"; };
 		C5BAD0E522D49AC80084663A /* KDPIDTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPIDTipView.m; sourceTree = "<group>"; };
+		C5BEABCD22D821F800FE0CF3 /* KDPOderDetailListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPOderDetailListVC.h; sourceTree = "<group>"; };
+		C5BEABCE22D821F800FE0CF3 /* KDPOderDetailListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPOderDetailListVC.m; sourceTree = "<group>"; };
+		C5BEABD022D8267A00FE0CF3 /* KDPOrderDetailListNewVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPOrderDetailListNewVC.h; sourceTree = "<group>"; };
+		C5BEABD122D8267A00FE0CF3 /* KDPOrderDetailListNewVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPOrderDetailListNewVC.m; sourceTree = "<group>"; };
+		C5BEABD322D8296600FE0CF3 /* KDPOrderTitleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPOrderTitleCell.h; sourceTree = "<group>"; };
+		C5BEABD422D8296600FE0CF3 /* KDPOrderTitleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPOrderTitleCell.m; sourceTree = "<group>"; };
 		C5CEB25822D71D4A00FA11B1 /* KDPPasteView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPPasteView.h; sourceTree = "<group>"; };
 		C5CEB25922D71D4A00FA11B1 /* KDPPasteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPPasteView.m; sourceTree = "<group>"; };
 		C5D561F722CD97840035A714 /* KuDianProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KuDianProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -737,6 +749,8 @@
 				C5BAD0C022D4482F0084663A /* KDPHistoryListCell.m */,
 				7662960922D7428400B2C0DB /* KDPMessageTableViewCell.h */,
 				7662960A22D7428400B2C0DB /* KDPMessageTableViewCell.m */,
+				C5AAE2EF22D850C70080DFBE /* KDPServiceView.h */,
+				C5AAE2F022D850C70080DFBE /* KDPServiceView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -848,6 +862,10 @@
 				C53FD3F722D330EA00687706 /* KDPForecastVC.m */,
 				C53FD3FC22D33BD400687706 /* KDPForecastOrderListVC.h */,
 				C53FD3FD22D33BD400687706 /* KDPForecastOrderListVC.m */,
+				C5BEABCD22D821F800FE0CF3 /* KDPOderDetailListVC.h */,
+				C5BEABCE22D821F800FE0CF3 /* KDPOderDetailListVC.m */,
+				C5BEABD022D8267A00FE0CF3 /* KDPOrderDetailListNewVC.h */,
+				C5BEABD122D8267A00FE0CF3 /* KDPOrderDetailListNewVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -865,6 +883,8 @@
 				C53FD3FA22D3361F00687706 /* KDPForecastListCell.m */,
 				C53FD3FF22D33C7A00687706 /* KDPForecastOrderCell.h */,
 				C53FD40022D33C7A00687706 /* KDPForecastOrderCell.m */,
+				C5BEABD322D8296600FE0CF3 /* KDPOrderTitleCell.h */,
+				C5BEABD422D8296600FE0CF3 /* KDPOrderTitleCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1203,6 +1223,7 @@
 				C5D5627122CDFDF00035A714 /* KDPEarnTableHeadView.m in Sources */,
 				C5D561FF22CD97840035A714 /* ViewController.m in Sources */,
 				C5CEB25A22D71D4A00FA11B1 /* KDPPasteView.m in Sources */,
+				C5BEABD522D8296600FE0CF3 /* KDPOrderTitleCell.m in Sources */,
 				76D7941322CDCC9C00C2ECFA /* KDPLiveDataViewController.m in Sources */,
 				764A24BF22D32CBC009B3891 /* KDPWebViewViewController.m in Sources */,
 				76D7942922CDD3CB00C2ECFA /* UIButton+WSLTitleImage.m in Sources */,
@@ -1215,6 +1236,7 @@
 				76D6EE8122D587D300E7AC1C /* KDPSearchViewController.m in Sources */,
 				C5BAD0CD22D46E150084663A /* KDPDetailGoodInformationView.m in Sources */,
 				7662960E22D8233600B2C0DB /* KDPMainNavViewController.m in Sources */,
+				C5BEABD222D8267A00FE0CF3 /* KDPOrderDetailListNewVC.m in Sources */,
 				C5D5626222CDD6A10035A714 /* KDPLiveEarningCell.m in Sources */,
 				764A24CD22D43DE4009B3891 /* ActivityIndicatorView.m in Sources */,
 				C53FD3EA22D2E61F00687706 /* SSWCharts.m in Sources */,
@@ -1261,6 +1283,7 @@
 				764A24F822D4A39B009B3891 /* XLPageViewControllerUtil.m in Sources */,
 				76D6EE7722D4AA7D00E7AC1C /* KDPOrderDetailViewController.m in Sources */,
 				764A24F322D4A39B009B3891 /* XLPageViewController.m in Sources */,
+				C5BEABCF22D821F800FE0CF3 /* KDPOderDetailListVC.m in Sources */,
 				764A24BC22D329F7009B3891 /* KDPPhoneLoginViewController.m in Sources */,
 				C5EB45DC22D5EA8D006A24F0 /* KDPOrderModel.m in Sources */,
 				76D6EE7A22D4AA9B00E7AC1C /* KDPOrderDetailTableViewCell.m in Sources */,
@@ -1283,6 +1306,7 @@
 				C5D5625F22CDCCD10035A714 /* KDPDrawerVC.m in Sources */,
 				C5D5626522CDD6AA0035A714 /* KDPBannerCell.m in Sources */,
 				C5BAD0DA22D47DD60084663A /* KDPTodayLiveDataVC.m in Sources */,
+				C5AAE2F122D850C70080DFBE /* KDPServiceView.m in Sources */,
 				C5BAD0B522D42ED50084663A /* KDPSetViewController.m in Sources */,
 				C5D5624D22CD9FBC0035A714 /* UIColor+KDPColor.m in Sources */,
 				C53FD40422D34DBD00687706 /* KDPDrawerListCell.m in Sources */,

KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -23,5 +23,15 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KuDianProject/APPKDURL.h

@@ -26,7 +26,8 @@
 
 #define ZSHZURl @"https://mapi.kuxuan-inc.com/cool_store/expert.html"
 
-#define custSerURL @"https://mapi.kuxuan-inc.com/cool_store/service/index.html"
+#define custSerURL  [NSString stringWithFormat:@"%@cool_store/service/index.html",KDURL]
+
 
 #define topIncomeUrl [NSString stringWithFormat:@"%@api/home/getHomeTopOrderInfo",KDURL]
 #define bannerURL [NSString stringWithFormat:@"%@api/adv/advByType",KDURL]
@@ -66,5 +67,7 @@
 
 #define hotGoodListURL [NSString stringWithFormat:@"%@api/order/listTodayGoods",KDURL]//列表
 #define SaleStatisticsURL [NSString stringWithFormat:@"%@api/order/getOrderStatistics",KDURL]//销量统计
+#define orderHeadTitleURL [NSString stringWithFormat:@"%@api/order/getOrderTop",KDURL]//订单t标题
 
+#define orderDetailListURL [NSString stringWithFormat:@"%@api/order/orderList",KDURL]
 #endif /* APPKDURL_h */

KuDianProject/Assets.xcassets/collection_select.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "collection_select.png",
+      "filename" : "详情页 收藏 选中.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "collection_select@2x.png",
+      "filename" : "详情页 收藏 选中@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "collection_select@3x.png",
+      "filename" : "详情页 收藏 选中@3x.png",
       "scale" : "3x"
     }
   ],

KuDianProject/Assets.xcassets/icon_message.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_message.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_message@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_message@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KuDianProject/Assets.xcassets/serviece_icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "kefu_head.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "kefu_head@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "kefu_head@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KuDianProject/Earning/Chart/SSWlineIncomeChartView.m

@@ -65,6 +65,11 @@
 -(void)setYValuesArr:(NSMutableArray *)yValuesArr
 {
     _yValuesArr = yValuesArr;
+    //获取最大的
+    NSInteger maxValue = [[yValuesArr valueForKeyPath:@"@max.floatValue"] floatValue];
+    NSInteger keduValu =(maxValue+(5-maxValue%5))/5;
+    self.yScaleValue = keduValu;
+    
     [self layoutSubviews];
     [self draWUpdate];
 }

KuDianProject/Earning/Controller/KDPEarnViewController.m

@@ -43,6 +43,10 @@
         [self.navigationController pushViewController:accountV animated:YES];
         
     };
+    headViews.orderBlock = ^{
+        KDPOderDetailListVC *listV=[[KDPOderDetailListVC alloc]init];
+        [self.navigationController pushViewController:listV animated:YES];
+    };
     
     self.tableView.tableHeaderView=headViews;
     [self IncomeAndOrderNumber];
@@ -108,6 +112,7 @@
         _headView.drawcBlock = ^{
             [self drawerClickButton];
         };
+        
     }
     return _headView;
 }

KuDianProject/Earning/Controller/KDPOderDetailListVC.h

@@ -0,0 +1,17 @@
+//
+//  KDPOderDetailListVC.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPMainViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPOderDetailListVC : KDPMainViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Earning/Controller/KDPOderDetailListVC.m

@@ -0,0 +1,165 @@
+//
+//  KDPOderDetailListVC.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPOderDetailListVC.h"
+
+@interface KDPOderDetailListVC ()<XLPageViewControllerDelegate,XLPageViewControllerDataSrouce>
+{
+    NSMutableArray *titleArray;
+    UIView *backv;
+    
+}
+@property (nonatomic, strong) XLPageViewController *pageVC;
+@property(nonatomic,strong)UILabel *tipeLabel;
+@end
+
+@implementation KDPOderDetailListVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navBar.hidden=NO;
+    self.navBar.navTitleLabel.text=@"订单明细";
+    [self.navBar addleftReturnButton:self selector:@selector(returnClickBtn)];
+    self.navigationController.navigationBar.hidden=YES;
+    
+    
+    self.view.backgroundColor=[UIColor whiteColor];
+     [self orderHeadTitle];
+    [self addtipeView];
+}
+-(void)addtipeView
+{
+    backv=[[UIView alloc]initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, 50)];
+    backv.backgroundColor=[UIColor whiteColor];
+    
+    UIImageView *lineV=[[UIImageView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 5)];
+    lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
+    [backv addSubview:lineV];
+    
+    UIImageView *iconimg=[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"icon_message"]];
+    iconimg.frame=CGRectMake(10, 15, 20, 20);
+    [backv addSubview:iconimg];
+    
+    self.tipeLabel=[[UILabel alloc]initWithFrame:CGRectMake(40, 5, SCREEN_WIDTH-50, 40)];
+    _tipeLabel.numberOfLines=2;
+    self.tipeLabel.textColor=[UIColor colorWithHexString:ThemeColor];
+    self.tipeLabel.font=[UIFont systemFontOfSize:12];
+    [backv addSubview:self.tipeLabel];
+    
+    UIImageView *bottomlineV=[[UIImageView alloc]initWithFrame:CGRectMake(0, 45, SCREEN_WIDTH, 5)];
+    bottomlineV.backgroundColor=[UIColor colorWithHexString:LineColor];
+    [backv addSubview:bottomlineV];
+    
+    [self.view addSubview:backv];
+}
+- (void)setUpPageVc{
+   
+    XLPageViewControllerConfig *config = [[XLPageViewControllerConfig alloc] init];
+    //标题间距
+    config.titleSpace = 0;
+    //标题高度
+    config.titleViewHeight =70;
+   
+    config.titleViewInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    config.titleWidth=SCREEN_WIDTH/titleArray.count;
+    if (self.tipeLabel.text.length>0) {
+       config.navHeight=KDNavBarHeight+50;
+    }else{
+        config.navHeight=KDNavBarHeight;
+    }
+    
+    config.contentHeight=SCREEN_HEIGHT-KDNavBarHeight;
+    
+    self.pageVC = [[XLPageViewController alloc] initWithConfig:config];
+    //需要先注册cell
+    [self.pageVC registerClass:KDPOrderTitleCell.class forTitleViewCellWithReuseIdentifier:@"title"];
+    self.pageVC.view.bounds = CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, SCREEN_HEIGHT);
+    self.pageVC.delegate = self;
+    self.pageVC.dataSource = self;
+    
+    [self addChildViewController:self.pageVC];
+    [self.view addSubview:self.pageVC.view];
+}
+-(void)orderHeadTitle
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:orderHeadTitleURL params:nil success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        if ([json[@"alert"] length]>0) {
+            self.tipeLabel.text=json[@"alert"];
+            backv.hidden=NO;
+        }else{
+            backv.hidden=YES;
+        }
+        
+        titleArray =[NSMutableArray arrayWithArray:json[@"list"]];
+        
+        [self setUpPageVc];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+#pragma mark - XLPageViewController datasource and delegate
+//cell创建方法
+- (XLPageTitleCell *)pageViewController:(XLPageViewController *)pageViewController titleViewCellForItemAtIndex:(NSInteger)index {
+    KDPOrderTitleCell *cell = [pageViewController dequeueReusableTitleViewCellWithIdentifier:@"title" forIndex:index];
+    NSDictionary *dic =titleArray[index];
+    cell.titlelabel.text=dic[@"title"];
+    cell.numLabel.text=[NSString stringWithFormat:@"%ld",[dic[@"count"]integerValue]];
+    return cell;
+}
+//通过此父类方法配置标题cell是否被选中样式
+- (void)configCellOfSelected:(BOOL)selected {
+    
+}
+
+//通过此父类方法配置标题cell动画；type:区分是当前选中cell/将要被选中的cell；progress:动画进度0~1
+- (void)showAnimationOfProgress:(CGFloat)progress type:(XLPageTitleCellAnimationType)type {
+    
+}
+- (NSInteger)pageViewControllerNumberOfPage{
+    
+    return titleArray.count;
+}
+
+- (NSString *)pageViewController:(XLPageViewController *)pageViewController titleForIndex:(NSInteger)index{
+    
+    NSDictionary *dic =titleArray[index];
+    return dic[@"title"];
+}
+
+- (void)pageViewController:(XLPageViewController *)pageViewController didSelectedAtIndex:(NSInteger)index{
+    NSLog(@"%ld",index);
+}
+
+- (UIViewController *)pageViewController:(XLPageViewController *)pageViewController viewControllerForIndex:(NSInteger)index{
+    KDPOrderDetailListNewVC *contentVC = [[KDPOrderDetailListNewVC alloc] init];
+    contentVC.typeDic=titleArray[index];
+    return contentVC;
+}
+
+
+-(void)returnClickBtn
+{
+    [self.navigationController popViewControllerAnimated:YES];
+    
+}
+
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden=YES;
+    self.tabBarController.tabBar.hidden=YES;
+}
+-(void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    self.tabBarController.tabBar.hidden=NO;
+}
+
+@end

KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.h

@@ -0,0 +1,17 @@
+//
+//  KDPOrderDetailListNewVC.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPMainViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPOrderDetailListNewVC : KDPMainViewController
+@property(nonatomic,strong)NSDictionary *typeDic;
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.m

@@ -0,0 +1,116 @@
+//
+//  KDPOrderDetailListNewVC.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPOrderDetailListNewVC.h"
+#import "KDPForecastOrderCell.h"
+@interface KDPOrderDetailListNewVC ()<UITableViewDelegate,UITableViewDataSource>
+{
+    
+    
+    NSInteger page_num;
+}
+@property(nonatomic,strong)UITableView *forecastView;
+@property(nonatomic,strong)NSMutableArray *dataArray;
+@end
+
+@implementation KDPOrderDetailListNewVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navBar.hidden=YES;
+    self.view.backgroundColor=[UIColor whiteColor];
+    page_num = 1;
+    
+    [self.view addSubview:self.forecastView];
+    [self ordeListData];
+}
+-(void)ordeListData
+{
+    [LoadingView show];
+    NSInteger type=[self.typeDic[@"type"] integerValue];
+    NSDictionary *dic=@{@"type":@(type),@"page":@(page_num)} ;
+    [KDPNetworkRequestHTTP postURL:orderDetailListURL params:dic success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        if (page_num == 1) {
+            self.dataArray =[NSMutableArray array];
+        }
+        NSArray *arr = [NSArray yy_modelArrayWithClass:[KDPOrderModel class] json:json];
+        if (arr.count>0) {
+            [self.dataArray addObjectsFromArray:arr];
+            
+        }else{
+            [self.forecastView.mj_footer endRefreshingWithNoMoreData];
+        }
+        
+        [self.forecastView.mj_footer endRefreshing];
+        [self.forecastView.mj_header endRefreshing];
+        [self.forecastView reloadData];
+            
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    KDPForecastOrderCell *listC=[tableView dequeueReusableCellWithIdentifier:@"foreorder"];
+    if (!listC) {
+        listC=[[KDPForecastOrderCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"foreorder"];
+        listC.selectionStyle=UITableViewCellSelectionStyleNone;
+    }
+    listC.model=self.dataArray[indexPath.row];
+    return listC;
+}
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.dataArray.count;
+}
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 110;
+}
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+-(UITableView *)forecastView
+{
+    if (!_forecastView) {
+        _forecastView=[[UITableView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.view.height-KDNavBarHeight-120)];
+        _forecastView.backgroundColor=[UIColor clearColor];
+        _forecastView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        _forecastView.delegate=self;
+        _forecastView.dataSource=self;
+        _forecastView.showsVerticalScrollIndicator=NO;
+        _forecastView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            page_num = 1;
+            [self ordeListData];
+        }];
+        _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            page_num++;
+            [self ordeListData];
+        }];
+        
+    }
+    return _forecastView;
+}
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
+

KuDianProject/Earning/View/KDPEarnTableHeadView.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UIButton *incomeButton;
 @property(nonatomic,copy)NSString *chartcate;
 @property(nonatomic,copy)NSString *chartType;
+@property(nonatomic,copy)void(^orderBlock)(void);
 @property(nonatomic,copy)void(^accountBlock)(void);
 @end
 

KuDianProject/Earning/View/KDPEarnTableHeadView.m

@@ -115,7 +115,7 @@
     [self.orderButton setImage:[UIImage imageNamed:@"order_detail"] forState:UIControlStateNormal];
     [self.orderButton setTitle:@"订单明细" forState:UIControlStateNormal];
     [self.orderButton setTitleColor:[UIColor colorWithHexString:@"#333333"] forState:UIControlStateNormal];
-    
+    [self.orderButton addTarget:self action:@selector(orderDetailClickBtn) forControlEvents:UIControlEventTouchUpInside];
     self.orderButton.titleLabel.font=[UIFont systemFontOfSize:15];
     [self.orderButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 10, 0, 0)];
     [backv addSubview:self.orderButton];
@@ -149,7 +149,13 @@
         self.accountBlock();
     }
 }
-
+#pragma mark---订单明细
+-(void)orderDetailClickBtn
+{
+    if (self.orderBlock) {
+        self.orderBlock();
+    }
+}
 
 -(void)requestChartData
 {

KuDianProject/Earning/View/KDPOrderTitleCell.h

@@ -0,0 +1,19 @@
+//
+//  KDPOrderTitleCell.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "XLPageTitleCell.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPOrderTitleCell : XLPageTitleCell
+@property(nonatomic,strong)UILabel *titlelabel;
+@property(nonatomic,strong)UILabel *numLabel;
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Earning/View/KDPOrderTitleCell.m

@@ -0,0 +1,55 @@
+//
+//  KDPOrderTitleCell.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPOrderTitleCell.h"
+
+@implementation KDPOrderTitleCell
+-(instancetype)initWithFrame:(CGRect)frame
+{
+    self=[super initWithFrame:frame];
+    if (self) {
+        
+        
+        
+        self.textLabel.hidden = true;
+        
+        
+        self.numLabel =[[UILabel alloc]initWithFrame:CGRectMake(0, 10, self.width, 20)];
+        self.numLabel.textColor=[UIColor colorWithHexString:fontColor];
+        self.numLabel.font=[UIFont systemFontOfSize:14];
+        self.numLabel.textAlignment=NSTextAlignmentCenter;
+        [self addSubview:self.numLabel];
+        
+        self.titlelabel =[[UILabel alloc]initWithFrame:CGRectMake(0, 35, self.width, 25)];
+        self.titlelabel.font=[UIFont systemFontOfSize:14];
+        self.titlelabel.textColor=[UIColor colorWithHexString:fontColor];
+        self.titlelabel.textAlignment=NSTextAlignmentCenter;
+        [self addSubview:self.titlelabel];
+        
+        UIImageView *lineV=[[UIImageView alloc]initWithFrame:CGRectMake(0, self.height-5, self.width, 5)];
+        lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
+        [self addSubview:lineV];
+    }
+    return self;
+}
+//通过此父类方法配置cell是否被选中
+- (void)configCellOfSelected:(BOOL)selected {
+    
+    UIColor *textColor = selected ? [UIColor colorWithHexString:ThemeColor] : [UIColor colorWithHexString:fontColor];
+    
+    self.titlelabel.textColor = textColor;
+    
+    self.numLabel.textColor = textColor;
+}
+
+//通过此父类方法配置cell动画
+- (void)showAnimationOfProgress:(CGFloat)progress type:(XLPageTitleCellAnimationType)type {
+    
+}
+
+@end

KuDianProject/MainTab/KDPNavBar.m

@@ -42,6 +42,7 @@
     UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 44, 44)];
     [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
     [returnBtn addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
+//    [returnBtn bringSubviewToFront:[UIApplication sharedApplication].keyWindow];
     [self addSubview:returnBtn];
     
 }

KuDianProject/PrefixHeader.pch

@@ -68,6 +68,8 @@
 #import "KDPOrderModel.h"
 #import <UIScrollView+EmptyDataSet.h>
 #import <IQKeyboardManager.h>
+#import "KDPServiceView.h"
+
 // 类别
 #import "UIView+Gradient.h"
 #import "UIView+JZExtension.h"
@@ -78,5 +80,11 @@
 #import "UINavigationController+FDFullscreenPopGesture.h"
 #import "UICollectionViewCell+Extension.h"
 #import "KDPPasteView.h"
+#import "KDPOderDetailListVC.h"
+#import "XLPageViewController.h"
+#import "KDPCollectHistoryVC.h"
+
+#import "KDPOrderTitleCell.h"
 
+#import "KDPOrderDetailListNewVC.h"
 #endif /* PrefixHeader_pch */

KuDianProject/Public/KDPNetworkRequestHTTP.m

@@ -8,6 +8,7 @@
 
 #import "KDPNetworkRequestHTTP.h"
 #import <AdSupport/AdSupport.h>
+#import "KDPPhoneLoginViewController.h"
 @implementation KDPNetworkRequestHTTP
 + (void)postURL:(NSString *)url params:(NSDictionary *)params success:(void(^)(id json))success failure:(void(^)(NSError *error))failure
 {
@@ -54,11 +55,11 @@
             }else if([responseDict[@"errno"] isEqualToString:@"4001"]) {
                 //让用户退出
                  [MBProgressHUD showMessage:@"登录信息过期,请重新登录"];
-               
+                [self appOpenLogin];
             }else if([responseDict[@"errno"] isEqualToString:@"4002"]) {
                 //让用户退出
                 [MBProgressHUD showMessage:@"您已在其他设备登录，是否重新登录"];
-                
+                [self appOpenLogin];
             }else{
                 
             }
@@ -79,6 +80,12 @@
         }
     }];
 }
++(void)appOpenLogin
+{
+    [KDPAccountTool deleteAccount];
+    [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:nil];
+    
+}
 
 /**
  *普通get请求
@@ -127,9 +134,11 @@
             }else if([responseDict[@"errno"] isEqualToString:@"4001"]) {
                 //让用户退出
                 [MBProgressHUD showMessage:@"登录信息过期,请重新登录"];
+                 [self appOpenLogin];
                 
             }else if([responseDict[@"errno"] isEqualToString:@"4002"]) {
                 //让用户退出
+                 [self appOpenLogin];
                 [MBProgressHUD showMessage:@"您已在其他设备登录，是否重新登录"];
                 
             }else{

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -24,6 +24,7 @@
 @property(nonatomic,strong)UIButton *messageButton;//右侧消息按钮
 
 @property(nonatomic,strong)UICollectionView *dataCollectionView;
+@property(nonatomic,strong)KDPServiceView *serviceView;
 
 
 //服务端传参
@@ -354,7 +355,7 @@
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-   
+    self.tabBarController.tabBar.hidden=NO;
     [self updateData];
 }
 -(void)viewWillDisappear:(BOOL)animated
@@ -367,6 +368,7 @@
 {
     if ([KDPAccountTool isLogin]) {
         [self getUserTodayIncom];
+        [self isOpenService];
         order_timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(order_timerAction) userInfo:nil repeats:YES];
         [[NSRunLoop mainRunLoop] addTimer:order_timer forMode:NSDefaultRunLoopMode];
          [self setUserHeadImg];
@@ -386,4 +388,38 @@
     UIImageView *imgv=[self.headImgBtn viewWithTag:1000];
     [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]];
 }
+
+#pragma mark---打开服务提示页面
+
+-(KDPServiceView *)serviceView
+{
+    if (!_serviceView) {
+        _serviceView=[[KDPServiceView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        __weak KDPTopViewController *weakself=self;
+        _serviceView.serviceBlock = ^{
+            KDPWebInteractionVC *pidV=[[KDPWebInteractionVC alloc]init];
+            pidV.url=custSerURL;
+            [weakself cw_pushViewController:pidV];
+            [weakself.serviceView removeFromSuperview];
+        };
+    }
+    return _serviceView;
+}
+#pragma mark---判断是否打开客服页面
+-(void)isOpenService
+{
+    //存储第一次打开APP，是否显示客服页面，
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    NSString *oneStep =[defaults objectForKey:@"step"];
+    if (oneStep.integerValue == 0) {
+        [UIView animateWithDuration:0.3 animations:^{
+            [[UIApplication sharedApplication].keyWindow addSubview:self.serviceView];
+            
+        }];
+        
+        [defaults setValue:@"1" forKey:@"step"];
+        [defaults synchronize];
+    }
+    
+}
 @end

KuDianProject/TOP/Drawer/View/KDPServiceView.h

@@ -0,0 +1,17 @@
+//
+//  KDPServiceView.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPServiceView : UIView
+@property(nonatomic,copy)void(^serviceBlock)(void);
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/TOP/Drawer/View/KDPServiceView.m

@@ -0,0 +1,88 @@
+//
+//  KDPServiceView.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/12.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPServiceView.h"
+
+@implementation KDPServiceView
+
+-(instancetype)initWithFrame:(CGRect)frame
+{
+    self=[super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor=[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.4];
+        UIView *backV=[[UIView alloc]initWithFrame:CGRectMake(0, 0, 281, 286)];
+        backV.backgroundColor=[UIColor whiteColor];
+        backV.layer.cornerRadius=9;
+        backV.layer.masksToBounds=YES;
+        [self addSubview:backV];
+        backV.center=self.center;
+        
+        UIImageView *imgv=[[UIImageView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/2-32, backV.top-32, 64, 64)];
+        imgv.image=[UIImage imageNamed:@"serviece_icon"];
+        [self addSubview:imgv];
+        
+        
+        UILabel *label =[[UILabel alloc]initWithFrame:CGRectMake(0, 54, backV.width, 25)];
+        label.textAlignment=NSTextAlignmentCenter;
+        label.text=@"使用酷店的三个步骤:";
+        label.textColor=[UIColor colorWithHexString:fontColor];
+        label.font=[UIFont systemFontOfSize:18];
+        [backV addSubview:label];
+        
+        
+        UILabel *contentL=[[UILabel alloc]initWithFrame:CGRectMake(71, label.bottom+21, 140, 75)];
+        contentL.font=[UIFont systemFontOfSize:15];
+        contentL.numberOfLines=3;
+        contentL.textAlignment=NSTextAlignmentCenter;
+        contentL.textColor=[UIColor colorWithHexString:fontColor];
+        
+        
+        [backV addSubview:contentL];
+        NSString *contentstr=@"① 绑定快手小店Pid \n② 将商品推广到快手\n③ 查看订单和收益";
+        NSMutableAttributedString * attributedString1 = [[NSMutableAttributedString alloc] initWithString:contentstr];
+        NSMutableParagraphStyle * paragraphStyle1 = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle1 setLineSpacing:8];
+        [attributedString1 addAttribute:NSParagraphStyleAttributeName value:paragraphStyle1 range:NSMakeRange(0, [contentstr length])];
+        [contentL setAttributedText:attributedString1];
+        
+        UIButton *buyButton=[[UIButton alloc]initWithFrame:CGRectMake(26, contentL.bottom+26, 230, 43)];
+        buyButton.layer.cornerRadius=21.5;
+        buyButton.layer.masksToBounds=YES;
+        [backV addSubview:buyButton];
+        
+        buyButton.backgroundColor=[UIColor colorWithHexString:ThemeColor];
+        buyButton.titleLabel.font=[UIFont systemFontOfSize:14];
+        [buyButton setTitle:@"了解更多" forState:UIControlStateNormal];
+        [backV addSubview:buyButton];
+        [buyButton addTarget:self action:@selector(clickTBBtuuton) forControlEvents:UIControlEventTouchUpInside];
+        
+        UIButton *kwaiBtn=[[UIButton alloc]initWithFrame:CGRectMake(26, buyButton.bottom+10, 230, 20)];
+        [kwaiBtn setTitle:@"跳过" forState:UIControlStateNormal];
+        kwaiBtn.titleLabel.font=[UIFont systemFontOfSize:14];
+        [kwaiBtn setTitleColor:[UIColor colorWithHexString:@"#666666"] forState:UIControlStateNormal];
+        [backV addSubview:kwaiBtn];
+        
+        [kwaiBtn addTarget:self action:@selector(cancelButton) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return self;
+}
+-(void)cancelButton
+{
+    [self removeFromSuperview];
+}
+-(void)clickTBBtuuton
+{
+    if (self.serviceBlock) {
+        self.serviceBlock();
+    }
+}
+-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self removeFromSuperview];
+}
+@end

KuDianProject/Vendors/XLPageViewController/XLPageViewController.m

@@ -135,6 +135,7 @@ typedef NS_ENUM(NSInteger,XLScrollDirection) {
     [super viewDidLayoutSubviews];
     
     //更新contentview位置
+    
     self.contentView.frame = self.view.bounds;
     
     
@@ -147,10 +148,11 @@ typedef NS_ENUM(NSInteger,XLScrollDirection) {
        
         
         
-        self.titleView.frame = CGRectMake(0,self.config.navHeight, self.contentView.bounds.size.width, self.config.titleViewHeight);
+        self.titleView.frame = CGRectMake(0,0, self.contentView.bounds.size.width, self.config.titleViewHeight);
         //更新pageVC位置
         //更新pageVC位置
-        self.pageVC.view.frame = CGRectMake(0, self.config.titleViewHeight+self.config.navHeight, self.contentView.bounds.size.width, self.contentView.bounds.size.height - self.config.titleViewHeight-self.config.navHeight);
+        self.pageVC.view.frame = CGRectMake(0, self.config.titleViewHeight, self.contentView.bounds.size.width, self.contentView.bounds.size.height - self.config.titleViewHeight);
+        self.view.frame=CGRectMake(0, self.config.navHeight, self.view.size.width, self.view.size.height-self.config.navHeight);
         
     }
     if (self.config.showTitleInNavigationBar) {