no message

Podfile

@@ -6,6 +6,6 @@ pod 'SSKeychain', '~> 1.2.3'
 pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.8.0'
+pod 'BaiduMapAPI', '~> 2.7.0'
 pod 'MJRefresh', '~> 2.2.0'
-#pod 'IQKeyboardManager', '~> 3.2.3'
\ No newline at end of file
+pod 'IQKeyboardManager', '~> 3.2.3'
\ No newline at end of file

Podfile.lock

@@ -20,20 +20,14 @@ PODS:
   - AFNetworking/UIKit (2.5.4):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
-  - BaiduMapAPI (2.8.0):
-    - BaiduMapAPI/All (= 2.8.0)
-  - BaiduMapAPI/All (2.8.0):
-    - BaiduMapAPI/Core
-    - BaiduMapAPI/Extend
-  - BaiduMapAPI/Core (2.8.0)
-  - BaiduMapAPI/Extend (2.8.0):
-    - BaiduMapAPI/Core
+  - BaiduMapAPI (2.7.0)
   - Base64nl (1.2)
   - FMDB (2.5):
     - FMDB/standard (= 2.5)
   - FMDB/common (2.5)
   - FMDB/standard (2.5):
     - FMDB/common
+  - IQKeyboardManager (3.2.4)
   - MBProgressHUD (0.9.1)
   - MJRefresh (2.2.0)
   - Reveal-iOS-SDK (1.5.1)
@@ -44,9 +38,10 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 2.5.4)
-  - BaiduMapAPI (~> 2.8.0)
+  - BaiduMapAPI (~> 2.7.0)
   - Base64nl (~> 1.2)
   - FMDB (~> 2.5)
+  - IQKeyboardManager (~> 3.2.3)
   - MBProgressHUD (~> 0.9.1)
   - MJRefresh (~> 2.2.0)
   - Reveal-iOS-SDK (~> 1.5.1)
@@ -55,9 +50,10 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
-  BaiduMapAPI: e066aa1e85f9fee77a1bc071afb67552852bb0fb
+  BaiduMapAPI: d6433624b0b4dd156f2d842f394a5011b02a6401
   Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
   FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
+  IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
   MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
   MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
   Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m

@@ -364,8 +364,8 @@ typedef enum : NSUInteger {
     
     if(indexPath.row == 0){
         ChooseProductViewController *cvc = [ChooseProductViewController new];
-        cvc.choseProduct = ^(Product *product){
-            
+        cvc.choseBaseInfo = ^(NSArray  *products){
+            Product *product=products [0];
             _productLabel.text = [NSString stringWithFormat:@"%@[%@]",product.name,product.code];
             merchandise.text=[NSString stringWithFormat:@"%@[%@]",product.name,product.code];
             _productLabel.textColor = HexColor(@"444444");

XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m

@@ -71,21 +71,7 @@
 }
 
 
-- (void)sureClick{
-    if(self.isMoreChose){
 
-    }else{
-        if (self.dataArr.count > 0) {
-            if (_currentIndexPath) {
-                Product *product = self.dataArr[_currentIndexPath.row];
-             //block  回调
-                self.choseProduct(product);
-            }
-        }
-    }
-    [self PopViewControllerAnimated:YES];
-}
->>>>>>> e6b29715c43eb45494ed926219a5a1609fa46838
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *cellID = @"MaskCell";
     MaskCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];