Commit 6709bccc authored by David黄金龙's avatar David黄金龙

1、修改版本号 0.2.8.0

2、处理一处bug
parent 7f575903
...@@ -2756,7 +2756,7 @@ ...@@ -2756,7 +2756,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2776,7 +2776,7 @@ ...@@ -2776,7 +2776,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.7; MARKETING_VERSION = 0.2.8;
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 = "";
...@@ -2957,7 +2957,7 @@ ...@@ -2957,7 +2957,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2977,7 +2977,7 @@ ...@@ -2977,7 +2977,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.7; MARKETING_VERSION = 0.2.8;
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 = "";
...@@ -2999,7 +2999,7 @@ ...@@ -2999,7 +2999,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -3019,7 +3019,7 @@ ...@@ -3019,7 +3019,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.7; MARKETING_VERSION = 0.2.8;
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 = "";
......
...@@ -91,9 +91,7 @@ extension YHMyDocumentsListViewController { ...@@ -91,9 +91,7 @@ extension YHMyDocumentsListViewController {
viewModel?.requestDocumentsList("\(orderId)", mobile, callBackBlock: {[weak self] success, error in viewModel?.requestDocumentsList("\(orderId)", mobile, callBackBlock: {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success { if success {
guard let arr = self.viewModel?.mainModel?.docs else { return } guard let arr = self.viewModel?.mainModel?.docs else { return }
var tag = true var tag = true
for item in arr { for item in arr {
if item.sign_doc.doc_send.contains(".pdf",caseSensitive: false) == false { if item.sign_doc.doc_send.contains(".pdf",caseSensitive: false) == false {
...@@ -101,6 +99,7 @@ extension YHMyDocumentsListViewController { ...@@ -101,6 +99,7 @@ extension YHMyDocumentsListViewController {
break break
} }
} }
self.headSessionView.userInfoData = self.viewModel?.mainModel?.user_info
self.canSendEmailFlag = tag self.canSendEmailFlag = tag
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "数据获取失败") YHHUD.flash(message: error?.errorMsg ?? "数据获取失败")
......
...@@ -26,6 +26,12 @@ class YHMyDocListHeaderView: UIView { ...@@ -26,6 +26,12 @@ class YHMyDocListHeaderView: UIView {
} }
} }
var userInfoData : YHMyDocumentsUserModel? {
didSet {
updateName()
}
}
var canShowDownLoadBtnFlag : Bool = false { var canShowDownLoadBtnFlag : Bool = false {
didSet { didSet {
...@@ -51,7 +57,7 @@ class YHMyDocListHeaderView: UIView { ...@@ -51,7 +57,7 @@ class YHMyDocListHeaderView: UIView {
} }
private lazy var titleLable : UILabel = { private lazy var titleLable : UILabel = {
let lable0 = UILabel(text: "您好,林先生/女士") let lable0 = UILabel(text: "您好,尊敬的客户")
lable0.textColor = UIColor.mainTextColor lable0.textColor = UIColor.mainTextColor
lable0.font = UIFont.PFSC_M(ofSize: 21) lable0.font = UIFont.PFSC_M(ofSize: 21)
return lable0 return lable0
...@@ -153,4 +159,20 @@ extension YHMyDocListHeaderView { ...@@ -153,4 +159,20 @@ extension YHMyDocListHeaderView {
hiddenButton(type:.downAll) hiddenButton(type:.downAll)
} }
} }
private func updateName() {
guard let model = userInfoData else { return }
if model.username.isEmpty {
titleLable.text = "您好,尊敬的客户"
} else {
var tmp = "您好," + model.username
if model.sex == 1 {
tmp = tmp + "先生"
} else if model.sex == 2 {
tmp = tmp + "女士"
}
titleLable.text = tmp
}
}
} }
...@@ -95,6 +95,8 @@ extension YHMySignatureListViewController { ...@@ -95,6 +95,8 @@ extension YHMySignatureListViewController {
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "数据获取失败") YHHUD.flash(message: error?.errorMsg ?? "数据获取失败")
} }
self.headSessionView.userInfoData = self.viewModel.mainModel?.user_info
self.headSessionView.canShowDownLoadBtnFlag = true self.headSessionView.canShowDownLoadBtnFlag = true
self.tableView.reloadData() self.tableView.reloadData()
}) })
......
...@@ -10,7 +10,7 @@ import UIKit ...@@ -10,7 +10,7 @@ import UIKit
class YHMySignatureListModel: YHBaseModel { class YHMySignatureListModel: YHBaseModel {
var list: [YHMySignatureModel] = [] var list: [YHMySignatureModel] = []
var user_info: YHMySignatureUserInfoModel = YHMySignatureUserInfoModel() var user_info: YHMyDocumentsUserModel = YHMyDocumentsUserModel()
} }
class YHMySignatureModel: YHBaseModel { class YHMySignatureModel: YHBaseModel {
......
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