Commit 4bc51d21 authored by pete谢兆麟's avatar pete谢兆麟

Merge branch 'xiezhaolin' into develop

parents 55d48b59 7a62f3d7
...@@ -356,7 +356,8 @@ extension YHServiceCenterMainViewController { ...@@ -356,7 +356,8 @@ extension YHServiceCenterMainViewController {
//配置指示器 //配置指示器
let indicator = JXSegmentedIndicatorLineView() let indicator = JXSegmentedIndicatorLineView()
indicator.indicatorWidth = 16 indicator.indicatorWidth = 16
indicator.indicatorColor = .blue indicator.indicatorColor = UIColor.brandMainColor
indicator.indicatorCornerRadius = 0
segmentedView.indicators = [indicator] segmentedView.indicators = [indicator]
segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1) segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
......
...@@ -113,7 +113,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -113,7 +113,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 144 return 128
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
......
...@@ -45,7 +45,7 @@ class YHProgressView: UIView { ...@@ -45,7 +45,7 @@ class YHProgressView: UIView {
progressLayer.strokeColor = UIColor(hex: 0x00BF60).cgColor // 进度条颜色 progressLayer.strokeColor = UIColor(hex: 0x00BF60).cgColor // 进度条颜色
progressLayer.fillColor = UIColor.clear.cgColor progressLayer.fillColor = UIColor.clear.cgColor
progressLayer.lineWidth = lineWidth // 进度条宽度 progressLayer.lineWidth = lineWidth // 进度条宽度
progressLayer.lineCap = .round progressLayer.lineCap = .square
// 设置初始进度 // 设置初始进度
progressLayer.strokeEnd = 0 progressLayer.strokeEnd = 0
......
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