Browse Source

Merge branch 'v1.0.0_ios' of http://git.atmob.com:28999/Atmob-Flutter/AiKeyboard2025 into v1.0.0_ios

# Conflicts:
#	ios/AiKeyboard/Info.plist
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/data/api/atmob_api.dart
#	lib/data/api/atmob_api.g.dart
#	lib/di/get_it.config.dart
#	lib/module/main/main_page.dart
#	lib/module/store/new_discount/new_discount_controller.dart
#	lib/router/app_pages.dart
Destiny 6 months ago
parent
commit
f7b4c9ed7d
2 changed files with 33 additions and 7 deletions
  1. 0 7
      ios/Podfile
  2. 33 0
      lib/module/store/store_page.dart

+ 0 - 7
ios/Podfile

@@ -134,11 +134,4 @@ post_install do |installer|
          end
     end
   end
-  installer.generated_projects.each do |project|
-    project.targets.each do |target|
-        target.build_configurations.each do |config|
-            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
-         end
-    end
-  end
 end

+ 33 - 0
lib/module/store/store_page.dart

@@ -1068,6 +1068,39 @@ class StorePage extends BasePage<StoreController> {
     );
   }
 
+  /// 恢复订阅
+  Widget _buildRecoverSubscribe() {
+    return Container(
+      margin: EdgeInsets.only(left: 16.w, top: 8.h, right: 16.w),
+      child: Row(
+        children: [
+          Text(
+            "⚠️  订阅未生效?点此试试",
+            style: TextStyle(
+              color: Color(0xFF666355),
+              fontSize: 13.sp,
+              fontWeight: FontWeight.w400,
+            ),
+          ),
+          GestureDetector(
+            onTap: () {
+              // 恢复订阅
+              controller.clickRecoverSubscribe();
+            },
+            child: Text(
+              "  恢复订阅>",
+              style: TextStyle(
+                color: Color(0xFF479DF7),
+                fontSize: 13.sp,
+                fontWeight: FontWeight.w400,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   Widget _buildBuyButtonCard() {
     return Container(
       width: 360.w,