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

galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift

@@ -286,8 +286,8 @@ class YHSelectLookTableViewCell: UITableViewCell {
                 flagLabel.isHidden = false
             }
             let a: ASAttributedString = .init("¥", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont()), .foreground(UIColor.mainTextColor))
-            let b: ASAttributedString = .init("\(dataSource.linePrice) ", .font(UIFont(name: "D-DIN-PRO-Bold", size: 20) ?? UIFont()), .foreground(UIColor.mainTextColor))
-            let c: ASAttributedString = .init("¥\(dataSource.price)", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont()), .foreground(UIColor(hex: 0x8993a2)), .strikethrough(.single))
+            let b: ASAttributedString = .init("\(dataSource.linePrice.formattedPrice()) ", .font(UIFont(name: "D-DIN-PRO-Bold", size: 20) ?? UIFont()), .foreground(UIColor.mainTextColor))
+            let c: ASAttributedString = .init("¥\(dataSource.price.formattedPrice())", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont()), .foreground(UIColor(hex: 0x8993a2)), .strikethrough(.single))
             if dataSource.linePrice == dataSource.price {
                 self.subTitleLabel.attributed.text = a + b
             } else {

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/V/YHMakePlanPriceAlertView.swift

@@ -294,8 +294,8 @@ class YHMakePlanLabelCell: UITableViewCell {
         }()
         contentView.addSubview(centerView)
         centerView.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
             make.top.equalTo(7)
             make.bottom.equalTo(-7)
         }
@@ -309,10 +309,9 @@ class YHMakePlanLabelCell: UITableViewCell {
         }()
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
-            make.left.equalTo(18)
+            make.left.right.equalToSuperview()
             make.top.equalTo(16)
             make.height.equalTo(20)
-            make.right.equalTo(-18)
         }
         
         mainItemView = {
@@ -323,10 +322,8 @@ class YHMakePlanLabelCell: UITableViewCell {
         }()
         centerView.addSubview(mainItemView)
         mainItemView.snp.makeConstraints { make in
-            make.bottom.equalToSuperview()
+            make.left.right.bottom.equalToSuperview()
             make.top.equalTo(36)
-            make.left.equalTo(18)
-            make.right.equalTo(-18)
         }
         
         lineView = {
@@ -336,10 +333,8 @@ class YHMakePlanLabelCell: UITableViewCell {
         }()
         centerView.addSubview(lineView)
         lineView.snp.makeConstraints { make in
-            make.left.equalTo(18)
-            make.bottom.equalToSuperview()
+            make.left.right.bottom.equalToSuperview()
             make.height.equalTo(1)
-            make.right.equalTo(-18)
         }
         
     }