修改项说明：公告、学习中心、积分界面搭建

Class/ClientdetailsViewController.m

@@ -74,13 +74,13 @@
     self.shoppingCar.model = self.model;
     [self addChildViewController:self.shoppingCar];
     self.currentVC = self.shoppingCar;
-    self.shoppingCar.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
+    self.shoppingCar.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
     [self.controllerBackgroundView addSubview:self.shoppingCar.view];
     
     self.orderRecord = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
     [self addChildViewController:self.orderRecord];
     self.orderRecord.model = self.model;
-    self.orderRecord.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
+    self.orderRecord.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
 }
 
 #pragma mark - 切换子视图

Class/GuideIntegralViewController.h

+//
+//  GuideIntegralViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface GuideIntegralViewController : BaseViewController
+
+
+/**
+ 导购头像
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *guideHeaderView;
+
+/**
+ 当前积分
+ */
+@property (weak, nonatomic) IBOutlet UILabel *currentIntegralLabel;
+
+/**
+ 季度积分排行
+ */
+@property (weak, nonatomic) IBOutlet UILabel *quarterIntegralLabel;
+
+/**
+ 年度积分排行
+ */
+@property (weak, nonatomic) IBOutlet UILabel *yearIntegralLabel;
+
+/**
+ 积分明细
+ */
+@property (weak, nonatomic) IBOutlet UIView *integralDetailsView;
+
+
+@end

Class/GuideIntegralViewController.m

+//
+//  GuideIntegralViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/16.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "GuideIntegralViewController.h"
+#import "PaymentsViewController.h"
+
+@interface GuideIntegralViewController ()
+
+@end
+
+@implementation GuideIntegralViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self getIntegralDataAction];
+    [self addChildViewController];
+}
+
+#pragma mark - 获取积分数据
+- (void)getIntegralDataAction
+{
+    
+}
+
+#pragma mark - 添加积分明细
+- (void)addChildViewController
+{
+    PaymentsViewController *payments = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PaymentsViewController"];
+    [self addChildViewController:payments];
+    payments.view.frame = CGRectMake(0, 50, self.integralDetailsView.mj_w, self.integralDetailsView.mj_h-50);
+    [self.integralDetailsView addSubview:payments.view];
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+#pragma mark - 礼品兑换
+- (IBAction)exchangeButtonClick:(UIButton *)sender {
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+/*
+#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

Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.m

@@ -7,6 +7,8 @@
 //
 
 #import "LearningCenterMainViewController.h"
+#import "OnlineLearningViewController.h"
+
 
 @interface LearningCenterMainViewController ()
 
@@ -16,8 +18,53 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    [self addGestureRecognizer];
+}
+
+#pragma mark - 添加点击
+- (void)addGestureRecognizer
+{
+    [self.comprehensiveDiscussionView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(comprehensiveDiscussionViewClickAction:)]];
+    [self.onlineLearningView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(onlineLearningViewClickAction:)]];
+    [self.breakthroughView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(breakthroughViewClickAction:)]];
+}
+
+#pragma mark - 综合讨论
+- (void)comprehensiveDiscussionViewClickAction:(UITapGestureRecognizer *)sender
+{
+    
+}
+
+#pragma mark - 在线学习
+- (void)onlineLearningViewClickAction:(UITapGestureRecognizer *)sender
+{
+    OnlineLearningViewController *onlineLearning = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"OnlineLearningViewController"];
+    [self.navigationController pushViewController:onlineLearning animated:YES];
 }
 
+#pragma mark - 闯关
+- (void)breakthroughViewClickAction:(UITapGestureRecognizer *)sender
+{
+    
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
 }

Class/LearningCenter/OnlineLearning/OnlineLearningTableViewCell.h

@@ -8,6 +8,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface OnlineLearningTableViewCell : UITableViewCell
+@interface OnlineLearningTableViewCell : UICollectionViewCell
 
 @end

Class/LearningCenter/OnlineLearning/OnlineLearningTableViewCell.m

@@ -15,10 +15,5 @@
     // Initialization code
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
 
 @end

Class/LearningCenter/OnlineLearning/OnlineLearningViewController.h

@@ -11,11 +11,12 @@
 @interface OnlineLearningViewController : BaseViewController
 
 
-
 /**
  学习模块列表
  */
 @property (weak, nonatomic) IBOutlet UICollectionView *onlineLearningCollectionView;
 @property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *onlineLearningFlowLayout;
 
+
+
 @end

Class/LearningCenter/OnlineLearning/OnlineLearningViewController.m

@@ -7,6 +7,7 @@
 //
 
 #import "OnlineLearningViewController.h"
+#import "OnlineLearningTableViewCell.h"
 
 @interface OnlineLearningViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
@@ -23,12 +24,29 @@
 #pragma mark - UICollectionView
 - (void)setUpCollectionView
 {
-    
+    self.onlineLearningFlowLayout.itemSize = CGSizeMake((ScreenWidth-100)/4.0, ((ScreenWidth-100)/4.0-50));
+    self.onlineLearningFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
+    self.onlineLearningFlowLayout.minimumLineSpacing = 20;
+    self.onlineLearningFlowLayout.minimumInteritemSpacing = 20;
 }
 
-#pragma mark - 
+#pragma mark - 学习模块数据
+- (void)getLearningModuleData
+{
+
+}
 
+#pragma mark - <UICollectionViewDelegate,UICollectionViewDataSource>
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return 10;
+}
 
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    OnlineLearningTableViewCell *learningCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"OnlineLearningTableViewCell" forIndexPath:indexPath];
+    return learningCell;
+}
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

