派单页

This commit is contained in:
DDIsFriend
2024-01-10 18:47:06 +08:00
parent dca677b386
commit e8884912e6
5 changed files with 36 additions and 19 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -6292,8 +6292,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "404" startingLineNumber = "414"
endingLineNumber = "404" endingLineNumber = "414"
landmarkName = "tableView(_:cellForRowAt:)" landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -6314,5 +6314,21 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AA6774D6-00B8-461F-A0D9-EBC20FBE3A5E"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "662"
endingLineNumber = "662"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

View File

@@ -398,6 +398,16 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource {
cell?.distance.text = String(distance)+"km" cell?.distance.text = String(distance)+"km"
} }
if model.driverPhone?.isEmpty == false {
cell?.phoneButton.snp.updateConstraints({ make in
make.width.equalTo(auto(24))
})
}else{
cell?.phoneButton.snp.updateConstraints({ make in
make.width.equalTo(0)
})
}
cell?.phoneButton.rx.tap cell?.phoneButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
@@ -415,18 +425,8 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource {
if USERP.canDealWith == true { if USERP.canDealWith == true {
cell?.dispatchButton.isHidden = false cell?.dispatchButton.isHidden = false
cell?.dispatchButton.snp.updateConstraints({ make in
make.width.equalTo(auto(50))
make.right.equalTo(-auto(10))
})
}else{ }else{
cell?.dispatchButton.isHidden = true cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in
make.width.equalTo(0)
make.right.equalTo(0)
})
} }
return cell! return cell!
} }
@@ -585,11 +585,11 @@ open class DispatchOrderController : ZDViewController {
open override func viewWillLayoutSubviews() { open override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews() super.viewWillLayoutSubviews()
dispatchOrderView.snp.makeConstraints { make in dispatchOrderView.snp.remakeConstraints { make in
make.edges.equalToSuperview() make.edges.equalToSuperview()
} }
bottomView.snp.makeConstraints { make in bottomView.snp.remakeConstraints { make in
make.left.bottom.right.equalToSuperview() make.left.bottom.right.equalToSuperview()
make.height.equalTo(view.safeAreaInsets.bottom) make.height.equalTo(view.safeAreaInsets.bottom)
} }
@@ -703,7 +703,8 @@ open class DispatchOrderPannelCell : DDTableViewCell {
} }
phoneButton.snp.makeConstraints { make in phoneButton.snp.makeConstraints { make in
make.left.equalTo(name.snp.right) make.left.equalTo(name.snp.right).priority(.high)
make.width.height.equalTo(auto(24))
make.right.equalToSuperview() make.right.equalToSuperview()
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
@@ -953,7 +954,7 @@ open class DispatchOrderOfflineSchedulingItemView : DDView {
line.snp.makeConstraints { make in line.snp.makeConstraints { make in
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalTo(auto(30)) make.left.equalTo(auto(30)).priority(.high)
make.right.equalTo(-auto(30)) make.right.equalTo(-auto(30))
make.height.equalTo(1) make.height.equalTo(1)
} }

View File

@@ -5,17 +5,17 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000175"> <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000245">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: gym" time="70.746678"> <testcase classname="fastlane.lanes" name="1: gym" time="70.556793">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: pgyer" time="11.150287"> <testcase classname="fastlane.lanes" name="2: pgyer" time="11.740375">
</testcase> </testcase>