Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp

lib/community/photo_view_gallery_screen.dart

@@ -70,7 +70,7 @@ class _PhotoViewGalleryScreenState extends State<PhotoViewGalleryScreen> {
                   ),
                   backgroundDecoration: null,
                   pageController: widget.controller,
-                  enableRotation: true,
+                  enableRotation: false,
                   onPageChanged: (index){
                     setState(() {
                       currentIndex=index;

lib/login/login_page.dart

@@ -330,7 +330,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
       print(error);
       SmartDialog.showToast("$error", alignment: Alignment.center);
     });
-    EasyLoading.show(status: S.of(context).zhengzaijiazai);
+    // EasyLoading.show(status: S.of(context).zhengzaijiazai);
     Future.delayed(Duration(seconds:2), () {
       if (value !=null && value.isSuccess) {
         saveUserJson(value.data.authInfo.toJson());
@@ -526,11 +526,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
               controller: scrollController,
               physics: PageScrollPhysics().applyTo(ClampingScrollPhysics()),
               child: SizedBox(
-                height: MediaQuery.of(context).size.height * 1.50,
+                height: MediaQuery.of(context).size.height * 1.47,
                 child: Column(
                   children: [
                     SizedBox(
-                      height: MediaQuery.of(context).size.height * 0.5980,
+                      height: MediaQuery.of(context).size.height * 0.5840,
                     ),
                     Expanded(
                       child: Container(
@@ -582,9 +582,9 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                                         ),
                                       ),
                                     ),
-                                    SizedBox(
-                                      height: 20.h,
-                                    ),
+                                    // SizedBox(
+                                    //   height: 20.h,
+                                    // ),
                                     Expanded(
                                       child: inputWidgets(),
                                       flex: 1,
@@ -706,7 +706,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             ),
           ),
           Container(
-            height:25.h,
+            height:30.h,
             width: MediaQuery.of(context).size.width - 80.h,
             // margin: EdgeInsets.only(top: 12.h),
             child: TextField(
@@ -752,7 +752,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             color: statusPhoneLineColor,
           ),
           SizedBox(
-            height: 25.h,
+            height:30.h,
             child: Visibility(
               visible: statusPhoneVisible,
               child: Text(
@@ -773,7 +773,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             ),
           ),
           Container(
-            height:25.h,
+            height:30.h,
             width: MediaQuery.of(context).size.width - 80.h,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,

lib/settlement/settlement_view/pay_method.dart

@@ -190,7 +190,7 @@ class _PayMethod extends State<PayMethod> {
     );
   }
 
-  var checkIndex = 3;
+  var checkIndex = 1;
 
   Widget checkView(var index) {
     return Container(