Skip to content

G
galaxy-iOS
Commit e689bec4 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

将推送分支的更改迁移到4.25分支

parent c2e96cc6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift
View file @ e689bec4
...@@ -287,7 +287,7 @@ class YHSelectLookTableViewCell: UITableViewCell { ...@@ -287,7 +287,7 @@ class YHSelectLookTableViewCell: UITableViewCell {
} }
let a: ASAttributedString = .init("¥", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont()), .foreground(UIColor.mainTextColor)) let a: ASAttributedString = .init("¥", .font(UIFont(name: "D-DIN-PRO-Bold", size: 14) ?? UIFont()), .foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init("\(dataSource.linePrice.formattedPrice()) ", .font(UIFont(name: "D-DIN-PRO-Bold", size: 20) ?? UIFont()), .foreground(UIColor.mainTextColor)) 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)) let c: ASAttributedString = .init("¥\(dataSource.price.formattedPrice())", .font(UIFont(name: "D-DIN-PRO-Medium", size: 14) ?? UIFont()), .foreground(UIColor(hex: 0x8993a2)), .strikethrough(.single))
if dataSource.linePrice == dataSource.price { if dataSource.linePrice == dataSource.price {
self.subTitleLabel.attributed.text = a + b self.subTitleLabel.attributed.text = a + b
} else { } else {
......
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveShopView.swift
View file @ e689bec4
...@@ -262,10 +262,12 @@ class YHLiveShopViewCell: UITableViewCell { ...@@ -262,10 +262,12 @@ class YHLiveShopViewCell: UITableViewCell {
} }
titleLabel.text = dataSource.name titleLabel.text = dataSource.name
messageLabel.text = dataSource.description messageLabel.text = dataSource.description
let a: ASAttributedString = .init("¥", .font(UIFont.PFSC_R(ofSize: 14)), .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 b: ASAttributedString = .init("\(dataSource.linePrice)", .font(UIFont(name: "DINAlternate-Bold", size: 20) ?? UIFont.PFSC_R(ofSize: 20)), .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 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 subPriceLabel.attributed.text = c
flagLabel.text = "\(dataSource.flag)" flagLabel.text = "\(dataSource.flag)"
subPriceLabel.isHidden = dataSource.linePrice == dataSource.price subPriceLabel.isHidden = dataSource.linePrice == dataSource.price
......
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