Destiny пре 5 месеци
родитељ
комит
566bd5fcdc

+ 4 - 4
QuickSearchLocation.xcodeproj/project.pbxproj

@@ -1234,7 +1234,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = Q364C8K9BL;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1258,7 +1258,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manbu.shouji;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1278,7 +1278,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = Q364C8K9BL;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1302,7 +1302,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manbu.shouji;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 42 - 42
QuickSearchLocation/Classes/Pages/QSLVip/Controller/QSLVipController.swift

@@ -229,27 +229,27 @@ class QSLVipController: QSLBaseController {
         
         attr.append(serviceText)
         
-        attr.append(blankAttr)
-        
-        let andAttr = NSMutableAttributedString(string: "和")
-        andAttr.font(10)
-        andAttr.color(.hexStringColor(hexString: "#A7A7A7"))
-        attr.append(andAttr)
-        
-        attr.append(blankAttr)
-        
-        let subcribeHL = YYTextHighlight()
-        var subcribeStr = "《续订说明》"
-
-        let subcribeText = NSMutableAttributedString(string: subcribeStr)
-        subcribeText.font(10)
-        subcribeText.color(.hexStringColor(hexString: "#E7B983"))
-        subcribeText.yy_setTextHighlight(subcribeHL, range: NSRange(location: 0, length: subcribeStr.count))
-        subcribeHL.tapAction = { [weak self] containerView, text, range, rect in
-            self?.subscibeAction()
-        }
+//        attr.append(blankAttr)
+//        
+//        let andAttr = NSMutableAttributedString(string: "和")
+//        andAttr.font(10)
+//        andAttr.color(.hexStringColor(hexString: "#A7A7A7"))
+//        attr.append(andAttr)
+//        
+//        attr.append(blankAttr)
         
-        attr.append(subcribeText)
+//        let subcribeHL = YYTextHighlight()
+//        var subcribeStr = "《续订说明》"
+//
+//        let subcribeText = NSMutableAttributedString(string: subcribeStr)
+//        subcribeText.font(10)
+//        subcribeText.color(.hexStringColor(hexString: "#E7B983"))
+//        subcribeText.yy_setTextHighlight(subcribeHL, range: NSRange(location: 0, length: subcribeStr.count))
+//        subcribeHL.tapAction = { [weak self] containerView, text, range, rect in
+//            self?.subscibeAction()
+//        }
+//        
+//        attr.append(subcribeText)
 
         label.attributedText = attr
         
@@ -300,16 +300,16 @@ class QSLVipController: QSLBaseController {
         return label
     }()
     
-    lazy var tipContentLabel: UILabel = {
-       
-        let label = UILabel()
-        label.numberOfLines = 0
-        label.text("1 订阅后会从您的iTunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。\n2 未成年人请在监护者的陪同下进行购买\n3 购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《续订说明》")
-        label.font(10)
-        label.textColor = .hexStringColor(hexString: "#000000").withAlphaComponent(0.6)
-        label.changeLineSpace(space: 5)
-        return label
-    }()
+//    lazy var tipContentLabel: UILabel = {
+//       
+//        let label = UILabel()
+//        label.numberOfLines = 0
+//        label.text("1 订阅后会从您的iTunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。\n2 未成年人请在监护者的陪同下进行购买\n3 购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《续订说明》")
+//        label.font(10)
+//        label.textColor = .hexStringColor(hexString: "#000000").withAlphaComponent(0.6)
+//        label.changeLineSpace(space: 5)
+//        return label
+//    }()
     
     lazy var bottomView: UIView = {
        
@@ -948,23 +948,23 @@ extension QSLVipController {
             make.height.equalTo(commentHeight3)
         }
         
-        commentView.addSubview(tipTitleLabel)
-        commentView.addSubview(tipContentLabel)
-        tipTitleLabel.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.top.equalTo(comment3.snp.bottom).offset(28)
-        }
+//        commentView.addSubview(tipTitleLabel)
+//        commentView.addSubview(tipContentLabel)
+//        tipTitleLabel.snp.makeConstraints { make in
+//            make.left.equalTo(16)
+//            make.top.equalTo(comment3.snp.bottom).offset(28)
+//        }
         
-        tipContentLabel.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
-            make.top.equalTo(tipTitleLabel.snp.bottom).offset(11)
-        }
+//        tipContentLabel.snp.makeConstraints { make in
+//            make.left.equalTo(16)
+//            make.right.equalTo(-16)
+//            make.top.equalTo(tipTitleLabel.snp.bottom).offset(11)
+//        }
         
         commentView.addSubview(serviceLabel)
         serviceLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
-            make.top.equalTo(tipContentLabel.snp.bottom).offset(5.rpx)
+            make.top.equalTo(comment3.snp.bottom).offset(28.rpx)
         }
         
         scrollView.snp.makeConstraints { make in