加入状态指示条

Lighting/Class/AllCustomerViewController.m

@@ -160,7 +160,7 @@
                 [self.CustomerresultArray removeAllObjects];
             }
             ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
+            self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             for (TOConsumerEntity *objc in Customerresult.results) {
                 
                 MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];

Lighting/Class/ClientdetailsViewController.m

@@ -299,7 +299,7 @@
                 [self.shopResponseArray removeAllObjects];
             }
             ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.shoppingBagTotalPage = (int)returnValue[@"data"][@"totalPages"];
+            self.shoppingBagTotalPage = [returnValue[@"data"][@"totalpages"] intValue];
             if (shopcar.shopcart.count == 0) {
                 [self PromptinformationViewWithimage:TCImage(@"ablum-副本") withTitle:@"暂无购物袋信息~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
                 [self endRefreshingForTableView:self.ClientdetailsTableview];
@@ -352,7 +352,7 @@
                 [self.orderRecordArray removeAllObjects];
             }
             OrderResponse *Allorder = [[OrderResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.orderRecordTotalPage = (int)returnValue[@"data"][@"totalPages"];
+            self.orderRecordTotalPage = [returnValue[@"data"][@"totalpages"] intValue];
             if (Allorder.orderBillList.count == 0) {
                 [self PromptinformationViewWithimage:TCImage(@"changjingtubiao") withTitle:@"暂无订单信息~" withpoint:CGPointMake(ScreenHeight/2, ScreenWidth/2)];
                 [self RemoveMBProgressHUDLoding];

Lighting/Class/CustomerOrderViewController.m

@@ -152,7 +152,7 @@
                 [self.datasArray removeAllObjects];
             }
             OrderResponse *Allorder = [[OrderResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
+            self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             for (OrderBill *model in Allorder.orderBillList) {
                 [self.datasArray addObject:model];
             }
@@ -174,6 +174,9 @@
 
 
 
+
+
+
 #pragma mark -订单状态筛选
 - (void)OrderStateButtonClick:(UIButton *)button
 {

Lighting/Class/Login/LoginViewController.m

@@ -210,7 +210,7 @@
 #pragma mark -RightVCselectedDelegate 方法
 - (void)SelectedControllerWithIndex:(NSString *)Name
 {
-
+    SHARED_APPDELEGATE.lineView.hidden = YES;
     NSInteger selectedIndex;
     if ([Name isEqualToString:@"体验中心"]) {
  

Lighting/Class/ProductLibraryViewController.m

@@ -195,7 +195,7 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
             GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
+            self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             //返回结果
             finish(sponse);
         }

Lighting/Class/SceneLibraryViewController.m

@@ -198,7 +198,7 @@
                 [self.responseArray removeAllObjects];
             }
             SceneResponse *response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            self.totalPages = (int)returnValue[@"data"][@"totalPages"];
+            self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             for (TOSceneEntity *model in response.list) {
                 [self.responseArray addObject:model];
             }

Lighting/Class/ShareViewController.m

@@ -61,11 +61,11 @@
 //    if ([self.delegate respondsToSelector:@selector(ShareProductImage:)]) {
 //=======
     [self dismissViewControllerAnimated:YES completion:nil];
-    NSData *imageData = UIImageJPEGRepresentation(self.shareImage, 1.0);
-    NSDictionary *parameterDict = [NSDictionary dictionaryWithObjectsAndKeys:self.goodsIDs,@"goodsIds",@"",@"title",@"",@"remark",nil];
+    NSData *imageData = UIImageJPEGRepresentation(TCImage(@"登录"), 1.0);
+    NSDictionary *parameterDict = [NSDictionary dictionaryWithObjectsAndKeys:@"0b44439e5504e371015504f73d4f0025,0b44439e5504e371015504feae270028",@"goodsIds",@"",@"title",@"",@"remark",nil];
+    
     //上传图片
     [[NetworkRequestClassManager Manager] UploadImageWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/system/shareGoods"] WithRequestType:0 WithImageDatas:imageData WithParameter:parameterDict WithReturnValueBlock:^(id returnValue) {
-//>>>>>>> d865c1bca988a9f367b133506feb2cd0442e9663
         
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             

Lighting/Class/Tabbar/Toolview.m

@@ -25,6 +25,7 @@
 }
 */
 
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
@@ -101,11 +102,12 @@
             SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window];
         }
     }
-//    //创建下划线
-//    CustomButton *button = (CustomButton *)[self viewWithTag:102];
-//    self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1)];
-//    _underlineView.backgroundColor = [UIColor redColor];
-//    [self addSubview:self.underlineView];
+    //创建下划线
+    CustomButton *Newbutton = (CustomButton *)[self viewWithTag:102];
+    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;
+    [self addSubview:self.underlineView];
     //刷新购物车数量 、直接赋值
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshGoodsNumber:) name:REFRESHSHOPPINGCAR object:nil];
     
@@ -154,15 +156,21 @@
 #pragma mark -按钮事件响应
 - (void)ButtonClick:(UIButton *)button
 {
-//    //下划线动画
-//    [UIView animateWithDuration:0.2 animations:^{
-//        
-//        CGRect frame = self.underlineView.frame;
-//        frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2;
-//        self.underlineView.frame = frame;
-//    }];
-    
-
+    if (button.tag == 102 || button.tag == 103) {
+       
+        if (!(button.tag == 103 && ![Shoppersmanager manager].currentCustomer)) {
+          
+            self.underlineView.hidden = NO;
+            //下划线动画
+            [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+                
+                CGRect frame = self.underlineView.frame;
+                frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2;
+                self.underlineView.frame = frame;
+            } completion:nil];
+            
+        }
+    }
     
     //点击代理
     if ([self.delegate respondsToSelector:@selector(ButtonClickAction:withButton:)]) {

Lighting/Lighting/AppDelegate.h

@@ -51,6 +51,12 @@
  */
 @property (nonatomic,strong) NSArray *allControllerArray;
 
+
+/**
+ *  指示横线
+ */
+@property (nonatomic,strong) UIView *lineView;
+
 - (void)saveContext;
 - (NSURL *)applicationDocumentsDirectory;
 - (NSUInteger)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window;

Lighting/Tools/CustomButton.m

@@ -30,7 +30,7 @@
         
         self.titleLabel.font = [UIFont systemFontOfSize:11];
         self.titleLabel.textAlignment = NSTextAlignmentCenter;
-        
+        self.adjustsImageWhenHighlighted = NO;
     }
     return self;
 }
@@ -72,4 +72,6 @@
 
 
 
+
+
 @end