修改冲突

MMProject.xcodeproj/project.pbxproj

@@ -42,6 +42,10 @@
 		762442F3238D2FA400BD1709 /* MMBillSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 762442F2238D2FA400BD1709 /* MMBillSearchViewController.m */; };
 		762442F6238D33DC00BD1709 /* MMSearchTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 762442F5238D33DC00BD1709 /* MMSearchTopView.m */; };
 		762442F9238D377B00BD1709 /* MMBillSearchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 762442F8238D377B00BD1709 /* MMBillSearchTableViewCell.m */; };
+		1AC8A178238CC3060055C01F /* MMDatePickView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8A177238CC3060055C01F /* MMDatePickView.m */; };
+		1AC8A17B238CD7620055C01F /* MMShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8A17A238CD7620055C01F /* MMShareViewController.m */; };
+		1AC8A17C238CF6410055C01F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 768EE07B23865FD100591F71 /* Assets.xcassets */; };
+		1AC8A17F238D08EE0055C01F /* MMSearchListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8A17E238D08EE0055C01F /* MMSearchListCell.m */; };
 		767177732386921000817ECC /* UIViewController+MMExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 767177722386921000817ECC /* UIViewController+MMExtension.m */; };
 		76717776238695A200817ECC /* MMFMDBHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 76717775238695A200817ECC /* MMFMDBHelper.m */; };
 		767177832386A0F100817ECC /* YDFMDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 767177782386A0F100817ECC /* YDFMDB.m */; };
@@ -177,6 +181,12 @@
 		1AA6AE7D2387C799000A3ABA /* MMAboutViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMAboutViewController.m; sourceTree = "<group>"; };
 		1AA6AE7F2387CA75000A3ABA /* MMFeedBackVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMFeedBackVC.h; sourceTree = "<group>"; };
 		1AA6AE802387CA75000A3ABA /* MMFeedBackVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMFeedBackVC.m; sourceTree = "<group>"; };
+		1AC8A176238CC3060055C01F /* MMDatePickView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMDatePickView.h; sourceTree = "<group>"; };
+		1AC8A177238CC3060055C01F /* MMDatePickView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMDatePickView.m; sourceTree = "<group>"; };
+		1AC8A179238CD7620055C01F /* MMShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMShareViewController.h; sourceTree = "<group>"; };
+		1AC8A17A238CD7620055C01F /* MMShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMShareViewController.m; sourceTree = "<group>"; };
+		1AC8A17D238D08EE0055C01F /* MMSearchListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MMSearchListCell.h; path = MMProject/Code/Mine/Controller/MMSearchListCell.h; sourceTree = SOURCE_ROOT; };
+		1AC8A17E238D08EE0055C01F /* MMSearchListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MMSearchListCell.m; path = MMProject/Code/Mine/Controller/MMSearchListCell.m; sourceTree = SOURCE_ROOT; };
 		1B1822B680603CD66050454B /* Pods-MMProject.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMProject.release.xcconfig"; path = "Target Support Files/Pods-MMProject/Pods-MMProject.release.xcconfig"; sourceTree = "<group>"; };
 		25475C13AC0E0DE8D0C5E1E7 /* libPods-MMProject.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MMProject.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65B77D8791BB22529AD7918D /* Pods-MMProject.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMProject.debug.xcconfig"; path = "Target Support Files/Pods-MMProject/Pods-MMProject.debug.xcconfig"; sourceTree = "<group>"; };
@@ -897,6 +907,8 @@
 		768EE11E238687F000591F71 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				1AC8A17D238D08EE0055C01F /* MMSearchListCell.h */,
+				1AC8A17E238D08EE0055C01F /* MMSearchListCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -934,6 +946,8 @@
 				1A97712A238BD47B00A23B06 /* MMExportViewController.m */,
 				1A97712C238BD48900A23B06 /* MMYearAccountVC.h */,
 				1A97712D238BD48900A23B06 /* MMYearAccountVC.m */,
+				1AC8A179238CD7620055C01F /* MMShareViewController.h */,
+				1AC8A17A238CD7620055C01F /* MMShareViewController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -953,6 +967,8 @@
 				1AA6AE7423877D13000A3ABA /* MMMineHeadView.m */,
 				1A97712F238BDB6000A23B06 /* MMAccountListCell.h */,
 				1A977130238BDB6000A23B06 /* MMAccountListCell.m */,
