Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

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

@@ -138,7 +138,7 @@ extension YHOrderDetailViewController: UITableViewDelegate, UITableViewDataSourc
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 255
+        return 295
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -173,6 +173,8 @@ class YHOrderDetailTableViewCell: UITableViewCell {
     var phoneCopyButton: UIButton!
     var nameLabel: UILabel!
     var nameValueLabel: UILabel!
+    var serviceLabel: UILabel!
+    var serviceValueLabel: UILabel!
     var showDetailButton: UIButton!
     var otherTypeView: UIImageView!
     
@@ -414,11 +416,40 @@ class YHOrderDetailTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(bottomLineView)
         bottomLineView.snp.makeConstraints { make in
-            make.top.equalTo(187)
+            make.top.equalTo(227)
             make.left.right.equalToSuperview()
             make.height.equalTo(0.5)
         }
         
+        serviceLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor.mainTextColor.withAlphaComponent(0.5)
+            label.text = "服务内容"
+            return label
+        }()
+        centerView.addSubview(serviceLabel)
+        serviceLabel.snp.makeConstraints { make in
+            make.top.equalTo(188.5)
+            make.left.equalTo(16)
+            make.height.equalTo(20)
+        }
+        
+        serviceValueLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor.mainTextColor
+//            label.text = model.orderSn
+            label.textAlignment = .right
+            return label
+        }()
+        centerView.addSubview(serviceValueLabel)
+        serviceValueLabel.snp.makeConstraints { make in
+            make.top.equalTo(188.5)
+            make.right.equalTo(-16)
+            make.left.equalTo(serviceLabel.snp.right).offset(20)
+        }
+        
         showDetailButton = {
             let button = UIButton(type: .custom)
             button.setImage(UIImage(named: "service_right_icon"), for: .normal)
@@ -464,5 +495,6 @@ class YHOrderDetailTableViewCell: UITableViewCell {
         orderNumLabel.text = model.orderSn
         phoneNumLabel.text = model.mobile
         nameValueLabel.text = model.username
+        serviceValueLabel.text = model.service_name
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactItemModel.swift

@@ -17,4 +17,5 @@ struct YHContactItemModel : SmartCodable {
     var createTime : String = ""
     var type : String = ""
     var mobile: String = ""
+    var service_name: String = ""
 }