Class/Login/LoginViewController.m

@@ -243,8 +243,8 @@
         
     }else if ([Name isEqualToString:@"场景库"])
     {
-        selectedIndex = 5;
-        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
+        selectedIndex = 6;
+        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
         sceneVC.conditionModel.styleEquals = nil;
         sceneVC.conditionModel.spaceEquals = nil;
         [sceneVC.StyleButton setTitle:@"风格" forState:UIControlStateNormal];
@@ -253,8 +253,8 @@
        
     }else if ([Name isEqualToString:@"产品库"])
     {
-        selectedIndex = 6;
-        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
+        selectedIndex = 7;
+        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:7];
         //默认加载全部数据
         productVC.barcode = nil;
         productVC.selectedCode = nil;
@@ -268,8 +268,8 @@
         [productVC.productCollectionView.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"所有客户"])
     {
-        selectedIndex = 7;
-        AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:7];
+        selectedIndex = 8;
+        AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:8];
         AllcustomerVC.searchTextfield.text = nil;
         AllcustomerVC.conditionModel.resellerCodeEquals = nil;
         AllcustomerVC.conditionModel.mobileEquals = nil;
@@ -279,8 +279,8 @@
         [AllcustomerVC.allCustomerTableview.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"客户订单"])
     {
-        selectedIndex = 8;
-        CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:8];
+        selectedIndex = 9;
+        CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:9];
         customerVC.searchCustomerOrder.text = nil;
         [customerVC.StyleButton setTitle:@"全部订单" forState:UIControlStateNormal];
         customerVC.model.consumerNameOrMobileEquals = nil;
@@ -288,11 +288,11 @@
         [customerVC.customerOrderTableView.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"学习中心"])
     {
-        selectedIndex = 9;
+        selectedIndex = 10;
         
     }else if ([Name isEqualToString:@"关于"])
     {
-        selectedIndex = 10;
+        selectedIndex = 11;
     }
    self.customtabbar.selectedIndex = selectedIndex;
 }

Class/OrderdetailsViewController.m