+				1AC8A176238CC3060055C01F /* MMDatePickView.h */,
+				1AC8A177238CC3060055C01F /* MMDatePickView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1107,6 +1123,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1AC8A17C238CF6410055C01F /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1187,6 +1204,7 @@
 				767177882386A0F100817ECC /* SQLiteManager.m in Sources */,
 				76A4FFE3238E5D120001F49E /* MMHomeDetailViewController.m in Sources */,
 				1A977128238BC98D00A23B06 /* MMCategoryListCell.m in Sources */,
+				1AC8A17F238D08EE0055C01F /* MMSearchListCell.m in Sources */,
 				768EE0ED23867E0B00591F71 /* UIButton+WSLTitleImage.m in Sources */,
 				1A977121238BAB7B00A23B06 /* MMCycleListCell.m in Sources */,
 				1A97710D238B6F3000A23B06 /* MMRemindViewController.m in Sources */,
@@ -1239,14 +1257,21 @@
 				762442F9238D377B00BD1709 /* MMBillSearchTableViewCell.m in Sources */,
 				1AA6AE812387CA75000A3ABA /* MMFeedBackVC.m in Sources */,
 				768EE10E2386870400591F71 /* UIImage+JZExtension.m in Sources */,
+				1AC8A178238CC3060055C01F /* MMDatePickView.m in Sources */,
+
 				76E1EC48238B80B5005D76BB /* MMPlusModel.m in Sources */,
 				762442F6238D33DC00BD1709 /* MMSearchTopView.m in Sources */,
 				767177952387832600817ECC /* MMLoginManager.m in Sources */,
+
 				768EE0CE23867BBC00591F71 /* MMTabBarViewController.m in Sources */,
 				76E1EC5C238BD130005D76BB /* DAYNavigationBar.m in Sources */,
 				76717776238695A200817ECC /* MMFMDBHelper.m in Sources */,
 				768EE0EE23867E0B00591F71 /* UITableViewCell+Extension.m in Sources */,
+
+				1AC8A17B238CD7620055C01F /* MMShareViewController.m in Sources */,
+
 				761BCDCD2387CB1900AAA855 /* UISegmentedControl+MMSegControl.m in Sources */,
+
 				1A97710A238B6F2100A23B06 /* MMCategoryViewController.m in Sources */,
 				768EE1172386879F00591F71 /* MMChartViewController.m in Sources */,
 				767177832386A0F100817ECC /* YDFMDB.m in Sources */,

MMProject.xcodeproj/xcuserdata/liuxueli.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>MMProject.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>

MMProject/Code/Mine/Controller/MMMineHeadView.h

@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *todayNumbers;
 @property(nonatomic,strong)UILabel *alldayNumbers;
 @property(nonatomic,strong)UILabel *totalCounts;
-
+@property(nonatomic,copy)void (^shareAccountBlock)(void);
 @property(nonatomic,copy)void (^userLoginSelectorBlock)(void);
 @end
 

MMProject/Code/Mine/Controller/MMMineHeadView.m

@@ -15,7 +15,7 @@
     self =[super initWithFrame:frame];
     if (self) {
         [self addSubview:self.backimgView];
-        [self.backimgView addSubview:self.headButton];
+        [self addSubview:self.headButton];
         [self addSubview:self.whitebackView];
         [self setcontentView];
     }
