处理暂无京东 1.6 bu2.0

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3987,7 +3987,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.9;
+				CURRENT_PROJECT_VERSION = 2.0;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4116,7 +4116,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.9;
+				CURRENT_PROJECT_VERSION = 2.0;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -660,16 +660,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
         alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + String(format: "%.2f",  (logPayPriceModel?.price_sf)!) + "元）"
         self.view.window?.addSubview(alertView)
-        if logPayPriceModel?.price_jd != "-" {
+        //暂无京东
+//        if logPayPriceModel?.price_jd != "-" {
             alertView.jdSelectBtn.isSelected = false
             alertView.sfSelectBtn.isSelected = true
-            let num1 = logPayPriceModel?.price_sf
-            let num2 = logPayPriceModel?.price_jd as! NSString
-            if num1! > num2.floatValue {
-                alertView.jdSelectBtn.isSelected = true
-                alertView.sfSelectBtn.isSelected = false
-            }
-        }
+//            let num1 = logPayPriceModel?.price_sf
+//            let num2 = logPayPriceModel?.price_jd as! NSString
+//            if num1! > num2.floatValue {
+//                alertView.jdSelectBtn.isSelected = true
+//                alertView.sfSelectBtn.isSelected = false
+//            }
+//        }
         var futitleArr:Array<String> = []
         logPayPriceModel?.sf_data?.forEach({ (model) in
             let str = model.cn! + "：￥" + (model.number)!