调整自定义字符串

GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift

@@ -90,7 +90,11 @@ class LogisticalSelectView: UIView {
         }else if sender == sfSelectBtn {
             sfSelectBtn.isSelected = !sfSelectBtn.isSelected
             jdSelectBtn.isSelected = false
-            delegate?.LogisticalSelectViewBtnclick(idx: 1)
+            if sfSelectBtn.isSelected {
+                delegate?.LogisticalSelectViewBtnclick(idx: 1)
+            }else{
+                delegate?.LogisticalSelectViewBtnclick(idx: 2)
+            }
 //            selectBgView.isHidden = false
 //            selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19)
         }

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

@@ -19,7 +19,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     let datasArr = ["https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597299369034&di=e29ff315ddeadcfc8b785c8060995b3c&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180520%2Fcfc6bc7922824542b3b3186041ba49de.jpeg","https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597300858041&di=52f336ce7e6b501eb560fbf0848c754b&imgtype=0&src=http%3A%2F%2Fdingyue.ws.126.net%2FxprlH2GfSd8xmPWwqfyILcSqUCcHtdrfYuTBNezAfGJKi1545980365722.jpg","https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2992387834,114733111&fm=26&gp=0.jpg"]
     
-    
+    let nonce_str = String.randomStr(len: 30)
     var xiaDanRenMsg:NSString = ""
     func XiaDanUserInfoViewControllerData(str: NSString) {
         xiaDanRenMsg = str
@@ -80,7 +80,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 let fD = adrArr.first!
                 let cityData = fD["adr"] as! cityListDataModel
                 let params = ["user_token":UserToken as Any,
-                              "nonce_str":String.randomStr(len: 30) as Any,
+                              "nonce_str":nonce_str as Any,
                               "city_id":cityData.city_id as Any,
                               "city_info_revision":carModel?.revision as Any,
                               "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
@@ -155,7 +155,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
             
             let dict1 = ["user_token":UserToken as Any,
-                         "nonce_str":String.randomStr(len: 30) as Any,
+                         "nonce_str":nonce_str as Any,
                          "city_id":firstCity.city_id as Any,
                          "city_info_revision":carModel?.revision as Any,
                          "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
@@ -240,7 +240,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 let fD = adrArr.first!
                 let cityData = fD["adr"] as! cityListDataModel
                 let params = ["user_token":UserToken as Any,
-                              "nonce_str":String.randomStr(len: 30) as Any,
+                              "nonce_str":nonce_str as Any,
                               "city_id":cityData.city_id as Any,
                               "city_info_revision":carModel?.revision as Any,
                               "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
@@ -288,7 +288,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     fileprivate func extractedFunc() {
         HUD.flash(.progress)
-        cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len:30) as Any,"city_id":city_id as Any], success: { (data) in
+        cityCart(["user_token":UserToken as Any,"nonce_str":nonce_str as Any,"city_id":city_id as Any], success: { (data) in
             
             let model = data as! cityCartModel
             self.carModel = model.data
@@ -384,7 +384,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             let fD = adrArr.first!
             let cityData = fD["adr"] as! cityListDataModel
             let params = ["user_token":UserToken as Any,
-                          "nonce_str":String.randomStr(len: 30) as Any,
+                          "nonce_str":nonce_str as Any,
                           "city_id":cityData.city_id as Any,
                           "city_info_revision":carModel?.revision as Any,
                           "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
@@ -682,13 +682,15 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     func LogisticalSelectViewBtnclick(idx:Int){
         if idx == 0 {
             weak_alertView?.fuTitleArr = []
-        }else{
+        }else if idx == 1{
             var futitleArr:Array<String> = []
             logPayPriceModel?.sf_data?.forEach({ (model) in
                 let str = model.cn! + "：￥" + (model.number)!
                 futitleArr.append(str)
             })
             weak_alertView?.fuTitleArr = futitleArr
+        }else{
+            weak_alertView?.fuTitleArr = []
         }
     }
     
@@ -751,7 +753,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }else{
                 if adrDatas.count == 0{
                     HUD.flash(.progress)
-                    cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
+                    cityList(["user_token":UserToken as Any,"nonce_str":nonce_str as Any], success: { (data) in
                         let model = data as! cityListModel
                         self.adrDatas.removeAll()
                         for item in model.data! {
@@ -828,7 +830,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         
         if adrDatas.count == 0 {
             HUD.flash(.progress)
-            cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
+            cityList(["user_token":UserToken as Any,"nonce_str":nonce_str as Any], success: { (data) in
                 let model = data as! cityListModel
                 
                 self.adrDatas.removeAll()
@@ -1222,7 +1224,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             
             if adrDatas.count == 0 {
                 HUD.flash(.progress)
-                cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
+                cityList(["user_token":UserToken as Any,"nonce_str":nonce_str as Any], success: { (data) in
                     let model = data as! cityListModel
                     
                     self.adrDatas.removeAll()
@@ -1391,7 +1393,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 if adrDatas.count == 0 {
                     HUD.flash(.progress)
-                    cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
+                    cityList(["user_token":UserToken as Any,"nonce_str":nonce_str as Any], success: { (data) in
                         let model = data as! cityListModel
                         
                         self.adrDatas.removeAll()
@@ -1822,12 +1824,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         let idx = IndexPath(row: 0, section: 0)
         let cell = hListView.cellForRow(at:idx) as! HLLTopCell
         cell.scrollView?.setContentOffset(CGPoint(x: selectCarType * Int(CGFloat(cell.scViewBg.bounds.size.width)), y: 0), animated: true)
-        
-        
     }
     
-    
-    
     var btnArr:Array<UIButton> = []
     var lineArr:Array<UIView> = []
     var topBtnScv:UIScrollView!