@@ -36,7 +36,7 @@
 }
 -(UIButton *)headButton{
     if (!_headButton) {
-        _headButton=[[UIButton alloc]initWithFrame:CGRectMake(50, StatusBarHeight+40, self.backimgView.width-100, 100)];
+        _headButton=[[UIButton alloc]initWithFrame:CGRectMake(50, StatusBarHeight+40, kScreenWidth-100, 100)];
         [_headButton setImage:[UIImage imageNamed:@"mine_unlog_icon"] forState:UIControlStateNormal];
         [_headButton setTitle:@"未登录" forState:UIControlStateNormal];
         _headButton.titleLabel.font=[UIFont systemFontOfSize:18];
@@ -49,10 +49,12 @@
 -(UIView *)whitebackView
 {
     if (!_whitebackView) {
-        _whitebackView =[[UIView alloc]initWithFrame:CGRectMake(15, self.backimgView.bottom-80, self.width-30, 100)];
+        _whitebackView =[[UIView alloc]initWithFrame:CGRectMake(15, 149+StatusBarHeight, self.width-30, 100)];
         _whitebackView.layer.cornerRadius=10;
         _whitebackView.layer.masksToBounds=YES;
+        _whitebackView.userInteractionEnabled=YES;
         _whitebackView.backgroundColor=[UIColor whiteColor];
+        [_whitebackView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickshareSelector)]];
         
     }
     return _whitebackView;
@@ -62,6 +64,11 @@
     NSArray *array = @[@"今日记账总数",@"记账总天数",@"记账总笔数"];
     CGFloat labelwidht =self.whitebackView.width/array.count;
     for (NSInteger i=0; i<array.count; i++) {
+//        UIButton *button =[[UIButton alloc]initWithFrame:CGRectMake(i*labelwidht, 65, labelwidht, 65)];
+//        [self.whitebackView addSubview:button];
+//        [button addTarget:self action:@selector(clickshareSelector) forControlEvents:UIControlEventTouchUpInside];
+        
+        
         UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(labelwidht*i, 65, labelwidht, 15)];
         label.textColor = [UIColor middleTitleColor];
         label.font = FONT_SYS(14);
@@ -93,7 +100,12 @@
     [self.whitebackView addSubview:self.totalCounts];
     
 }
-
+-(void)clickshareSelector
+{
+    if (self.shareAccountBlock) {
+        self.shareAccountBlock();
+    }
+}
 
 
 -(void)userClickButton

MMProject/Code/Mine/Controller/MMMineViewController.m

@@ -8,10 +8,12 @@
 
 #import "MMMineViewController.h"
 #import "MMExportViewController.h"
+#define kHeardH  229+StatusBarHeight
 @interface MMMineViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property(nonatomic,strong)MMMineHeadView *headView;
 @property(nonatomic,strong)UITableView *mineView;
 @property(nonatomic,strong)NSArray *listArray;
+@property(nonatomic,assign)CGFloat lastOffsetY;
 @end
 
 @implementation MMMineViewController
@@ -19,9 +21,13 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.navigationController.navigationBar.hidden=YES;
-    self.listArray=@[@[@{@"img":@"mine_budget",@"title":@"年度账单"}],@[@{@"img":@"mine_category",@"title":@"记账设置"}],@[@{@"img":@"mine_output",@"title":@"账单导出"},@{@"img":@"mine_share",@"title":@"分享APP"},@{@"img":@"mine_qq",@"title":@"一键加入QQ群：864160366"}],@[@{@"img":@"mine_adviceback",@"title":@"意见反馈"},@{@"img":@"mine_help",@"title":@"关于我们"}]];
+    self.lastOffsetY = -kHeardH + 35; self.listArray=@[@[@{@"img":@"mine_budget",@"title":@"年度账单"}],@[@{@"img":@"mine_category",@"title":@"记账设置"}],@[@{@"img":@"mine_output",@"title":@"账单导出"},@{@"img":@"mine_share",@"title":@"分享APP"},@{@"img":@"mine_qq",@"title":@"一键加入QQ群：864160366"}],@[@{@"img":@"mine_adviceback",@"title":@"意见反馈"},@{@"img":@"mine_help",@"title":@"关于我们"}]];
     [self.view addSubview:self.mineView];
