修改收货地址自动换行

liao3841054 · liao3841054 · commit 6bd8b69bb9d2 · 2015-11-25T19:44:09.000+08:00
diff --git a/Coding_iOS/Controllers/Shop/ShopViewController.m b/Coding_iOS/Controllers/Shop/ShopViewController.m
@@ -164,28 +164,17 @@ - (void)setUpSegmentControl
         _oldSelectedIndex = index;
         _shopObject.shopType = index;
         [_collectionView reloadData];
+        if (_collectionView.contentOffset.y > CGRectGetHeight(_collectionHeaderView.frame) ) {
+            [_collectionView setContentOffset:CGPointMake(0, CGRectGetHeight(_collectionHeaderView.frame)) animated:NO];
+        }
         
-        //        [weakCarousel scrollToItemAtIndex:index animated:NO];
     }];
     _shopSegmentControl.backgroundColor = [UIColor whiteColor];
     [_collectionHeaderView addSubview:_shopSegmentControl];
     [self.view bringSubviewToFront:_shopSegmentControl];
 }
 
 
-#pragma mark - UIScrollViewDelegate
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-    CGFloat offsetY = scrollView.contentOffset.y + scrollView.contentInset.top;
-    CGFloat _shopSegmentControlY = CGRectGetHeight(_collectionHeaderView.frame) - kMySegmentControl_Height - 5;
-    if (offsetY > _shopSegmentControlY) {
-        _shopSegmentControl.frame = CGRectMake(0, offsetY, kScreen_Width, kMySegmentControl_Height);
-    }else
-    {
-        _shopSegmentControl.frame = CGRectMake(0, _shopSegmentControlY , kScreen_Width, kMySegmentControl_Height);
-    }
-}
 
 #pragma mark - UICollectionViewDataSource
 
@@ -239,6 +228,27 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
     [self.navigationController pushViewController:exChangeViewController animated:YES];
 }
 
+
+#pragma mark - UIScrollViewDelegate
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    CGFloat offsetY = scrollView.contentOffset.y + scrollView.contentInset.top;
+    
+    CGFloat _shopSegmentControlY = CGRectGetHeight(_collectionHeaderView.frame) - kMySegmentControl_Height - 5;
+    
+    if (offsetY > CGRectGetHeight(_collectionHeaderView.frame)) {
+        
+        _shopSegmentControl.frame = CGRectMake(0, 0, kScreen_Width, kMySegmentControl_Height);
+        [self.view addSubview:_shopSegmentControl];
+    }else
+    {
+        _shopSegmentControl.frame = CGRectMake(0, _shopSegmentControlY , kScreen_Width, kMySegmentControl_Height);
+        [_collectionHeaderView addSubview:_shopSegmentControl];
+    }
+}
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
diff --git a/Coding_iOS/Views/Cell/ShopOderCell.m b/Coding_iOS/Views/Cell/ShopOderCell.m
@@ -303,20 +303,23 @@ - (void)setUpContentView
     _addressLabel.font = FONT(14);
     _addressLabel.backgroundColor = [UIColor clearColor];
     _addressLabel.numberOfLines = 0;
-    _addressLabel.textAlignment = NSTextAlignmentLeft;
+//    _addressLabel.lineBreakMode = NSLineBreakByWordWrapping;
     _addressLabel.textColor = [UIColor colorWithHexString:@"0x666666"];
     [superView addSubview:_addressLabel];
     
     [addressLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(sendTimeLabel.mas_bottom).offset(9);
         make.left.equalTo(_goodsInfoView.mas_left);
+        make.right.equalTo(_addressLabel.mas_left);
+        make.width.mas_lessThanOrEqualTo(@70);
     }];
     
     [_addressLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(addressLabel.mas_top);
         make.left.equalTo(addressLabel.mas_right);
         make.right.equalTo(_goodsInfoView.mas_right);
-
+        make.width.equalTo(@(kScreen_Width - 26 - 70));
+        make.bottom.equalTo(superView.mas_bottom).offset(-15);
     }];
     
     [superView mas_makeConstraints:^(MASConstraintMaker *make) {
