Merge branch 'zx/faceTest' into 'master'

UI 走查

See merge request !20

GMAILab/Classes/ToFace/WorkingTable/View/GMBookReachStoreConsultView.m

@@ -36,13 +36,21 @@
         make.bottom.mas_equalTo(0);
     }];
     self.container.frame = CGRectMake(0, MAINSCREEN_HEIGHT - 267 - UIView.safeAreaInsetsBottom, MAINSCREEN_WIDTH, 267 + UIView.safeAreaInsetsBottom);
+    self.container.clipsToBounds = NO;
+    [self containerRectCorner:self.container];
+
+    UIView *titleView = [[UIView alloc] init];
+    titleView.backgroundColor = UIColor.clearColor;
+    titleView.frame = CGRectMake(0, MAINSCREEN_HEIGHT - 267 - UIView.safeAreaInsetsBottom, MAINSCREEN_WIDTH, 85);
+    titleView.bottom = self.container.top;
+    [self addSubview:titleView];
    
     _headerImageView = [[UIImageView alloc] init];
-    [self.container addSubview:_headerImageView];
+    [titleView addSubview:_headerImageView];
     [_headerImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.width.mas_equalTo(85);
         make.centerX.mas_equalTo(self.container.mas_centerX);
-        make.centerY.mas_equalTo(self.container.mas_top);
+        make.top.mas_equalTo(42.5);
     }];
     
     _titleLabel = [[UILabel alloc] init];
@@ -63,7 +71,7 @@
     _iconLabel.textColor = UIColor.grayColor;
     _iconLabel.textAlignment = NSTextAlignmentCenter;
     _iconLabel.font = [UIFont gmFont:14];
-    [self addSubview:_iconLabel];
+    [self.container addSubview:_iconLabel];
     [_iconLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(_titleLabel.mas_bottom).offset(14);
         make.centerX.mas_equalTo(_titleLabel.mas_centerX).offset(10.5);
@@ -117,7 +125,7 @@
     _authBtn.titleLabel.layer.shadowOffset = CGSizeMake(0.0f, 1.5f); //阴影的偏移量，这个很重要
     _authBtn.titleLabel.layer.shadowRadius = 0.5f; //阴影的扩散半径，
     [_authBtn addTarget:self action:@selector(authClicked) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:_authBtn];
+    [self.container addSubview:_authBtn];
     _authBtn.layer.borderColor = UIColor.whiteColor.CGColor;
     [_authBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(_phoneLabel.mas_bottom).offset(12);
@@ -142,7 +150,6 @@
         make.right.mas_equalTo(self.container.mas_right).offset(-33);
     }];
     
-    [self containerRectCorner:self.container];
 }
 
 - (void)containerRectCorner:(UIView *)view {
@@ -162,7 +169,7 @@
             NSDictionary *data = response.data;
             // 跳转发私信
             [[GMRouter sharedInstance] pushScheme:SafeString(data[@"message_url"])];
-            [weakSelf cancelClicked];
+            [weakSelf removeFromSuperview];
         } failBlock:^(NSString *message) {
             [[GMBaseTool getCurrentViewController] toast:message];
             [weakSelf cancelClicked];