-    
+    [self.mineView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.mas_equalTo(0);
+        make.width.mas_equalTo(kScreenWidth);
+        make.height.mas_equalTo(kScreenHeight-TabbarHeight);
+    }];
     [self addheadView];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -99,9 +105,10 @@
 -(UITableView *)mineView
 {
     if (!_mineView) {
-        _mineView=[[UITableView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight-TabbarHeight)];
+        _mineView=[[UITableView alloc]init];
         _mineView.delegate=self;
         _mineView.dataSource=self;
+//        _mineView.contentInset = UIEdgeInsetsMake(kHeardH-35, 0, 0, 0);
         _mineView.backgroundColor=[UIColor backColor];
         _mineView.separatorStyle=UITableViewCellSeparatorStyleNone;
         if (@available(iOS 11.0, *)) {
@@ -115,15 +122,32 @@
     return _mineView;
     
 }
+#pragma mark - UIScrollViewDelegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    CGFloat width = self.view.frame.size.width;// 图片的宽度
+       CGFloat yOffset = scrollView.contentOffset.y;// 偏移的y值
+       if (yOffset < 0) {
+           CGFloat totalOffset = 229+StatusBarHeight + ABS(yOffset);
+           CGFloat f = totalOffset / 229+StatusBarHeight;
+           self.headView.backimgView.frame = CGRectMake(- (width * f - width) / 2, yOffset, width * f, totalOffset);// 拉伸后的图片的frame应该是同比例缩放
+       }
+}
 
 -(void)addheadView
 {
-    self.headView =[[MMMineHeadView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, StatusBarHeight+260)];
+    self.headView =[[MMMineHeadView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, 260+StatusBarHeight)];
+    __weak typeof(self) mmself = self;
     self.headView.userLoginSelectorBlock = ^{
         MMUserInfoViewController *loginV=[[MMUserInfoViewController alloc]init];
-        [self.navigationController pushViewController:loginV animated:YES];
+        [mmself.navigationController pushViewController:loginV animated:YES];
+    };
+    
+    self.headView.shareAccountBlock = ^{
+        MMShareViewController *loginV=[[MMShareViewController alloc]init];
+       [mmself.navigationController pushViewController:loginV animated:YES];
     };
     self.mineView.tableHeaderView=self.headView;
+   
 }
 
 -(void)viewWillAppear:(BOOL)animated

MMProject/Code/Mine/Controller/MMSearchListCell.h

@@ -0,0 +1,19 @@
+//
+//  MMSearchListCell.h
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MMSearchListCell : UITableViewCell
+@property(nonatomic,strong)UIImageView *typeImgV;
+@property(nonatomic,strong)UILabel *typeLabel;
+@property(nonatomic,strong)UILabel *startLabel;
+@end
+
+NS_ASSUME_NONNULL_END

MMProject/Code/Mine/Controller/MMSearchListCell.m

@@ -0,0 +1,44 @@
+//
+//  MMSearchListCell.m
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import "MMSearchListCell.h"
+
+@implementation MMSearchListCell
+
+-(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self =[super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.typeImgV =[[UIImageView alloc]initWithFrame:CGRectMake(10, 20, 40, 40)];
+        self.typeImgV.layer.cornerRadius=20;
+        self.typeImgV.layer.masksToBounds=YES;
+        self.typeImgV.image=[UIImage imageNamed:@"Category_ selected_615"];
+        [self addSubview:self.typeImgV];
+        
+        self.typeLabel =[[UILabel alloc]initWithFrame:CGRectMake(self.typeImgV.right+10, 0, 150, 80)];
+        self.typeLabel.font=FONT_SYS(16);
+        self.typeLabel.textColor=[UIColor titleColor];
+        [self addSubview:self.typeLabel];
+        self.typeLabel.text=@"--";
+        
+        self.startLabel =[[UILabel alloc]initWithFrame:CGRectMake(kScreenWidth-120, 27.5, 80, 25)];
+        self.startLabel.font=FONT_SYS(14);
+        self.startLabel.textColor=[UIColor whiteColor];
+        self.startLabel.backgroundColor=[UIColor baseColor];
+        self.startLabel.layer.cornerRadius=12.5;
+        self.startLabel.layer.masksToBounds=YES;
+        self.startLabel.textAlignment=NSTextAlignmentCenter;
+        [self addSubview:self.startLabel];
+        self.startLabel.text=@"立即测算";
+        
+        
+    }
+    return self;
+}
+
+@end

MMProject/Code/Mine/Controller/MMShareViewController.h

@@ -0,0 +1,17 @@
+//
+//  MMShareViewController.h
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import "MMBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MMShareViewController : MMBaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

MMProject/Code/Mine/Controller/MMShareViewController.m

@@ -0,0 +1,150 @@
+//
+//  MMShareViewController.m
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import "MMShareViewController.h"
+
+@interface MMShareViewController ()
+@property(nonatomic,strong)UIButton *headinfoBtn;
+@property(nonatomic,strong)UILabel *headNameL;
+
+@property(nonatomic,strong)UILabel *todayNumbers;
+@property(nonatomic,strong)UILabel *alldayNumbers;
+@property(nonatomic,strong)UILabel *totalCounts;
+@property(nonatomic,strong) UIImage *shareimg;
+@end
+
+@implementation MMShareViewController
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addLeftBackBtn];
+    self.view.backgroundColor=[UIColor backColor];
+    self.navigationItem.title=@"炫耀一下";
+    
+    
+    [self setcontentView];
+    
+    
+}
+-(UIButton *)headinfoBtn
+{
+    if (!_headinfoBtn) {
+        _headinfoBtn=[[UIButton alloc]initWithFrame:CGRectMake(15, 130, kScreenWidth-110, 100)];
+        [_headinfoBtn setTitle:@"name" forState:UIControlStateNormal];
+        _headinfoBtn.imageView.contentMode=UIViewContentModeScaleToFill;
+        [_headinfoBtn setImage:[UIImage imageNamed:@"mine_unlog_icon"] forState:UIControlStateNormal];
+        _headinfoBtn.titleLabel.font=FONT_SYS(18);
+        [_headinfoBtn setTitleColor:[UIColor titleColor] forState:UIControlStateNormal];
+        _headinfoBtn.imageEdgeInsets =UIEdgeInsetsMake(10,_headinfoBtn.width/2-25 , 40, _headinfoBtn.width/2-25);
+        _headinfoBtn.titleEdgeInsets =UIEdgeInsetsMake(60, -50, 10, 0);
+    }
+    return _headinfoBtn;
+}
+-(void)setcontentView
+{
+    UIImageView *backimgV=[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"integral_share_back"]];
+       backimgV.layer.cornerRadius=15;
+       backimgV.layer.masksToBounds=YES;
+       backimgV.frame=CGRectMake(40, 30, kScreenWidth-80, kScreenHeight-NavHeight-160);
+       [self.view addSubview:backimgV];
+    
+    
+    
+    [backimgV addSubview:self.headinfoBtn];
+      
+    NSArray *array = @[@"今日记账总数",@"记账总天数",@"记账总笔数"];
+    CGFloat labelwidht =(kScreenWidth-110)/array.count;
+    for (NSInteger i=0; i<array.count; i++) {
+        UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(labelwidht*i+15, 260, labelwidht, 15)];
+        label.textColor = [UIColor middleTitleColor];
+        label.font = FONT_SYS(12);
+        label.text = array[i];
+        label.textAlignment = NSTextAlignmentCenter;
+        [backimgV addSubview:label];
+       
+    }
+    
+    self.todayNumbers =[[UILabel alloc]initWithFrame:CGRectMake(15, 235,labelwidht , 25)];
+    self.todayNumbers.font=FONT_SYS(24);
+    self.todayNumbers.text=@"--";
+    self.todayNumbers.textColor=[UIColor JZColorWithHex:0x262626];
+    self.todayNumbers.textAlignment=NSTextAlignmentCenter;
+    [backimgV addSubview:self.todayNumbers];
+    
+    self.alldayNumbers =[[UILabel alloc]initWithFrame:CGRectMake(labelwidht+15, 235,labelwidht , 25)];
+    self.alldayNumbers.font=FONT_SYS(24);
+    self.alldayNumbers.text=@"--";
+    self.alldayNumbers.textColor=[UIColor JZColorWithHex:0x262626];
+    self.alldayNumbers.textAlignment=NSTextAlignmentCenter;
+    [backimgV addSubview:self.alldayNumbers];
+    
+    self.totalCounts =[[UILabel alloc]initWithFrame:CGRectMake(labelwidht*2+15, 235,labelwidht , 25)];
+    self.totalCounts.font=FONT_SYS(24);
+    self.totalCounts.text=@"--";
+    self.totalCounts.textColor=[UIColor JZColorWithHex:0x262626];
+    self.totalCounts.textAlignment=NSTextAlignmentCenter;
+    [backimgV addSubview:self.totalCounts];
+    
+    UIImageView *logoimV=[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"integor_QR_code"]];
+      logoimV.frame=CGRectMake(30, backimgV.height-120,backimgV.width-60 , 80);
+      [backimgV addSubview:logoimV];
+          
+      UIView *backV =[[UIView alloc]initWithFrame:CGRectMake(0, backimgV.bottom+30, kScreenWidth, 100)];
+      backV.backgroundColor=[UIColor whiteColor];
+      [self.view addSubview:backV];
+    
+    NSArray *shareArr =@[@{@"img":@"integor_download_image",@"title":@"保存图片"},@{@"img":@"integral_weixin",@"title":@"微信"},@{@"img":@"integral_weixin_timeLine",@"title":@"朋友圈"}];
+    CGFloat sharewidth =backV.width/shareArr.count;
+    for (int i =0; i<shareArr.count; i++) {
+        NSDictionary *dic =shareArr[i];
+        UIButton *button =[[UIButton alloc]initWithFrame:CGRectMake(i*sharewidth, 0, sharewidth, backV.height)];
+        button.tag= i;
+        [button addTarget:self action:@selector(shaeclickSelector:) forControlEvents:UIControlEventTouchUpInside];
+        [button setImage:[UIImage imageNamed:dic[@"img"]] forState:UIControlStateNormal];
+        [button setTitle:dic[@"title"] forState:UIControlStateNormal];
+        button.titleLabel.font=FONT_SYS(14);
+        [backV addSubview:button];
+        button.imageEdgeInsets =UIEdgeInsetsMake(10, button.width/2-25, button.height-60, button.width/2-25);
+        button.titleEdgeInsets=UIEdgeInsetsMake(60, -50, 10, 0);
+        [button setTitleColor:[UIColor titleColor] forState:UIControlStateNormal];
+        button.adjustsImageWhenHighlighted=NO;
+        
+    }
+    
+    UIImage *shareImage = [UIImage snapshotWithView:backimgV];
+    self.shareimg = shareImage;
+}
+-(void)shaeclickSelector:(UIButton *)btn
+{
+    if (btn.tag == 0) {
+         UIImageWriteToSavedPhotosAlbum(self.shareimg, self, @selector(image:didFinishSavingWithError:contextInfo:), NULL);
+    }
+}
+- (void)image: (UIImage *) image didFinishSavingWithError: (NSError *) error contextInfo: (void *) contextInfo {
+    if(error != NULL){
+        [MBManager showBriefAlert:@"保存图片失败"];
+    }else{
+         [MBManager showBriefAlert:@"保存图片成功"];
+       
+    }
+}
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden=NO;
+    self.tabBarController.tabBar.hidden=YES;
+}
+-(void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    self.navigationController.navigationBar.hidden=YES;
+    self.tabBarController.tabBar.hidden=NO;
+}
+
+@end

