diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index dc7046a..a41cdab 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1f29396..6a3cd47 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -411,8 +411,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "965" - endingLineNumber = "965" + startingLineNumber = "953" + endingLineNumber = "953" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -2237,8 +2237,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "976" - endingLineNumber = "976" + startingLineNumber = "964" + endingLineNumber = "964" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2971,8 +2971,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1059" - endingLineNumber = "1059" + startingLineNumber = "1047" + endingLineNumber = "1047" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3739,8 +3739,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "886" - endingLineNumber = "886" + startingLineNumber = "880" + endingLineNumber = "880" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -4759,8 +4759,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1856" - endingLineNumber = "1856" + startingLineNumber = "1844" + endingLineNumber = "1844" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4807,8 +4807,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1863" - endingLineNumber = "1863" + startingLineNumber = "1851" + endingLineNumber = "1851" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 6bec09d..04690a2 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -243,24 +243,12 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { make.width.equalTo(auto(80)) make.right.equalTo(cell!.additionalButton.snp.left).offset(-auto(10)) }) - - cell?.reportDetailButton.isHidden = false - cell?.reportDetailButton.snp.updateConstraints({ make in - make.width.equalTo(auto(80)) - make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10)) - }) }else{ cell?.reportButton.isHidden = true cell?.reportButton.snp.updateConstraints({ make in make.width.equalTo(0) make.right.equalTo(cell!.additionalButton.snp.left).offset(0) }) - - cell?.reportDetailButton.isHidden = true - cell?.reportDetailButton.snp.updateConstraints({ make in - make.width.equalTo(0) - make.right.equalTo(cell!.reportButton.snp.left).offset(0) - }) } if USERP.canSupplierAuditEditCostBtn == true { diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index fa7dc36..e8d32e0 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -57,9 +57,7 @@ extension MineController { if let icon = response?.data?.icon { self?.mineView.avatar.sd_setImage(with: URL(string: icon),placeholderImage: UIImage(named: "placeholder_gender_man")) } - if let phone = response?.data?.phone{ - self?.mineView.accountLabel.text = "账号:\(phone)" - } + if let company = response?.data?.supplierName { self?.mineView.companyLabel.text = company } @@ -188,7 +186,6 @@ open class MineView : DDView { private let scrollContentView : DDView private let topBackgroundImageView : DDImageView public let avatar : DDImageView - public let accountLabel : DDLabel public let companyLabel : DDLabel public let carInfoGes : UITapGestureRecognizer public let carInfoView : MineInfoView @@ -218,7 +215,6 @@ open class MineView : DDView { scrollContentView = DDView() topBackgroundImageView = DDImageView() avatar = DDImageView(image: UIImage(named: "placeholder_gender_man")) - accountLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(15)), textColor: .hex("FFFFFF").alpha(0.8)) companyLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("FFFFFF").alpha(0.5)) carInfoView = MineInfoView() carInfoGes = UITapGestureRecognizer() @@ -254,7 +250,6 @@ open class MineView : DDView { avatar.layer.cornerRadius = auto(27) avatar.layer.masksToBounds = true scrollContentView.addSubview(avatar) - scrollContentView.addSubview(accountLabel) scrollContentView.addSubview(companyLabel) infoRadiusView.backgroundColor = .hex("FFFFFF") infoRadiusView.layer.cornerRadius = auto(12) @@ -315,14 +310,9 @@ open class MineView : DDView { make.width.height.equalTo(auto(54)) } - accountLabel.snp.makeConstraints { make in - make.centerY.equalTo(avatar).offset(-auto(10)) - make.left.equalTo(avatar.snp.right).offset(auto(15)) - } - companyLabel.snp.makeConstraints { make in make.left.equalTo(avatar.snp.right).offset(auto(15)) - make.centerY.equalTo(avatar).offset(auto(10)) + make.centerY.equalTo(avatar) } infoRadiusView.snp.makeConstraints { make in diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index b346bde..1e6c6ae 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -876,24 +876,12 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { make.width.equalTo(auto(80)) make.right.equalTo(-auto(10)) }) - - cell?.reportDetailButton.isHidden = false - cell?.reportDetailButton.snp.updateConstraints({ make in - make.width.equalTo(auto(80)) - make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10)) - }) }else{ cell?.reportButton.isHidden = true cell?.reportButton.snp.updateConstraints({ make in make.width.equalTo(0) make.right.equalTo(0) }) - - cell?.reportDetailButton.isHidden = true - cell?.reportDetailButton.snp.updateConstraints({ make in - make.width.equalTo(0) - make.right.equalTo(0) - }) } if USERP.canWaitModifyDispatchBtn == false && USERP.canSupplierRemarkBtn == false { diff --git a/fastlane/report.xml b/fastlane/report.xml index 13d3b55..aa2a5a7 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +