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

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Message(消息)/C/YHGalaxyNewsListViewController.swift

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveShopView.swift

@@ -262,10 +262,12 @@ class YHLiveShopViewCell: UITableViewCell {
             }
             titleLabel.text = dataSource.name
             messageLabel.text = dataSource.description
-            let a: ASAttributedString = .init("¥", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
-            let b: ASAttributedString = .init("\(dataSource.linePrice)", .font(UIFont(name: "DINAlternate-Bold", size: 20) ?? UIFont.PFSC_R(ofSize: 20)), .foreground(UIColor.mainTextColor))
+            let a: ASAttributedString = .init("¥", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
+            let linePrice = dataSource.linePrice.formattedPrice()
+            let b: ASAttributedString = .init("\(linePrice)", .font(UIFont(name: "D-DIN-PRO-Bold", size: 20) ?? UIFont.PFSC_R(ofSize: 20)), .foreground(UIColor.mainTextColor))
             priceLabel.attributed.text = a + b
-            let c: ASAttributedString = .init("¥\(dataSource.price)", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor(hex: 0x8993a2)), .strikethrough(.single))
+            let price = dataSource.price.formattedPrice()
+            let c: ASAttributedString = .init("¥\(price)", .font(UIFont(name: "D-DIN-PRO-Medium", size: 14) ?? UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor(hex: 0x8993a2)), .strikethrough(.single))
             subPriceLabel.attributed.text = c
             flagLabel.text = "\(dataSource.flag)"
             subPriceLabel.isHidden = dataSource.linePrice == dataSource.price

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHGalaxyNewsListViewController.swift

@@ -42,7 +42,6 @@ class YHGalaxyNewsListViewController: YHBaseViewController {
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
             make.bottom.equalToSuperview()
         }
-        
     }
     
     @objc func didCleanBtnClicked() {