evan 4 年之前
父節點
當前提交
07b386285d
共有 4 個文件被更改,包括 44 次插入39 次删除
  1. 6 6
      ios/Runner.xcodeproj/project.pbxproj
  2. 2 0
      ios/Runner/RunnerProfile.entitlements
  3. 33 30
      lib/paegs/root_page/root_page.dart
  4. 3 3
      pubspec.lock

+ 6 - 6
ios/Runner.xcodeproj/project.pbxproj

@@ -375,7 +375,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -391,7 +391,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.98;
+				MARKETING_VERSION = 1.1.02;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -514,7 +514,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.98;
+				MARKETING_VERSION = 1.1.02;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -547,7 +547,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.98;
+				MARKETING_VERSION = 1.1.02;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

+ 2 - 0
ios/Runner/RunnerProfile.entitlements

@@ -4,5 +4,7 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array/>
 </dict>
 </plist>

+ 33 - 30
lib/paegs/root_page/root_page.dart

@@ -121,37 +121,40 @@ class _RootPageState extends State<RootPage> {
               Positioned(
                 bottom: 60,
                 right: 0,
-                child: GestureDetector(
-                  onTap: (){
-                    MyTools().toPage(context, OrderPage(index: 2,), (then) {
-                      queryPersonalInformation();
-                    });
-                  },
-                  behavior: HitTestBehavior.translucent,
-                  child: Container(
-                    height: 44,
-                    width: 100,
-                    padding: EdgeInsets.symmetric(horizontal: 10),
-                    child: Row(
-                      children: [
-                        SvgPicture.asset(
-                          'images/svg/订单.svg',
-                          color: Colors.white,
-                          height: 15,
-                          width: 15,
+                child: SafeArea(
+                  top: false,
+                  child: GestureDetector(
+                    onTap: (){
+                      MyTools().toPage(context, OrderPage(index: 2,), (then) {
+                        queryPersonalInformation();
+                      });
+                    },
+                    behavior: HitTestBehavior.translucent,
+                    child: Container(
+                      height: 44,
+                      width: 100,
+                      padding: EdgeInsets.symmetric(horizontal: 10),
+                      child: Row(
+                        children: [
+                          SvgPicture.asset(
+                            'images/svg/订单.svg',
+                            color: Colors.white,
+                            height: 15,
+                            width: 15,
+                          ),
+                          Text(
+                            '未付订单',
+                            style: TextStyle(color: Colors.white, fontSize: 14),
+                          )
+                        ],
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      ),
+                      decoration: BoxDecoration(
+                        color: Colors.amber,
+                        borderRadius: BorderRadius.only(
+                          topLeft: Radius.circular(22),
+                          bottomLeft: Radius.circular(22),
                         ),
-                        Text(
-                          '未付订单',
-                          style: TextStyle(color: Colors.white, fontSize: 14),
-                        )
-                      ],
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    ),
-                    decoration: BoxDecoration(
-                      color: Colors.amber,
-                      borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(22),
-                        bottomLeft: Radius.circular(22),
                       ),
                     ),
                   ),

+ 3 - 3
pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.6.1"
+    version: "2.5.0"
   audioplayers:
     dependency: "direct main"
     description:
@@ -732,7 +732,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   sp_util:
     dependency: transitive
     description:
@@ -795,7 +795,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19"
   timezone:
     dependency: transitive
     description: