工作中心增加背景图字段，

GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift

@@ -68,7 +68,7 @@ class WorkcenterIndexAuthResModel: Mappable {
     var platforms : Int?
     var auth_pid : Int?   ////权限id父
     var app_icon : String? //item缩略图
-
+    var app_icon_bg : String? //item缩略图（带背景色）
     required init?( map: Map) {
         
     }
@@ -82,7 +82,7 @@ class WorkcenterIndexAuthResModel: Mappable {
         platforms <- map["platforms"]
         auth_pid <- map["auth_pid"]
         app_icon <- map["app_icon"]
-
+        app_icon_bg <- map["app_icon_bg"]
     }
     
 }

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

@@ -1890,14 +1890,14 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             view.addSubview(button)
             button.addTarget(self, action: #selector(selectAllCars), for: .touchUpInside)
             
-//            let line1 = UIView()
-//            line1.backgroundColor = UIColor(named: "灰色分界线")
-//            view.addSubview(line1)
-//            line1.snp_makeConstraints { (make) in
-//                make.height.equalTo(1)
-//                make.right.left.equalTo(0)
-//                make.top.equalTo(0)
-//            }
+            //            let line1 = UIView()
+            //            line1.backgroundColor = UIColor(named: "灰色分界线")
+            //            view.addSubview(line1)
+            //            line1.snp_makeConstraints { (make) in
+            //                make.height.equalTo(1)
+            //                make.right.left.equalTo(0)
+            //                make.top.equalTo(0)
+            //            }
             
             let line2 = UIView()
             line2.backgroundColor = UIColor(named: "灰色分界线")
@@ -2022,6 +2022,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         let imgV = UIImageView()
         SDWebImageDownloader.shared.downloadImage(with: URL(string:model.img_url_high_light!), options: .continueInBackground, progress: { (a, b, nil) in
         }) { (img, data, err, true) in
+            if img != nil {
                 imgV.image = img
                 let p = w / (imgV.image?.size.width)!
                 imgV.frame = CGRect(x: btn.frame.origin.x, y: btn.frame.origin.y + 15, width: w, height: w * p * 1.8)
@@ -2034,10 +2035,11 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 bg.addSubview(lbl)
             }
             bg.addSubview(imgV)
-        
+        }
         
         btn.setTitleColor(UIColor.black, for: .normal)
         bg.addSubview(btn)
+        
     }
     
     

GeliBusinessPlatform/ViewController/城市列表/CityListViewController.swift

@@ -55,9 +55,11 @@ class CityListViewController: BaseViewController ,UITableViewDelegate,UITableVie
             keyword = searchBar.text!
         }
         if searchBar.text!.count == 0 {
+            if searchList != nil {
                 searchList.isHidden = true
             }
         }
+    }
     func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
         print("调起搜索后添加个蒙版本")
         

GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift

@@ -191,8 +191,9 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
                     cell.itemImgV.image  = UIImage.init(named: "worktest1")
                     
                 }else{
+//                    cell.itemImgV.sd_setImage(with:  URL(string:SERVERCE_ImageHost +  rowModel.app_icon_bg!), placeholderImage: UIImage.init(named: "worktest1"))
+                    //带背景常用icon
                     cell.itemImgV.sd_setImage(with:  URL(string:SERVERCE_ImageHost +  rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"))
-                    
                 }
                 cell.itemNameLbl.text = rowModel.auth_name
                 cell.bgImV.image = UIImage.init(named: "workjian")

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift

@@ -49,7 +49,6 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
     var notiObj = ""
     @objc func getNoti(noti:Notification){
         notiObj = noti.object as! String
-        print("abc == ",notiObj)
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "logistDetail"), object: nil, userInfo: nil)
 
         loadData()
@@ -127,6 +126,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             vc.lwbno = lwb_no
             self.navigationController?.pushViewController(vc, animated: true)
         }else if (bottomLbl.text?.contains("立即支付"))!{
+            
             if dataModel?.delivery?.hll_pay_status_two == 1 &&  dataModel?.order_detail_item?.order_item?.order_status == 13{
                 if !ispayHllOrder {
                     let UserToken = UserDefaults.standard.value(forKey: "user_token")
@@ -319,7 +319,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.statusLbl.text  = "待装货"
                 cell.statusImgV.image = UIImage.init(named: "货拉拉待装货")
             case 15:
-                cell.statusLbl.text  = "待装中"
+                cell.statusLbl.text  = "装货中"
                 cell.statusImgV.image = UIImage.init(named: "货拉拉运输中")
             case 7:
                 cell.statusLbl.text  = "运输中"