1.优化登录页面

.dart_tool/package_config.json

@@ -135,7 +135,7 @@
     },
     {
       "name": "flutter_alibc",
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_flutter_alibc-f0974bf1ee4e647c00f749707017841dc3685436/",
+      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_flutter_alibc-159f123705b3e3dc28d6991df5b39b24a54c41a0/",
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
@@ -351,7 +351,7 @@
     },
     {
       "name": "provider",
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.3.2+2",
+      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.3.3",
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
@@ -566,7 +566,7 @@
       "languageVersion": "2.1"
     }
   ],
-  "generated": "2021-03-17T10:33:04.688615Z",
+  "generated": "2021-03-22T01:44:09.769099Z",
   "generator": "pub",
   "generatorVersion": "2.10.1"
 }

lib/pages/login_page/login_page.dart

@@ -53,6 +53,7 @@ class _LoginPageContainerState extends State<LoginPageContainer> {
   var _wxUserData;
   String _appleData;
   bool checkBool = false;
+  LoginStyleModel loginStyleModel;
 
   @override
   void initState() {
@@ -97,7 +98,9 @@ class _LoginPageContainerState extends State<LoginPageContainer> {
     if ('mobile' == type) {
       if (model?.flashLoginEnable == '1') {
         // mob 一键登录
-        MobUtil.openQuickLoginPage(context, model?.quick);
+       // MobUtil.openQuickLoginPage(context, model?.quick);
+        Navigator.push(context, CupertinoPageRoute(builder: (_) => LoginAccountPage(null)));
+
       } else {
         Navigator.push(context, CupertinoPageRoute(builder: (_) => LoginAccountPage(null)));
       }
@@ -442,6 +445,10 @@ class _LoginPageContainerState extends State<LoginPageContainer> {
       padding: const EdgeInsets.symmetric(horizontal: 27.5),
       child: Column(
         children: model.main.importanceLogin.map((item) {
+          if(item?.type=="mobile"){
+            item?.btnText="密码登录";
+            loginStyleModel=model;
+          }
           return Padding(
             padding: const EdgeInsets.only(bottom: 8),
             child: _customButton(
@@ -576,18 +583,19 @@ class _LoginPageContainerState extends State<LoginPageContainer> {
     );
   }
 
-  ///账号密码登录
+  ///账号密码登录 update：与手机一键登录互换
   _buildOrderLogin() {
     return Center(
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
           if (isCheck()) {
-            Navigator.push(context, CupertinoPageRoute(builder: (_) => LoginAccountPage(null)));
+            //Navigator.push(context, CupertinoPageRoute(builder: (_) => LoginAccountPage(null)));
+            MobUtil.openQuickLoginPage(context, loginStyleModel?.quick);
           }
         },
         child: Text(
-          "使用账号密码登录",
+          "本机号码登录",
           style: TextStyle(color: HexColor.fromHex("#FFFF4242"), fontSize: 14),
         ),
       ),

pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   dio: ^3.0.9
-  provider: ^4.0.0
+  provider: ^4.3.3
   package_info: ^0.4.0+17
   device_info: ^0.4.0+1
   flutter_native_image: ^0.0.5
@@ -42,7 +42,7 @@ dependencies:
   flutter_alibc:
 #    path: ../zhiying_flutter_alibc
     git:
-      ref: 0.0.5
+      ref: 0.0.6
       url: http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_flutter_alibc.git
   url_launcher: ^5.6.0
   #图片预览控件