Merge branch 'lwq' into 'master'

替换GMAILab 中的 美购 为 商品

See merge request !21

GMAILab/Classes/AddClass/GMLiveWelfareView.m

@@ -28,7 +28,7 @@
     }];
     self.backgroundColor = UIColor.whiteColor;
     _leftLabel = [GMLabel labelWithTextColor:UIColor.headlineText fontSize:16];
-    _leftLabel.text = @"相关美购";
+    _leftLabel.text = @"相关商品";
     [self addSubview:_leftLabel];
     [_leftLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);

GMAILab/Classes/ToFace/VideoTelephone/view/GMAISearchNavigationView.m

@@ -108,7 +108,7 @@
         _textField.clearButtonMode = UITextFieldViewModeWhileEditing;
         _textField.layer.cornerRadius = 16;
         _textField.layer.masksToBounds = YES;
-        _textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"搜索项目、美购、医生" attributes:@{
+        _textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"搜索项目、商品、医生" attributes:@{
             NSFontAttributeName:[UIFont systemFontOfSize:14],
             NSForegroundColorAttributeName:UIColor.auxiliaryTextLight
         }];

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorRecommendShoppingView.m

@@ -481,7 +481,7 @@
         _searchNavigationView = [GMAISearchNavigationView new];
         _searchNavigationView.textField.delegate = self;
         _searchNavigationView.hidden = YES;
-        _searchNavigationView.textField.placeholder = @"请输入美购名称";
+        _searchNavigationView.textField.placeholder = @"请输入商品名称";
         _searchNavigationView.showCancelButton = NO;
     }
     return _searchNavigationView;