@@ -374,7 +374,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             /// 我知道了
         }else if (indexPath.row == 0)
         {
-            [[NSNotificationCenter defaultCenter] postNotificationName:OPENCONTROLLER object:@(3)];
+            SHARED_APPDELEGATE.tabBarController.selectedIndex = 3;
+            [SHARED_APPDELEGATE.tabBarController dismissViewControllerAnimated:YES completion:nil];
         }
     }];
     success.preferredContentSize = CGSizeMake(315, 320);

Class/RebateViewController.m

@@ -153,14 +153,14 @@
     /// 我的卡劵
     CardViewController *cardVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardViewController"];
     [self addChildViewController:cardVc];
-    cardVc.view.frame = CGRectMake(10, 40, (self.cardBackgroundView.mj_w-20), self.cardBackgroundView.mj_h-50);
+    cardVc.view.frame = CGRectMake(0, 40, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h-50);
     [self.cardBackgroundView addSubview:cardVc.view];
     
     /// 我的抽奖
     LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
     [self addChildViewController:draw];
     draw.drawValue = 0;
-    draw.view.frame = CGRectMake(10, 40, (self.drawBackgroundView.mj_w-20), self.drawBackgroundView.mj_h-50);
+    draw.view.frame = CGRectMake(0, 40, self.drawBackgroundView.mj_w, self.drawBackgroundView.mj_h-50);
     [self.drawBackgroundView addSubview:draw.view];
 }
 

Class/Tabbar/CustomTabbarController.m

@@ -24,6 +24,7 @@
 #import "RebateViewController.h"
 #import <AVFoundation/AVFoundation.h>
 #import "AnnouncementViewController.h"
+#import "GuideIntegralViewController.H"
 
 @interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
 
@@ -57,7 +58,7 @@
 {
     if (_identifierArray == nil) {
         
-        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"LearningCenterMainViewController",@"AboutViewController", nil];
+        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"GuideIntegralViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"LearningCenterMainViewController",@"AboutViewController", nil];
     }
     return _identifierArray;
 }
@@ -114,8 +115,6 @@
     [self.tabBar addSubview:self.toolview];
     //显示体验中心
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
-    //打开相应控制器
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openControllerWithIndex:) name:OPENCONTROLLER object:nil];
 }
 
 
@@ -133,6 +132,9 @@
         }else if ([controllString isEqualToString:@"LearningCenterMainViewController"]) {
             // 学习中心
             storyboard = [BaseViewController getLearningCenterStoryboardClass];
+        }else if ([controllString isEqualToString:@"GuideIntegralViewController"]) {
+            // 积分
+            storyboard = [BaseViewController getGuideIntegralStoryboardClass];
         }else {
             storyboard = [BaseViewController getMainStoryboardClass];
         }
@@ -143,6 +145,7 @@
     }
     self.viewControllers = self.vcArray;
     SHARED_APPDELEGATE.allControllerArray = controllerArray;
+    SHARED_APPDELEGATE.tabBarController = self;
     self.selectedIndex = 2;
 }
 
@@ -177,7 +180,7 @@
         case 101:
             
         {
-            self.selectedIndex = 4;
+            self.selectedIndex = 5;
         }
             break;
             
@@ -366,12 +369,5 @@
     }
 }
 
-#pragma mark - 打开相应的控制器
-- (void)openControllerWithIndex:(NSNotification *)sender
-{
-    NSInteger index = [sender.object integerValue];
-    [self dismissViewControllerAnimated:NO completion:nil];
-    self.selectedIndex = index;
-}
 
 @end

Class/Tabbar/Toolview.m

@@ -93,7 +93,7 @@
         }
     }
     //创建下划线
-    CustomButton *Newbutton = (CustomButton *)[self viewWithTag:102];
+    CustomButton *Newbutton = (CustomButton *)[self viewWithTag:103];
     self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(Newbutton.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+8, 50, 2)];
     SHARED_APPDELEGATE.lineView = self.underlineView;
     _underlineView.backgroundColor = kMainBlueColor;

Class/UserViewController.h

@@ -47,42 +47,31 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *switchUser;
 
