Merge branch 'xiezhaolin' into develop

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -356,7 +356,8 @@ extension YHServiceCenterMainViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
-        indicator.indicatorColor = .blue
+        indicator.indicatorColor = UIColor.brandMainColor
+        indicator.indicatorCornerRadius = 0
         segmentedView.indicators = [indicator]
         segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -113,7 +113,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
 
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 144
+        return 128
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHProgressView.swift

@@ -45,7 +45,7 @@ class YHProgressView: UIView {
          progressLayer.strokeColor = UIColor(hex: 0x00BF60).cgColor // 进度条颜色
          progressLayer.fillColor = UIColor.clear.cgColor
          progressLayer.lineWidth = lineWidth // 进度条宽度
-         progressLayer.lineCap = .round
+         progressLayer.lineCap = .square
          
          // 设置初始进度
          progressLayer.strokeEnd = 0