Merge commit '77f4450f' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -63,7 +63,7 @@ class YHFileListViewController: YHBaseViewController {
     private lazy var footLable : UILabel = {
         
         let footLable = UILabel()
-        footLable.text = "*感谢您对银河移民的信赖，以上信息均用于香港优才签证申 请银河移民承诺对您所提供的信息将绝对保密"
+        footLable.text = "*感谢您对银河移民的信赖，以上信息均用于香港优才签证申请，银河移民承诺对您所提供的信息将绝对保密"
         footLable.textColor = .white
         footLable.textAlignment = .center
         footLable.font = UIFont.PFSC_R(ofSize: 12)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -81,7 +81,7 @@ class YHCertificateViewModel: YHBaseViewModel {
                 let tmpModel = YHFileListModel()
                 tmpModel.ApplicantName = "温馨提示"
                 tmpModel.type = 1
-                tmpModel.arrTxt = ["1.以上资料请提供清晰完整的彩色扫描件。","2.照片最好同时提供电子档及时通知我们以避免对申请结果产生影响。","3.申请递交之后，如目前所报备的情况有任何变化（包含婚姻状况、新生子女、工作情况、亲属关系变化，请及时通知我们以避免对申请结果产生影响。"]
+                tmpModel.arrTxt = ["1.以上资料请提供清晰完整的彩色扫描件。","2.照片最好同时提供电子档及时通知我们以避免对申请结果产生影响。","3.申请递交之后，如目前所报备的情况有任何变化（包含婚姻状况、新生子女、工作情况、亲属关系变化），请及时通知我们以避免对申请结果产生影响。"]
                 arr.append(tmpModel)
                 self.arrFileListData = arr
                 

galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift

@@ -29,7 +29,7 @@ class YHWholeScreenTipsView: UIView {
     
     lazy var blackMaskView: UIView = {
         let view = UIView()
-        view.backgroundColor = UIColor(hex: 0x000000, alpha: 0.1)
+        view.backgroundColor = .clear
         let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
         view.addGestureRecognizer(tap)
         return view
@@ -112,9 +112,14 @@ class YHWholeScreenTipsView: UIView {
             make.edges.equalTo(0)
         }
         let rrrrr = targetView.convert(targetView.bounds, to: UIApplication.shared.yhKeyWindow())
-        let left = rrrrr.origin.x
+        var left = rrrrr.origin.x
         let top = rrrrr.origin.y + targetView.height + 5
         
+        let offset = left + 214 - KScreenWidth
+        if offset > 0 {
+            left = left - offset - 16
+        }
+        
         whiteContentView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(left)
             make.top.equalToSuperview().offset(top)