Skip to content

G
galaxy-iOS
Commit 161fe2d8 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

服务中心逻辑

parent b83e48b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 15 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 161fe2d8
...@@ -8494,7 +8494,7 @@ ...@@ -8494,7 +8494,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8521,7 +8521,7 @@ ...@@ -8521,7 +8521,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2.3; MARKETING_VERSION = 2.2.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -8642,7 +8642,7 @@ ...@@ -8642,7 +8642,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8669,7 +8669,7 @@ ...@@ -8669,7 +8669,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2.3; MARKETING_VERSION = 2.2.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -8852,7 +8852,7 @@ ...@@ -8852,7 +8852,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8879,7 +8879,7 @@ ...@@ -8879,7 +8879,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2.3; MARKETING_VERSION = 2.2.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -8902,7 +8902,7 @@ ...@@ -8902,7 +8902,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8929,7 +8929,7 @@ ...@@ -8929,7 +8929,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.2.3; MARKETING_VERSION = 2.2.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift
View file @ 161fe2d8
...@@ -341,8 +341,12 @@ extension YHServiceCenterViewController { ...@@ -341,8 +341,12 @@ extension YHServiceCenterViewController {
self.homeTableView.tableHeaderView = UIView() self.homeTableView.tableHeaderView = UIView()
if self.model.product_type == 1 { if self.model.product_type == 1 {
self.titleLabel.setTitle("优才审批阶段", for: .normal) self.titleLabel.setTitle("优才审批阶段", for: .normal)
} else { } else if self.model.product_type == 2 {
self.titleLabel.setTitle("高才审批阶段", for: .normal) self.titleLabel.setTitle("高才审批阶段", for: .normal)
} else if self.model.product_type == 3 {
self.titleLabel.setTitle("专才审批阶段", for: .normal)
} else if self.model.product_type == 4 {
self.titleLabel.setTitle("留学审批阶段", for: .normal)
} }
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal) self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
} }
...@@ -362,8 +366,12 @@ extension YHServiceCenterViewController { ...@@ -362,8 +366,12 @@ extension YHServiceCenterViewController {
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
if self.model.product_type == 1 { if self.model.product_type == 1 {
self.titleLabel.setTitle("优才续签阶段", for: .normal) self.titleLabel.setTitle("优才续签阶段", for: .normal)
} else { } else if self.model.product_type == 2 {
self.titleLabel.setTitle("高才续签阶段", for: .normal) self.titleLabel.setTitle("高才续签阶段", for: .normal)
} else if self.model.product_type == 3 {
self.titleLabel.setTitle("专才续签阶段", for: .normal)
} else if self.model.product_type == 4 {
self.titleLabel.setTitle("留学续签阶段", for: .normal)
} }
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal) self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
self.isCanSelectStep = true self.isCanSelectStep = true
...@@ -413,8 +421,12 @@ extension YHServiceCenterViewController { ...@@ -413,8 +421,12 @@ extension YHServiceCenterViewController {
self.homeTableView.tableHeaderView = UIView() self.homeTableView.tableHeaderView = UIView()
if self.model.product_type == 1 { if self.model.product_type == 1 {
self.titleLabel.setTitle("优才申请阶段", for: .normal) self.titleLabel.setTitle("优才申请阶段", for: .normal)
} else { } else if self.model.product_type == 2 {
self.titleLabel.setTitle("高才申请阶段", for: .normal) self.titleLabel.setTitle("高才申请阶段", for: .normal)
} else if self.model.product_type == 3 {
self.titleLabel.setTitle("专才申请阶段", for: .normal)
} else if self.model.product_type == 4 {
self.titleLabel.setTitle("留学申请阶段", for: .normal)
} }
self.titleLabel.setImage(UIImage(named: ""), for: .normal) self.titleLabel.setImage(UIImage(named: ""), for: .normal)
} }
...@@ -423,8 +435,12 @@ extension YHServiceCenterViewController { ...@@ -423,8 +435,12 @@ extension YHServiceCenterViewController {
self.homeTableView.tableHeaderView = UIView() self.homeTableView.tableHeaderView = UIView()
if self.model.product_type == 1 { if self.model.product_type == 1 {
self.titleLabel.setTitle("优才审批阶段", for: .normal) self.titleLabel.setTitle("优才审批阶段", for: .normal)
} else { } else if self.model.product_type == 2 {
self.titleLabel.setTitle("高才审批阶段", for: .normal) self.titleLabel.setTitle("高才审批阶段", for: .normal)
} else if self.model.product_type == 3 {
self.titleLabel.setTitle("专才审批阶段", for: .normal)
} else if self.model.product_type == 4 {
self.titleLabel.setTitle("留学审批阶段", for: .normal)
} }
if isCanSelectStep { if isCanSelectStep {
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal) self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
...@@ -448,8 +464,12 @@ extension YHServiceCenterViewController { ...@@ -448,8 +464,12 @@ extension YHServiceCenterViewController {
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
if self.model.product_type == 1 { if self.model.product_type == 1 {
self.titleLabel.setTitle("优才续签阶段", for: .normal) self.titleLabel.setTitle("优才续签阶段", for: .normal)
} else { } else if self.model.product_type == 2 {
self.titleLabel.setTitle("高才续签阶段", for: .normal) self.titleLabel.setTitle("高才续签阶段", for: .normal)
} else if self.model.product_type == 3 {
self.titleLabel.setTitle("专才续签阶段", for: .normal)
} else if self.model.product_type == 4 {
self.titleLabel.setTitle("留学续签阶段", for: .normal)
} }
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal) self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/M/YHContactItemModel.swift
View file @ 161fe2d8
...@@ -18,7 +18,7 @@ struct YHContactItemModel: SmartCodable { ...@@ -18,7 +18,7 @@ struct YHContactItemModel: SmartCodable {
var type: String = "" var type: String = ""
var mobile: String = "" var mobile: String = ""
var status: Int = 0 var status: Int = 0
var product_type: Int = 0 // 1-优才 2-高才 var product_type: Int = 0 // 1-优才 2-高才 // 3-专才 // 4-留学
var isOther: Bool = false // 是否协作单 var isOther: Bool = false // 是否协作单
var service_name: String = "" var service_name: String = ""
} }
galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift
View file @ 161fe2d8
...@@ -17,7 +17,7 @@ class YHAnalytics { ...@@ -17,7 +17,7 @@ class YHAnalytics {
#if DEBUG #if DEBUG
let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions) let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions)
// 开启log // 开启log
options.enableLog = true options.enableLog = false
SensorsAnalyticsSDK.sharedInstance()?.set(["evn": "test"]) SensorsAnalyticsSDK.sharedInstance()?.set(["evn": "test"])
#elseif TESTENV #elseif TESTENV
let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions) let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions)
......
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