Skip to content

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

Merge branch 'develop' into jiaofei

parents 654b25e9 1b409584
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMemberCenterViewController.swift
View file @ f9a370f5
...@@ -201,7 +201,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -201,7 +201,7 @@ class YHMemberCenterViewController: YHBaseViewController {
datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangedCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue)) datas.append(.myPrivilege(myLevel, myLevel.privilegeCount, memberCenterInfo.exchangeCount, memberCenterInfo.exchangedCount, memberCenterInfo.currentLevel > YHMembershipLevel.normal.rawValue))
let services: [YHMemberCenterCellContent] = [.customerService, .pointsConsumption, .afternoonTea, .offlineSalons, .onSiteConsultation] let services: [YHMemberCenterCellContent] = [.customerService, .pointsConsumption, .afternoonTea, .offlineSalons, .onSiteConsultation]
let ids: [String] = [memberCenterInfo.dedicatedAdviser.giftId, memberCenterInfo.specialIntegralConsumption.giftId, memberCenterInfo.luxuryTea.giftId, memberCenterInfo.offlineSalon.giftId, memberCenterInfo.answerConsult.giftId] let ids: [String] = [memberCenterInfo.dedicatedAdviser.giftId, memberCenterInfo.specialIntegralConsumption.giftId, memberCenterInfo.luxuryTea.giftId, memberCenterInfo.offlineSalon.giftId, memberCenterInfo.answerConsult.giftId]
details = ["不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换"] details = ["", "", "", "", ""]
buttonTitles = ["立即联系", "了解更多", "立即兑换", "了解更多", "了解更多"] buttonTitles = ["立即联系", "了解更多", "立即兑换", "了解更多", "了解更多"]
buttonStates = [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable] buttonStates = [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable]
services.enumerated().forEach { index, service in services.enumerated().forEach { index, service in
...@@ -222,7 +222,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -222,7 +222,7 @@ class YHMemberCenterViewController: YHBaseViewController {
appendMenu(memberCenterInfo.highTeaBox) appendMenu(memberCenterInfo.highTeaBox)
appendMenu(memberCenterInfo.experienceCenter) appendMenu(memberCenterInfo.experienceCenter)
details.append(contentsOf: ["不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换"]) details.append(contentsOf: ["", "", "", "", ""])
buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"]) buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"])
buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable]) buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable])
...@@ -246,7 +246,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -246,7 +246,7 @@ class YHMemberCenterViewController: YHBaseViewController {
appendMenu(memberCenterInfo.highTeaBox) appendMenu(memberCenterInfo.highTeaBox)
appendMenu(memberCenterInfo.experienceCenter) appendMenu(memberCenterInfo.experienceCenter)
details.append(contentsOf: ["不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换"]) details.append(contentsOf: ["", "", "", "", ""])
buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"]) buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"])
buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable]) buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable])
...@@ -281,7 +281,7 @@ class YHMemberCenterViewController: YHBaseViewController { ...@@ -281,7 +281,7 @@ class YHMemberCenterViewController: YHBaseViewController {
appendMenu(memberCenterInfo.highTeaBox) appendMenu(memberCenterInfo.highTeaBox)
appendMenu(memberCenterInfo.experienceCenter) appendMenu(memberCenterInfo.experienceCenter)
details.append(contentsOf: ["不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换", "不限次数兑换"]) details.append(contentsOf: ["", "", "", "", ""])
buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"]) buttonTitles.append(contentsOf: ["立即兑换", "了解更多", "了解更多", "立即联系", "了解更多"])
buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable]) buttonStates.append(contentsOf: [.redeemable, .redeemable, .redeemable, .redeemable, .redeemable])
services.enumerated().forEach { index, service in services.enumerated().forEach { index, service in
......
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