ios更新合并

lib/community/community_view/community_dynamic.dart

@@ -776,8 +776,8 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                 topLeft: const Radius.circular(25.0),
                 topRight: const Radius.circular(25.0))),
         child: Container(
-          width: 100.w,
-          height: 100.h,
+          width: 130.w,
+          height: 130.h,
           child: Column(
             children: [
               SizedBox(

lib/main.dart

@@ -131,8 +131,7 @@ final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin();
 
 EventBus eventBus = EventBus(sync: true);
 
-Route lastRoutePage;//记录最后一次启动的页面
-
+Route lastRoutePage;
 class MyApp extends StatelessWidget {
   final Locale appLocale;
   final bool isFirst;
@@ -188,10 +187,10 @@ class MyApp extends StatelessWidget {
             ),
             onGenerateRoute: (settings) {
               final String name = settings.name;
-              if(lastRoutePage?.settings?.name == name){//这次启动的页面是否和上一次启动的页面相同
-                if(lastRoutePage?.settings?.name == "/router/personal_page"//这次启动的是不是个人页面
-                    && lastRoutePage.navigator != null)//上一次启动的页面是否已经退出
-                  lastRoutePage.navigator.pop();//如果上一次启动的页面还没退出就主动退出上一次的页面,并接着启动这次要启动的页面
+              if(lastRoutePage?.settings?.name == name){
+                if(lastRoutePage?.settings?.name == "/router/personal_page"
+                    && lastRoutePage.navigator != null)
+                  lastRoutePage.navigator.pop();
 
               }
               final Function pageContentBuilder = routers[name];

lib/mine/recharge_page.dart

@@ -143,6 +143,7 @@ class _RechargePage extends State<RechargePage> {
         color: Color(0xFFFFFFFF),
         child: Stack(
           children: [
+            Column(children: [
               SingleChildScrollView(
                 physics: BouncingScrollPhysics(),
                 child: Container(
@@ -183,16 +184,7 @@ class _RechargePage extends State<RechargePage> {
                           //     setState(() {});
                           //   },
                           // ),
-                        Padding(
-                          padding: EdgeInsets.only(top: 26, bottom: 28),
-                          child: Text(
-                            S.of(context).chongzhi,
-                            style: TextStyle(
-                                fontSize: 28.sp,
-                                color: Color(0xFF181818),
-                                fontWeight: MyFontWeight.semi_bold),
-                          ),
-                        ),
+                          SizedBox(height:20,),
                           Row(
                             children: [
                               Expanded(
@@ -314,7 +306,8 @@ class _RechargePage extends State<RechargePage> {
                     ],
                   ),
                 ),
-            ),
+              )
+            ],),
             Align(
               alignment: Alignment.bottomCenter,
               child: GestureDetector(