MMProject/Code/Mine/Controller/MMYearAccountVC.m

@@ -17,6 +17,9 @@
 @property(nonatomic,strong)UILabel *balancelabel;//结余
 @property(nonatomic,strong)UILabel *encomelabel;//收入
 @property(nonatomic,strong)UILabel *spendlabel;//支出
+
+@property(nonatomic,strong)MMDatePickView *dateView;
+
 @end
 
 @implementation MMYearAccountVC
@@ -123,6 +126,28 @@ static   NSInteger const backheight = 150;
      [button setImage:[UIImage imageNamed:@"home_down"] forState:UIControlStateNormal];
      button.titleLabel.font = FONT_SYS(14);
     self.navigationItem.rightBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:button];
+    [button addTarget:self action:@selector(changeyearSelector) forControlEvents:UIControlEventTouchUpInside];
+    
+}
+#pragma mark----
+-(void)changeyearSelector
+{
+    [UIView animateWithDuration:1 animations:^{
+        self.dateView.hidden=NO;
+    }];
+}
+
+
+
+-(MMDatePickView *)dateView
+{
+    if (!_dateView) {
+        _dateView=[[MMDatePickView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
+        _dateView.userInteractionEnabled=YES;
+        [self.view addSubview:_dateView];
+        _dateView.hidden=YES;
+    }
+    return _dateView;
 }
 -(void)viewWillAppear:(BOOL)animated
 {

MMProject/Code/Mine/View/MMDatePickView.h

@@ -0,0 +1,19 @@
+//
+//  MMDatePickView.h
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MMDatePickView : UIView<UIPickerViewDelegate,UIPickerViewDataSource>
+@property(nonatomic,strong)UIPickerView *pickView;
+@property(nonatomic,strong)NSMutableArray *yearListArray;
+
+@end
+
+NS_ASSUME_NONNULL_END

MMProject/Code/Mine/View/MMDatePickView.m

@@ -0,0 +1,135 @@
+//
+//  MMDatePickView.m
+//  MMProject
+//
+//  Created by 刘学丽 on 2019/11/26.
+//  Copyright © 2019 kuxuan. All rights reserved.
+//
+
+#import "MMDatePickView.h"
+
+@implementation MMDatePickView
+
+-(instancetype)initWithFrame:(CGRect)frame
+{
+    self =[super initWithFrame:frame ];
+    if (self) {
+        self.backgroundColor=[UIColor colorWithRed:0 green:0 blue:0 alpha:0.3];
+        
+        
+        UIView *backV =[[UIView alloc]init];
+        backV.backgroundColor=[UIColor whiteColor];
+        [self addSubview:backV];
+        
+        [backV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.mas_equalTo(0);
+            make.bottom.mas_equalTo(-NavHeight);
+            make.height.mas_equalTo(230);
+        }];
+        
+         UIButton *cancelBtn =[[UIButton alloc]init];
+           [cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
+          
+           [cancelBtn setTitleColor:[UIColor titleColor] forState:UIControlStateNormal];
+           cancelBtn.titleLabel.font=FONT_SYS(14);
+           [backV addSubview:cancelBtn];
+           [cancelBtn addTarget:self action:@selector(cancelSelector) forControlEvents:UIControlEventTouchUpInside];
+               
+           UIButton *sureBtn =[[UIButton alloc]init];
+          [sureBtn setTitle:@"确定" forState:UIControlStateNormal];
+          
+          [sureBtn setTitleColor:[UIColor titleColor] forState:UIControlStateNormal];
+          sureBtn.titleLabel.font=FONT_SYS(14);
+          [backV addSubview:sureBtn];
+          [sureBtn addTarget:self action:@selector(sureSelector) forControlEvents:UIControlEventTouchUpInside];
+        
+        [cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.left.mas_equalTo(0);
+            make.height.mas_equalTo(40);
+            make.width.mas_equalTo(60);
+        }];
+        [sureBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(0);
+            make.height.mas_equalTo(40);
+            make.width.mas_equalTo(60);
+            make.right.mas_equalTo(0);
+        }];
+        UIView *paslineV =[[UIView alloc]init];
+        paslineV.backgroundColor=[UIColor backColor];
+        [self addSubview:paslineV];
+        [paslineV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.mas_equalTo(0);
+            make.top.mas_equalTo(sureBtn.mas_bottom);
+            make.height.mas_equalTo(1);
+        }];
+        
+        [self addSubview:self.pickView];
+        [self setSelectData];
+        [self.pickView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(paslineV.mas_bottom);
+            make.bottom.mas_equalTo(0);
+            make.left.right.mas_equalTo(0);
+        }];
+    }
+    return self;
+}
+-(UIPickerView *)pickView
+{
+    if (!_pickView) {
+        _pickView =[[UIPickerView alloc]init];
+        _pickView.delegate=self;
+        _pickView.dataSource=self;
+        _pickView.backgroundColor=[UIColor whiteColor];
+    }
+    return _pickView;
+}
+#pragma mark - UIPickViewDelegate
+
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{
+    return 1;
+}
+
+- (NSInteger )pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{
+    return self.yearListArray.count;
+}
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component{
+        return self.yearListArray[row];
+}
+- (void)setSelectData{
+    NSDate *date = [NSDate date];
+    NSDateFormatter *formatter = [[NSDateFormatter alloc]init];
+    formatter.dateFormat = @"yyyy-MM";
+    NSString *string = [formatter stringFromDate:date];
+    NSArray *dataArray = [string componentsSeparatedByString:@"-"];
+    NSUInteger integer = [dataArray[0] integerValue]-2010;
+    [self.pickView selectRow:integer inComponent:0 animated:YES];
+}
+
+-(NSMutableArray *)yearListArray
+{
+    if (!_yearListArray) {
+        NSMutableArray *array = [NSMutableArray array];
+       for (NSUInteger i=2010; i<2051; i++) {
+           [array addObject:[NSString stringWithFormat:@"%lu",(unsigned long)i]];
+       }
+       _yearListArray = [NSMutableArray arrayWithArray:array];
+    }
+    return _yearListArray;
+}
+
+-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    self.hidden=YES;
+}
+-(void)cancelSelector
+{
+    self.hidden=YES;
+}
+-(void)sureSelector
+{
+    NSInteger year = [self.pickView selectedRowInComponent:0];
+    NSString *yearNum = [self.yearListArray objectAtIndex:year];
+    self.hidden=YES;
+}
+@end

