Browse Source

3.6.15(3)更改 购买会员周 cell 的样式

100Years 1 tháng trước cách đây
mục cha
commit
ad1f424bf5

+ 2 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -2544,7 +2544,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2583,7 +2583,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

+ 14 - 8
AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -448,17 +448,23 @@ struct PurchaseItemView: View {
                 //左边加个
                 VStack(alignment: .leading, spacing: 14) {
                     Text(title).font(.font(size: 14)).foregroundColor(UIColor.white.color)
-                    Text(PurchaseManager.default.price(for: type) ?? "--").font(.font(size: 18,weight: .medium)).foregroundColor(UIColor.mainText.color)
+                    
+                    HStack {
+                        Text(PurchaseManager.default.price(for: type) ?? "--").font(.font(size: 18,weight: .medium)).foregroundColor(UIColor.mainText.color)
+                        if type == .month {
+                            Text(" (≈\(PurchaseManager.default.averageWeekly(for:type) ?? "--")/\("Per week".localized))").font(.font(size: 12,weight: .medium)).foregroundColor(UIColor.mainText.withAlphaComponent(0.6).color)
+                        }
+                    }
                 }
 
                 Spacer()
-                
-                //右边每周的💰
-                VStack(alignment: .trailing, spacing: 2) {
-                    Text("\(PurchaseManager.default.averageWeekly(for:type) ?? "--")")
-                    Text("Per week".localized)
-             
-                }.font(.font(size: 16,weight: .regular)).foregroundColor(Color.white.opacity(0.6))
+//                
+//                //右边每周的💰
+//                VStack(alignment: .trailing, spacing: 2) {
+//                    Text("\(PurchaseManager.default.averageWeekly(for:type) ?? "--")")
+//                    Text("Per week".localized)
+//             
+//                }.font(.font(size: 16,weight: .regular)).foregroundColor(Color.white.opacity(0.6))
 
             }.padding(.horizontal)
         }

+ 1 - 1
AIEmoji/Business/TSTextGeneralPictureVC/TSTTPInputVC/View/TSTitleView.swift

@@ -105,7 +105,7 @@ class TSTitleMoreView: TSTitleView {
         super.creatUI()
 
         let shimmerView = FBShimmeringView()
-        shimmerView.contentView = moreView // 可以是 UILabel、UIView 等
+        shimmerView.contentView = moreView
         shimmerView.shimmeringSpeed = 150
         contentView.addSubview(shimmerView)
         shimmerView.snp.makeConstraints { make in

+ 2 - 2
AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -35,7 +35,7 @@ public enum PremiumPeriod: String, CaseIterable {
     var saveString: String {
         switch self {
         case .none:
-            return "30%"
+            return "40%"
         default:
             return "80%"
         }
@@ -215,7 +215,7 @@ public class PurchaseManager: NSObject {
 
     public var vipType: PremiumPeriod {
 //#if DEBUG
-//        return PremiumPeriod.week
+//        return PremiumPeriod.none
 //#endif
         guard isVip, let type = vipInformation["type"] as? String else {
             return .none