diff --git a/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate b/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate index 263dffa35cca21119e9636e73892420af16e3d59..50fb9866d5dee029ce7c02eba82cd99dca12230d 100644 Binary files a/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate and b/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" index 142e4948232eaec62be65a47d3df8926cb54b485..0e65bf13b5bcdffde4578ffcff27b952824fbc65 100644 --- "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" +++ "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" @@ -229,6 +229,19 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie alertView.jdPriceLbl.text = "京东冷è¿ï¼ˆé¢„ä¼°è¿è´¹" + (logPayPriceModel?.price_jd)! + "元)" alertView.sfPriceLbl.text = "顺丰冷è¿ï¼ˆé¢„ä¼°è¿è´¹" + (logPayPriceModel?.price_sf)! + "元)" self.view.window?.addSubview(alertView) + if logPayPriceModel?.price_sf == "-" { + alertView.jdSelectBtn.isSelected = true + alertView.sfSelectBtn.isSelected = false + }else if logPayPriceModel?.price_sf != "-" && logPayPriceModel?.price_jd != "-" { + alertView.jdSelectBtn.isSelected = false + alertView.sfSelectBtn.isSelected = true + let num1 = logPayPriceModel?.price_sf as! NSString + let num2 = logPayPriceModel?.price_jd as! NSString + if num1.floatValue > num2.floatValue { + alertView.jdSelectBtn.isSelected = true + alertView.sfSelectBtn.isSelected = false + } + } }else{ HUD.flash(.label("æœªåŒæ„å¿«ä»¶æœåŠ¡åè®®æ— æ³•ä¸‹å•"), delay: 1.2) } @@ -1307,6 +1320,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie let dataModel = data as! registerModel self.logPayPriceModel = dataModel.data self.priceLbl.text = "ï¿¥" + (dataModel.data?.price_sf)! + if dataModel.data?.price_sf == "-"{ + self.priceLbl.text = "ï¿¥" + (dataModel.data?.price_jd)! + }else if dataModel.data?.price_sf != "-" && dataModel.data?.price_jd != "-" { + self.priceLbl.text = "ï¿¥" + (dataModel.data?.price_sf)! + let num1 = dataModel.data?.price_sf as! NSString + let num2 = dataModel.data?.price_jd as! NSString + if num1.floatValue > num2.floatValue { + self.priceLbl.text = "ï¿¥" + (dataModel.data?.price_jd)! + } + } }) { (error) in }