MMProject/Code/Search/Controller/MMSearchViewController.m

@@ -7,8 +7,11 @@
 //
 
 #import "MMSearchViewController.h"
+#import "MMSearchListCell.h"
+@interface MMSearchViewController ()<UITableViewDelegate,UITableViewDataSource>
 
-@interface MMSearchViewController ()
+@property(nonatomic,strong)UITableView *searchView;
+@property(nonatomic,strong)NSMutableArray *listArray;
 
 @end
 
@@ -16,17 +19,85 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    UIView *backV=[[UIView alloc]init];
+    self.navigationItem.title=@"发现";
+    backV.backgroundColor=[UIColor whiteColor];
+    [self.view addSubview:backV];
+    [backV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.right.mas_equalTo(0);
+        make.height.mas_equalTo(130);
+    }];
+    [self.view addSubview:self.searchView];
 }
 
-/*
-#pragma mark - Navigation
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MMSearchListCell *tabCell =[tableView dequeueReusableCellWithIdentifier:@"search"];
+    if (!tabCell) {
+        tabCell=[[MMSearchListCell alloc]initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"search"];
+        tabCell.selectionStyle=UITableViewCellSelectionStyleNone;
+    }
+    tabCell.backgroundColor=[UIColor whiteColor];
+   
+    return tabCell;
+}
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    
+    return 1;
+}
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 3;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 80;
+}
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    UIView *headV=[[UIView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, 1)];
+    headV.backgroundColor=[UIColor backColor];
+    return headV;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 1;
+}
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    
+}
 
-// 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.
+
+-(UITableView *)searchView
+{
+    if (!_searchView) {
+        _searchView=[[UITableView alloc]initWithFrame:CGRectMake(15, 0, kScreenWidth-30, kScreenHeight-NavHeight-TabbarHeight-10)];
+        _searchView.delegate=self;
+        _searchView.dataSource=self;
+        _searchView.backgroundColor=[UIColor clearColor];
+        _searchView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        if (@available(iOS 11.0, *)) {
+           _searchView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+           self.automaticallyAdjustsScrollViewInsets = NO;
+        }
+        _searchView.showsVerticalScrollIndicator=NO;
+        
+    }
+    return _searchView;
+    
+}
+
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden=NO;
+    self.tabBarController.tabBar.hidden=NO;
 }
-*/
+
+
+
 
 @end

