1.6.8 build 3.2

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -4208,7 +4208,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.0;
+				CURRENT_PROJECT_VERSION = 3.2;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4257,7 +4257,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.6.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4338,7 +4338,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.0;
+				CURRENT_PROJECT_VERSION = 3.2;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4387,7 +4387,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.6.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/Info.plist

@@ -53,28 +53,30 @@
 		<true/>
 	</dict>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>我们需要通过您同意使用蓝牙,才能获取相关数据</string>
+	<string>我们需要通过您同意使用蓝牙,才能连接打印机</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>我们需要通过您同意使用蓝牙,才能获取相关数据</string>
+	<string>我们需要通过您同意使用蓝牙,才能连接打印机</string>
 	<key>NSCameraUsageDescription</key>
-	<string>我们需要通过您同意使用相机,才能获取相关数据</string>
+	<string>我们需要通过您同意使用相机,才能使用相机功能</string>
 	<key>NSContactsUsageDescription</key>
 	<string>我们需要通过您同意使用通讯录,才能访问您的好友列表</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>想要查找并连接到本地网络上的设备</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>我们需要通过您同意获取地理位置,查询周边的相关数据</string>
+	<string>我们需要通过您同意获取地理位置,查询周边的地址信息</string>
 	<key>NSLocationTemporaryUsageDescriptionDictionary</key>
 	<dict>
 		<key>purposeKey</key>
 		<string>我们需要通过您同意获取精确地理位置,查询周边的相关数据</string>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>我们需要通过您同意获取地理位置,查询周边的相关数据</string>
+	<string>我们需要通过您同意获取地理位置,查询周边的地址信息</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>我们需要通过您同意使用麦克风，才能与你进行语音交流</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>我们需要通过您同意使用相册,才能添加相关数据</string>
+	<string>我们需要通过您同意使用相册,才能使用您的相册数据</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>我们需要通过您同意使用相册,才能获取相关数据</string>
+	<string>我们需要通过您同意使用相册,才能使用您的相册数据</string>
 	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
 	<true/>
 	<key>UIBackgroundModes</key>

GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift

@@ -423,8 +423,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
             is_show = 1
         }
         
-        
-
         let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"goods_type":goods_type as Any,"is_show":is_show as Any]
         
         supGoodsList(dic) { (data) in
@@ -472,8 +470,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
                 model.data?.res?.forEach({ (item) in
                     self.datas.append(item)
                 })
-                
-                
+                	
                 if self.all_select_btn.isSelected {
                     self.selectItem.removeAll()
                     self.datas.forEach { (model) in

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -52,7 +52,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
     @objc func jpushServiceNotification(notion:Notification) {
         
         let dict = notion.userInfo! as NSDictionary
-        print("123123 ==",dict.allKeys)
         let vc = MsgCenterViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -264,8 +263,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
                         }
                     }
                 })
-                
-                
                 self.tableV.reloadData()
             }
             self.tableV.mj_header?.endRefreshing()
@@ -560,7 +557,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
 
             return
         case 90: //下运单
-
             let vc = XiaYunDanViewController()
             self.navigationController?.pushViewController(vc, animated: true)
             return
@@ -633,7 +629,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
 //            HUD.flash(.label("敬请期待"),delay: 1.2)
             let vc = GYS_HZ_Vc()
             vc.title_str = "供应商管理"
-            self.navigationController?.pushViewController(vc, animated: true)
+            self.navigationController?.pushViewController(vc, animated: true)	
             return
         case 139: //分销员管理
             HUD.flash(.label("敬请期待"),delay: 1.2)