-
-/**
- *  注销
- */
-@property (weak, nonatomic) IBOutlet UIButton *cancellationButton;
-
-
-
 /**
  *  修改密码
  */
 @property (weak, nonatomic) IBOutlet UIButton *changePassword;
 
-
 /**
  * 用户名背景
  */
 @property (weak, nonatomic) IBOutlet UIView *userNameBack;
 
-
 /**
  *  密码背景
  */
 @property (weak, nonatomic) IBOutlet UIView *passWordBack;
 
-
 /**
- *  返利余额背景
+ *  我的账户背景
  */
 @property (weak, nonatomic) IBOutlet UIView *rebateBackView;
 
-
 /**
- *  返利余额
+ 我的积分
  */
-@property (weak, nonatomic) IBOutlet UILabel *rebateLabe;
+@property (weak, nonatomic) IBOutlet UIView *guideIntegralView;
+
 
 
 

Class/UserViewController.m

@@ -21,6 +21,7 @@
     [super viewDidLoad];
     
     [self uiConfigAction];
+    [self addGestureRecognizer];
 }
 
 #pragma mark -UI
@@ -44,34 +45,37 @@
     self.rebateBackView.layer.borderWidth = 1.0f;
     self.rebateBackView.layer.borderColor = kMainBlueColor.CGColor;
     self.rebateBackView.layer.cornerRadius = 20;
-    [self.rebateBackView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(rebateViewClickAction:)]];
+    self.guideIntegralView.layer.masksToBounds = YES;
+    self.guideIntegralView.layer.borderWidth = 1.0f;
+    self.guideIntegralView.layer.borderColor = kMainBlueColor.CGColor;
+    self.guideIntegralView.layer.cornerRadius = 20;
     self.userName.text = [Shoppersmanager manager].userNameString;
     self.passWord.text = [Shoppersmanager manager].passWordString;
     self.userHeader.userInteractionEnabled = YES;
     NSString *headerurl = [Shoppersmanager manager].Shoppers.employee.picture;
     [self.userHeader sd_setImageWithURL:[NSURL URLWithString:headerurl] placeholderImage:ReplaceImage];
-    [self.userHeader addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(userHeaderClickAction:)]];
 }
 
-#pragma mark -查询返利金额
-- (void)queryShoppersCommission
+#pragma mark - 添加添加手势
+- (void)addGestureRecognizer
 {
-    WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHOPPERSCOMMISSION),[Shoppersmanager manager].Shoppers.employee.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        
-        if ([returnValue[@"code"] isEqualToNumber:@0]) {
-//            self.rebateLabe.text = [NSString stringWithFormat:@"￥%.2f",[returnValue[@"data"] floatValue]];
-        }
-    } WithErrorCodeBlock:^(id errorCodeValue) {
-    } WithFailureBlock:^(id error) {
-    }];
+    [self.userHeader addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(userHeaderClickAction:)]];
+    [self.rebateBackView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(rebateViewClickAction:)]];
+    [self.guideIntegralView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(guideIntegralViewClickAction:)]];
 }
 
-
 #pragma mark -我的账户点击
 - (void)rebateViewClickAction:(UITapGestureRecognizer *)tap
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:OPENCONTROLLER object:@(3)];
+    SHARED_APPDELEGATE.tabBarController.selectedIndex = 3;
+    [SHARED_APPDELEGATE.tabBarController dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark - 我的积分
+- (void)guideIntegralViewClickAction:(UITapGestureRecognizer *)sender
+{
+    SHARED_APPDELEGATE.tabBarController.selectedIndex = 4;
+    [SHARED_APPDELEGATE.tabBarController dismissViewControllerAnimated:YES completion:nil];
 }
 
 #pragma mark -用户头像点击
@@ -121,10 +125,10 @@
     [DeviceDirectionManager instance].isHorizontal=NO;
     [self dismissViewControllerAnimated:YES completion:nil];
     UIImage *Headimage = [info objectForKey:UIImagePickerControllerOriginalImage];
-    __weak typeof(self) weskSelf = self;
+    WS(weakSelf);
     //修改并保存头像
     [self uploadUserHeader:Headimage completeBlock:^(NSString *string) {
-        weskSelf.userHeader.image = Headimage;
+        weakSelf.userHeader.image = Headimage;
         [Shoppersmanager manager].Shoppers.employee.picture = string;
     }];
 }

Lighting.xcodeproj/project.pbxproj

@@ -78,6 +78,7 @@
 		294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */; };
 		294CF0EC1CEDCF480055F1D8 /* PromptinformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */; };
 		294CF0EE1CEDCF540055F1D8 /* PromptinformationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */; };
+		295DE56C1DDC5DFA00E27725 /* GuideIntegralViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 295DE56B1DDC5DFA00E27725 /* GuideIntegralViewController.m */; };
 		295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 295DEA9B1DB70FB9006ED4A6 /* RightControlTableViewCell.m */; };
 		295DEA9F1DB71EFC006ED4A6 /* RightControlSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295DEA9E1DB71EFC006ED4A6 /* RightControlSectionView.m */; };
 		295DEAA71DB756DA006ED4A6 /* CardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 295DEAA61DB756DA006ED4A6 /* CardCollectionViewCell.m */; };
@@ -157,6 +158,7 @@
 		29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
 		29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
 		29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */; };
+		29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29CF0EC71DDC564900A37171 /* GuideIntegral.storyboard */; };
 		29D260F51CEEAE2800A9787D /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260F41CEEAE2800A9787D /* FullScreenViewController.m */; };
 		29D260F81CEEAF2D00A9787D /* FullScreenViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260F71CEEAF2D00A9787D /* FullScreenViewCell.m */; };
 		29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FA1CEECDFF00A9787D /* goodsDetailsTableViewCell.m */; };