MMProject/pch&&Header/PrefixHeader.pch

@@ -73,6 +73,8 @@
 #import "MMBudgetViewController.h"
 #import "MMYearAccountVC.h"
 #import "MMAccountListCell.h"
+#import "MMDatePickView.h"
+#import "MMShareViewController.h"
 
 // *********************************
 #import "Header.h"

MMProject/resource/Assets.xcassets/mine/head_nologin.imageset/Contents.json

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

MMProject/resource/Assets.xcassets/mine/integor_QR_code.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "9891565334668_.pic.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MMProject/resource/Assets.xcassets/mine/integor_download_image.imageset/Contents.json

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

MMProject/resource/Assets.xcassets/mine/integral_share_back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "871eac81a56a824a31223343b90e0494 + u=2537627520,3119182571&fm=27&gp=0 copy + 你长得可真吓人啊 + Group 3 Copy + Group 5 + 未标题-1 copy 2 + 金牛记账 copy Mask Copy.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "871eac81a56a824a31223343b90e0494 + u=2537627520,3119182571&fm=27&gp=0 copy + 你长得可真吓人啊 + Group 3 Copy + Group 5 + 未标题-1 copy 2 + 金牛记账 copy Mask Copy@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "871eac81a56a824a31223343b90e0494 + u=2537627520,3119182571&fm=27&gp=0 copy + 你长得可真吓人啊 + Group 3 Copy + Group 5 + 未标题-1 copy 2 + 金牛记账 copy Mask Copy@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MMProject/resource/Assets.xcassets/mine/integral_weixin.imageset/Contents.json

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

MMProject/resource/Assets.xcassets/mine/integral_weixin_timeLine.imageset/Contents.json

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

Pods/Pods.xcodeproj/xcuserdata/liuxueli.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>AFNetworking.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>BlocksKit.xcscheme_^#shared#^_</key>
 		<dict>