caoyunxiao

Lighting/Class/ClientViewController.m

@@ -147,6 +147,7 @@
             for (TOConsumerEntity *objc in Customerresult.results) {
                 
                  MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
+                
                  myclientModel.fid = objc.fid;
                  myclientModel.createName = objc.createName;
                  myclientModel.createBy = objc.createBy;
@@ -259,6 +260,14 @@
     self.changePersonInformationButton.hidden = NO;
     [self SetupUserShoppingCarNumberRequest];
     [self SetupUserRequest];
+    [self ChangeCustomerName];
+}
+
+
+#pragma mark -更新用户名字
+- (void)ChangeCustomerName
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"CHANGECUSTOMERNAME" object:[Customermanager manager].customerName];
 }
 
 

Lighting/Class/CustomerOrderViewController.m

@@ -78,10 +78,9 @@
     self.StyleButton.layer.masksToBounds = YES;
     self.StyleButton.layer.cornerRadius = 10;
     [self.orderStateBackView addSubview:self.StyleButton];
-    
+
     //下拉刷新
-    self.customerOrderTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
-        
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         OrderBill *allOrder = [[OrderBill alloc]init];
         //分页
         DataPage *page = [[DataPage alloc]init];
@@ -92,10 +91,12 @@
         Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
         allOrder.datapage = page;
         allOrder.order = Neworder;
-        
         self.indexPage = 0;
         [self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
     }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.customerOrderTableView.mj_header = headerRefresh;
     
     [self.customerOrderTableView.mj_header beginRefreshing];
     

Lighting/Class/InformationTableViewCell.m

@@ -21,10 +21,10 @@
 {
     _model = model;
     [self.personHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
-    self.personName.text = _model.name;
+    self.personName.text = _model.createName;
     self.personPhoneNumber.text = _model.mobile;
     self.recentTime.text = [self stringFromDate:_model.lastVisitedTime];
-    self.Guideservices.text = _model.createName;
+    self.Guideservices.text = _model.name;
     self.personLocation.text = _model.address;
     self.setCurrentCustomer.selected = _model.selectedState;
 }

Lighting/Class/ProductLibraryViewController.m

@@ -223,9 +223,8 @@
     //返回根视图
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(popTorootviewController:) name:POPROOTCONTROLLER object:nil];
     
-    
     //下拉刷新
-    self.productCollectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         //默认数据
         GoodsCondition *conditon = [[GoodsCondition alloc]init];
         //分页数据
@@ -241,6 +240,12 @@
         [self getScreeningdatasisRemoveArray:YES];
         [self getGoodsListDatasisRemove:YES Withobject:conditon];
     }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.productCollectionView.mj_header = headerRefresh;
+
+    
+    
     [self.productCollectionView.mj_header beginRefreshing];
     
     //上拉加载

Lighting/Class/SceneLibraryViewController.m

@@ -103,11 +103,9 @@
     [self.backView addSubview:self.StyleButton];
     [self.backView addSubview:self.SpaceButton];
     self.indexPage = 0;
-
     
     //下拉刷新
-    self.seceneLibararyCollectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
-        
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         //默认数据
         SceneCondition *condition = [[SceneCondition alloc]init];
         DataPage *page = [[DataPage alloc]init];
@@ -115,8 +113,10 @@
         page.rows = 10;
         condition.page = page;
         [self getSceneLibrarydatas:condition isRemove:YES];
-        
     }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    self.seceneLibararyCollectionView.mj_header = headerRefresh;
     [self.seceneLibararyCollectionView.mj_header beginRefreshing];
     //上拉加载
     self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{

Lighting/Class/Tabbar/Toolview.m

@@ -111,6 +111,9 @@
     
     //刷新购物车数量、加1
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(AddGoodsNumber:) name:@"ADDGOODSNUMBER" object:nil];
+    
+    //更改用户名
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ChangeCustomerName:) name:@"CHANGECUSTOMERNAME" object:nil];
 }
 
 
@@ -127,6 +130,17 @@
     button.instructionsNumber += [objc.object integerValue];
 }
 
+#pragma mark -更改当前用户名
+- (void)ChangeCustomerName:(NSNotification *)Not
+{
+    UIButton *button = [self viewWithTag:102];
+    NSString *userName = Not.object;
+    if (userName.length == 0 || !userName) {
+        userName = @"我的客户";
+    }
+    [button setTitle:userName forState:UIControlStateNormal];
+}
+
 
 #pragma mark -二维码扫描码
 - (void)QrCodeButtonClickAction