diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index fe0bd94..0d46a2e 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -612,6 +612,7 @@ class HistoryItemCell : DDTableViewCell { serviceLabel.snp.makeConstraints { make in make.top.equalTo(serviceTitleLabel) make.left.equalTo(serviceTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(serviceTitleLabel) make.right.equalTo(-auto(20)) } @@ -624,6 +625,7 @@ class HistoryItemCell : DDTableViewCell { destinationLabel.snp.makeConstraints { make in make.top.equalTo(destinationTitleLabel) make.left.equalTo(destinationTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(destinationTitleLabel) make.right.equalTo(-auto(20)) } diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 9ebfe02..0e07be4 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -419,4 +419,6 @@ public class VehicleMonitorInfoDataModel : Decodable { var distance : Double? var mileageBc : Double? var contractName : String? + var organizeName : String? + var organizeAbbrName : String? } diff --git a/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift b/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift index b35d8c5..35f8445 100644 --- a/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift +++ b/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift @@ -115,7 +115,12 @@ extension MessageCenterController : UITableViewDelegate,UITableViewDataSource { } let model = resultArr[indexPath.item] - cell!.descLabel.text = model.content + let desc = NSMutableAttributedString(string: model.content ?? "",attributes: [.font: UIFont.mediumFont(13),.foregroundColor : UIColor.dd_hex(light: "000000", dark: "000000").withAlphaComponent(0.75)]) + if model.msgType.code == 6 { + desc.append(NSMutableAttributedString(string: "\n\n为获取更多案件",attributes: [.font : UIFont.mediumFont(16),.foregroundColor: UIColor.dd_hex(light: "000000", dark: "000000").withAlphaComponent(0.9)])) + desc.append(NSMutableAttributedString(string: "\n\n请提醒在班的师傅登录APP并合理保持在线。",attributes: [.font : UIFont.mediumFont(13),.foregroundColor: UIColor.dd_hex(light: "000000", dark: "000000").withAlphaComponent(0.75)])) + } + cell!.descLabel.attributedText = desc cell!.noticeLabel.text = " " + model.title + " " cell!.noticeLabel.backgroundColor = .hex(model.titleColor) cell!.orderNumLabel.text = model.titleContent diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index dde8124..a1aa698 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -1609,6 +1609,7 @@ class RescuePendingOrderCell : DDTableViewCell { serviceLabel.snp.makeConstraints { make in make.top.equalTo(serviceTitleLabel) make.left.equalTo(serviceTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(serviceTitleLabel) make.right.equalTo(-auto(20)) } @@ -1621,6 +1622,7 @@ class RescuePendingOrderCell : DDTableViewCell { destinationLabel.snp.makeConstraints { make in make.top.equalTo(destinationTitleLabel) make.left.equalTo(destinationTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(destinationTitleLabel) make.right.equalTo(-auto(20)) } @@ -1889,6 +1891,7 @@ class RescuePendingDispatchCell : DDTableViewCell { serviceLabel.snp.makeConstraints { make in make.top.equalTo(serviceTitleLabel) make.left.equalTo(serviceTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(serviceTitleLabel) make.right.equalTo(-auto(20)) } @@ -1912,6 +1915,7 @@ class RescuePendingDispatchCell : DDTableViewCell { destinationLabel.snp.makeConstraints { make in make.top.equalTo(destinationTitleLabel) make.left.equalTo(destinationTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(destinationTitleLabel) make.right.equalTo(-auto(20)) } @@ -2162,6 +2166,7 @@ class RescueIsIngCell : DDTableViewCell { serviceLabel.snp.makeConstraints { make in make.top.equalTo(serviceTitleLabel) make.left.equalTo(serviceTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(serviceTitleLabel) make.right.equalTo(-auto(20)) } @@ -2174,6 +2179,7 @@ class RescueIsIngCell : DDTableViewCell { destinationLabel.snp.makeConstraints { make in make.top.equalTo(destinationTitleLabel) make.left.equalTo(destinationTitleLabel.snp.right) + make.height.greaterThanOrEqualTo(destinationTitleLabel) make.right.equalTo(-auto(20)) } diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 1efddb4..5f24fd6 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -1781,7 +1781,11 @@ class VMLDContainerView : DDView , JXCategoryListContentViewDelegate { .subscribe(onSuccess: {[weak self] response in guard let self = self else { return } if let contractName = response?.data?.contractName { - self.contractContent.text = contractName + var contractContent = contractName + if let organizeName = response?.data?.organizeName { + contractContent = contractContent + "/" + organizeName + } + self.contractContent.text = contractContent self.contractTitle.text = "合同:" self.contractImageView.image = UIImage(named: "vehichleMonitoring_contract_16") }else{