@@ -326,6 +328,8 @@
 		294CF0EA1CEDCF480055F1D8 /* PromptinformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptinformationView.h; sourceTree = "<group>"; };
 		294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptinformationView.m; sourceTree = "<group>"; };
 		294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PromptinformationView.xib; sourceTree = "<group>"; };
+		295DE56A1DDC5DFA00E27725 /* GuideIntegralViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideIntegralViewController.h; sourceTree = "<group>"; };
+		295DE56B1DDC5DFA00E27725 /* GuideIntegralViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuideIntegralViewController.m; sourceTree = "<group>"; };
 		295DEA9A1DB70FB9006ED4A6 /* RightControlTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightControlTableViewCell.h; sourceTree = "<group>"; };
 		295DEA9B1DB70FB9006ED4A6 /* RightControlTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RightControlTableViewCell.m; sourceTree = "<group>"; };
 		295DEA9D1DB71EFC006ED4A6 /* RightControlSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightControlSectionView.h; sourceTree = "<group>"; };
@@ -481,6 +485,7 @@
 		29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningCollectionViewCell.m; sourceTree = "<group>"; };
 		29CCA43A1CF7ED6100BC19DD /* SelectedTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectedTableViewCell.h; sourceTree = "<group>"; };
 		29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectedTableViewCell.m; sourceTree = "<group>"; };
+		29CF0EC71DDC564900A37171 /* GuideIntegral.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = GuideIntegral.storyboard; sourceTree = "<group>"; };
 		29D260F31CEEAE2800A9787D /* FullScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullScreenViewController.h; sourceTree = "<group>"; };
 		29D260F41CEEAE2800A9787D /* FullScreenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FullScreenViewController.m; sourceTree = "<group>"; };
 		29D260F61CEEAF2D00A9787D /* FullScreenViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullScreenViewCell.h; sourceTree = "<group>"; };
@@ -1006,6 +1011,15 @@
 			name = PromptinformationView;
 			sourceTree = "<group>";
 		};
+		295DE5691DDC5DBD00E27725 /* GuideIntegral */ = {
+			isa = PBXGroup;
+			children = (
+				295DE56A1DDC5DFA00E27725 /* GuideIntegralViewController.h */,
+				295DE56B1DDC5DFA00E27725 /* GuideIntegralViewController.m */,
+			);
+			name = GuideIntegral;
+			sourceTree = "<group>";
+		};
 		295DEA951DB70F49006ED4A6 /* views */ = {
 			isa = PBXGroup;
 			children = (
@@ -1137,6 +1151,7 @@
 				294BFDD01D47225A00BFD53F /* OppleMain.storyboard */,
 				29C0E73C1DD9824E006CCCF9 /* Announcement.storyboard */,
 				29C0E73E1DD98335006CCCF9 /* LearningCenter.storyboard */,
+				29CF0EC71DDC564900A37171 /* GuideIntegral.storyboard */,
 				29706DA41CD082990003C412 /* Supporting Files */,
 			);
 			path = Lighting;
@@ -1262,6 +1277,7 @@
 				29EC33171CE023D5005F0C13 /* ChangePasswordViewController.h */,
 				29EC33181CE023D5005F0C13 /* ChangePasswordViewController.m */,
 				29EC33191CE023D5005F0C13 /* ChangePasswordViewController.xib */,
+				295DE5691DDC5DBD00E27725 /* GuideIntegral */,
 				29B3EE6E1DCE15EC0065FCCF /* MyLuckyDraw */,
 				295DEAA01DB7562A006ED4A6 /* CardStock */,
 				2916A73B1D70230600644C8C /* RebateVC */,
@@ -1901,6 +1917,7 @@
 				29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
 				29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
 				29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
+				29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
 				29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */,
 				299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */,
@@ -2110,6 +2127,7 @@
 				044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
 				29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
 				299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,
+				295DE56C1DDC5DFA00E27725 /* GuideIntegralViewController.m in Sources */,
 				2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */,
 				29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
 				2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */,

Lighting/AppDelegate.h

@@ -12,6 +12,7 @@
 #import "UMSocialWechatHandler.h"
 #import "UMSocialSinaSSOHandler.h"
 #import "UMSocialQQHandler.h"
+#import "CustomTabbarController.h"
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
@@ -63,5 +64,10 @@
  */
 @property (nonatomic,strong) NSArray *productArray;
 
+/**
+ 自定义CustomTabbarController
+ */
+@property (nonatomic,strong) CustomTabbarController *tabBarController;
+
 @end
 

Lighting/Assets.xcassets/AppIcon.appiconset/Contents.json

 {
   "images" : [
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

Lighting/Images.xcassets/account.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "account.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "account@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "account@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Tools/BaseViewController.h

@@ -51,6 +51,11 @@
  */
 + (UIStoryboard *)getLearningCenterStoryboardClass;
 
+/**
+ 获得积分storyboard对象
+ */
++ (UIStoryboard *)getGuideIntegralStoryboardClass;
+
 /**
  *  调用打印机
  */

Tools/BaseViewController.m

@@ -228,13 +228,19 @@
 }
 
 #pragma mark - 获得学习中心storyboard对象
-
 + (UIStoryboard *)getLearningCenterStoryboardClass
 {
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"LearningCenter" bundle:nil];
     return storyboard;
 }
 
+#pragma mark -获得积分storyboard对象
++ (UIStoryboard *)getGuideIntegralStoryboardClass
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"GuideIntegral" bundle:nil];
+    return storyboard;
+}
+
 #pragma mark 调用airPrint无线打印机
 - (void)callAirprintWithdata:(NSString *)PDFpath SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed
 {

Tools/CustomWKWebViewController.m

@@ -47,6 +47,11 @@
 #pragma mark -UI
 - (void)uiConfigAction
 {
+    NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
+        NSLog(@"清理缓存成功");
+    }];
     self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds configuration:self.config];
     [self.view addSubview:self.webView];
     self.webView.navigationDelegate = self;