Skip to content

G
GeliBusinessPlatform
Commit f31ba6e2 authored by lujunye's avatar lujunye
Browse files
Options

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

parent f12d1811
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 61 deletions
GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift
View file @ f31ba6e2
......@@ -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
View file @ f31ba6e2
......@@ -913,7 +913,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}else if CLLocationManager.authorizationStatus() == .denied {
let aleat = UIAlertController(title: "打开定位开关", message:"定位服务未开启,请进入系统设置>隐私>定位服务中打开开关,并允许商户端使用定位服务", preferredStyle: .alert)
let tempAction = UIAlertAction(title: "取消", style: .cancel) { (action) in
}
}
let callAction = UIAlertAction(title: "立即设置", style: .default) { (action) in
let url = NSURL.init(string: UIApplication.openSettingsURLString)
if(UIApplication.shared.canOpenURL(url! as URL)) {
......@@ -1488,48 +1488,48 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
if isLoadingTime {
isLoadingTime = false
getHllTime(["user_token":UserToken as Any], success: { (data) in
let model = data as! getHllTimeModel
self.isLoadingTime = true
if self.bgBtn == nil {
let btn = UIButton()
self.view.addSubview(btn)
btn.backgroundColor = UIColor.black
btn.alpha = 0.4
btn.addTarget(self, action: #selector(self.closeAc), for: .touchUpInside)
btn.snp.makeConstraints { (make) in
make.top.right.bottom.left.equalTo(0)
getHllTime(["user_token":UserToken as Any], success: { (data) in
let model = data as! getHllTimeModel
self.isLoadingTime = true
if self.bgBtn == nil {
let btn = UIButton()
self.view.addSubview(btn)
btn.backgroundColor = UIColor.black
btn.alpha = 0.4
btn.addTarget(self, action: #selector(self.closeAc), for: .touchUpInside)
btn.snp.makeConstraints { (make) in
make.top.right.bottom.left.equalTo(0)
}
self.bgBtn = btn
}
self.bgBtn = btn
}
if self.btmView == nil {
let view = UIView()
view.backgroundColor = UIColor.white
self.view.addSubview(view)
self.btmView = view
view.snp.makeConstraints { (make) in
make.left.bottom.right.equalTo(0)
make.height.equalTo(360)
if self.btmView == nil {
let view = UIView()
view.backgroundColor = UIColor.white
self.view.addSubview(view)
self.btmView = view
view.snp.makeConstraints { (make) in
make.left.bottom.right.equalTo(0)
make.height.equalTo(360)
}
view.layer.cornerRadius = 5
view.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
}
view.layer.cornerRadius = 5
view.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
}
self.dayArr.removeAll()
for item in model.data! {
self.dayArr.append(item)
self.dayArr.removeAll()
for item in model.data! {
self.dayArr.append(item)
}
self.showTimeSelect(view: self.btmView!)
HUD.hide()
}) { (err) in
}
self.showTimeSelect(view: self.btmView!)
HUD.hide()
}) { (err) in
}
}
}
}
}
}
var glSelectView:GLAlertSelectView?
@objc func closeAc(){
......@@ -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,22 +2022,24 @@ 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
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)
let lbl = UILabel(frame: CGRect(x: btn.frame.origin.x, y: btn.frame.origin.y + 10 + imgV.bounds.size.height, width: w, height: w - (w * p * 2.5)))
lbl.textColor = UIColor(named: "灰色字体颜色")
lbl.font = UIFont.systemFont(ofSize: 13)
lbl.textAlignment = .center
lbl.text = model.name
bg.addSubview(lbl)
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)
let lbl = UILabel(frame: CGRect(x: btn.frame.origin.x, y: btn.frame.origin.y + 10 + imgV.bounds.size.height, width: w, height: w - (w * p * 2.5)))
lbl.textColor = UIColor(named: "灰色字体颜色")
lbl.font = UIFont.systemFont(ofSize: 13)
lbl.textAlignment = .center
lbl.text = model.name
bg.addSubview(lbl)
}
bg.addSubview(imgV)
}
bg.addSubview(imgV)
btn.setTitleColor(UIColor.black, for: .normal)
bg.addSubview(btn)
}
......
GeliBusinessPlatform/ViewController/城市列表/CityListViewController.swift
View file @ f31ba6e2
......@@ -55,7 +55,9 @@ class CityListViewController: BaseViewController ,UITableViewDelegate,UITableVie
keyword = searchBar.text!
}
if searchBar.text!.count == 0 {
searchList.isHidden = true
if searchList != nil {
searchList.isHidden = true
}
}
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
......
GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift
View file @ f31ba6e2
......@@ -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
View file @ f31ba6e2
......@@ -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 = "运输中"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment