Commit 9a934738 authored by pete谢兆麟's avatar pete谢兆麟

解决moon提出的bug

parent 467cf1e3
......@@ -8482,7 +8482,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8628,7 +8628,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8836,7 +8836,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8884,7 +8884,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
......@@ -20,7 +20,7 @@ class YHMakePlanBottomView: UIView {
return label
}()
private lazy var priceButton: UIButton = {
lazy var priceButton: UIButton = {
let label = UIButton()
label.setImage(UIImage(named: "make_plan_up"), for: .normal)
label.addTarget(self, action: #selector(handleAction), for: .touchUpInside)
......
......@@ -40,12 +40,12 @@ class YHMakePlanPriceAlertView: UIView {
didSet {
tableView.reloadData()
let totalPrice = dataSource.calculateTotalPrice()
priceView.priceButton.setImage(UIImage(named: "make_plan_down"), for: .normal)
priceView.configure(price: totalPrice, actionText: "去办理") {
self.dismiss()
} nextHandler: {
self.block?(1)
}
}
}
......@@ -346,10 +346,15 @@ class YHMakePlanLabelCell: UITableViewCell {
var lastView: UIView?
for (i, model) in filteredModel.enumerated() {
let name = model.sub_product.first?.product_name ?? ""
let titleLabel = UILabel()
titleLabel.font = UIFont.PFSC_M(ofSize: 14)
titleLabel.textColor = UIColor.mainTextColor
titleLabel.text = model.product_name
if name == "" {
titleLabel.text = model.product_name
} else {
titleLabel.text = model.product_name + " | " + name
}
titleLabel.numberOfLines = 0
mainItemView.addSubview(titleLabel)
......
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