From 66647636a62558c7461773085e76607e1c777a76 Mon Sep 17 00:00:00 2001
From: "2846432477@qq.com" <2846432477@qq.com>
Date: Wed, 30 Dec 2020 18:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dart_tool/package_config.json       | 382 +--------------------------
 .idea/workspace.xml                  |  79 +++---
 example/ios/Podfile                  |   4 +-
 lib/pages/login_page/login_page.dart |  20 +-
 lib/util/net_util.dart               |   2 +-
 5 files changed, 54 insertions(+), 433 deletions(-)

diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index 8cfec1a..b8807e4 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -3,941 +3,565 @@
   "packages": [
     {
       "name": "ali_auth_wbq",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/zhiying_ali_auth_wbq-f6421fe5735eab13738946da8fa7405e7aa952c6/",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_ali_auth_wbq-f6421fe5735eab13738946da8fa7405e7aa952c6/",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "archive",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "args",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.3"
     },
     {
       "name": "async",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "bloc",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "boolean_selector",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.0.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.0.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "cached_network_image",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "charcode",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "clock",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "collection",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.12",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.12",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "convert",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.17"
     },
     {
       "name": "cookie_jar",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/cookie_jar-1.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/cookie_jar-1.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.20"
     },
     {
       "name": "crypto",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "device_info",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+9",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+10",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "device_info_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "dio",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "dio_cookie_manager",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio_cookie_manager-1.0.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio_cookie_manager-1.0.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "equatable",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "ffi",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "file",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "flutter",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/packages/flutter",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "flutter_alibc",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/zhiying_flutter_alibc-ba413f84090cd58b8b769ca43ff3ef65a0e53274/",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_flutter_alibc-ba413f84090cd58b8b769ca43ff3ef65a0e53274/",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "flutter_bloc",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "flutter_cache_manager",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "flutter_native_image",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.19"
     },
     {
       "name": "flutter_screenutil",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "flutter_test",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter_test",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/packages/flutter_test",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "flutter_update_dialog",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_update_dialog-1.0.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_update_dialog-1.0.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "flutter_web_plugins",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter_web_plugins",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/packages/flutter_web_plugins",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "flutter_xupdate",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/flutter_xupdate-d17c695461ee4588dec990533d7467c11884cd0f/",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/flutter_xupdate-d17c695461ee4588dec990533d7467c11884cd0f/",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "fluttertoast",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "http",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "http_parser",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.3"
     },
     {
       "name": "image",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.12",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.12",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "imei_plugin",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/imei_plugin-1.2.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/imei_plugin-1.2.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "intl",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.5"
     },
     {
       "name": "jdsdk",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "loading_indicator",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/loading_indicator-1.2.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/loading_indicator-1.2.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "matcher",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "meta",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.12"
     },
     {
       "name": "moblink",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/moblink-5472bb698d70e336cf55febb9b0a209411466632/",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/moblink-5472bb698d70e336cf55febb9b0a209411466632/",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "mobsms",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "nested",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "package_info",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3+2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "path",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "path_provider",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.21",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.24",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "path_provider_linux",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "path_provider_macos",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+6",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "path_provider_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "path_provider_windows",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "pedantic",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.9.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.9.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "permission_handler",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/permission_handler-b8c45c4c20221ac39fe083113fc360cc632f33a4/",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/permission_handler-b8c45c4c20221ac39fe083113fc360cc632f33a4/",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "permission_handler_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler_platform_interface-2.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler_platform_interface-2.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "petitparser",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "photo_view",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "platform",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.24"
     },
     {
       "name": "plugin_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "process",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "provider",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/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.2+2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "quiver",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.1.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.1.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "rxdart",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "save_image",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_image-1.0.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_image-1.0.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "secverify",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/secverify-1.0.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/secverify-1.0.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.12+2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.12+4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences_linux",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences_macos",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+11",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences_web",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shared_preferences_windows",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.1+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.1+3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "sharesdk_plugin",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sharesdk_plugin-1.2.8",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sharesdk_plugin-1.2.8",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "shimmer",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.20"
     },
     {
       "name": "sky_engine",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/bin/cache/pkg/sky_engine",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/bin/cache/pkg/sky_engine",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.11"
     },
     {
       "name": "source_span",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.7.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.7.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
     {
       "name": "sqflite",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "sqflite_common",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "stack_trace",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.23"
     },
     {
       "name": "stream_channel",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "string_scanner",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "synchronized",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0+2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0+2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.8"
     },
     {
       "name": "term_glyph",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "1.8"
     },
     {
       "name": "test_api",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.15",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.15",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.4"
     },
     {
       "name": "typed_data",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "url_launcher",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.5",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.6",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "url_launcher_linux",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+4",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "url_launcher_macos",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+8",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+9",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "url_launcher_platform_interface",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "url_launcher_web",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.4+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.4+1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "url_launcher_windows",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
     {
       "name": "uuid",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.2"
     },
     {
       "name": "vector_math",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
     {
       "name": "webview_flutter",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.24",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.24",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "win32",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.7"
     },
     {
       "name": "xdg_directories",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.3"
     },
     {
       "name": "xml",
-<<<<<<< HEAD
       "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.6.1",
-=======
-      "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.6.1",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
       "packageUri": "lib/",
       "languageVersion": "2.6"
     },
@@ -948,11 +572,7 @@
       "languageVersion": "2.1"
     }
   ],
-<<<<<<< HEAD
-  "generated": "2020-12-28T09:15:45.435839Z",
-=======
-  "generated": "2020-12-24T06:05:35.262664Z",
->>>>>>> b73efa519b2426758192373724065549c7515bcb
+  "generated": "2020-12-30T06:36:50.693878Z",
   "generator": "pub",
   "generatorVersion": "2.8.2"
 }
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99f01c8..6b7997c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,32 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0ff6f366-28dc-4efd-9bca-709f40bc6813" name="Default Changelist" comment="1、添加QQ登录">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/pubspec.lock" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/pubspec.lock" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.dart_tool/package_config.json" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/package_config.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/gradlew.bat" beforeDir="false" afterPath="$PROJECT_DIR$/android/gradlew.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/app/src/main/java/cn/zhios/zhiying_comm_example/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/src/main/java/cn/zhios/zhiying_comm_example/MainActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.dart_tool/package_config.json" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.dart_tool/package_config.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/android/gradlew.bat" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/android/gradlew.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/android/app/src/main/java/cn/zhios/zhiying_comm_example/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/android/app/src/main/java/cn/zhios/zhiying_comm_example/MainActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Runner.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Runner.xcodeproj/project.pbxproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/mob_util/mob_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/mob_util/mob_util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/login_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/login_page.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/pubspec.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/Podfile" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Podfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Podfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Podfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/util/mob_util/mob_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/mob_util/mob_util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/login_page/login_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/login_page/login_page.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/net_util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,7 +31,6 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="ProjectId" id="1h581KsASjn69CjCVJFGwinHkAq" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -508,50 +491,50 @@
     <state x="165" y="123" width="1701" height="885" key="DiffContextDialog/64.23.1856.1057@64.23.1856.1057" timestamp="1606552855251" />
     <state x="167" y="123" width="1483" height="845" key="DiffContextDialog/66.23.1854.1057@66.23.1854.1057" timestamp="1605671872845" />
     <state x="168" y="123" width="1482" height="845" key="DiffContextDialog/67.23.1853.1057@67.23.1853.1057" timestamp="1605853440851" />
-    <state width="1522" height="174" key="GridCell.Tab.0.bottom" timestamp="1609147114094">
-      <screen x="69" y="23" width="1851" height="1057" />
+    <state width="1522" height="173" key="GridCell.Tab.0.bottom" timestamp="1609319560877">
+      <screen x="64" y="23" width="1856" height="1057" />
     </state>
     <state width="1811" height="598" key="GridCell.Tab.0.bottom/54.23.1866.1057@54.23.1866.1057" timestamp="1608099533068" />
-    <state width="1811" height="598" key="GridCell.Tab.0.bottom/56.23.1864.1057@56.23.1864.1057" timestamp="1608111473353" />
+    <state width="1522" height="173" key="GridCell.Tab.0.bottom/56.23.1864.1057@56.23.1864.1057" timestamp="1609310208672" />
     <state width="1821" height="347" key="GridCell.Tab.0.bottom/57.23.1863.1057@57.23.1863.1057" timestamp="1602847629022" />
     <state width="1817" height="617" key="GridCell.Tab.0.bottom/61.23.1859.1057@61.23.1859.1057" timestamp="1608867250691" />
-    <state width="1522" height="125" key="GridCell.Tab.0.bottom/64.23.1856.1057@64.23.1856.1057" timestamp="1609142497791" />
+    <state width="1522" height="173" key="GridCell.Tab.0.bottom/64.23.1856.1057@64.23.1856.1057" timestamp="1609319560877" />
     <state width="1522" height="249" key="GridCell.Tab.0.bottom/66.23.1854.1057@66.23.1854.1057" timestamp="1609143128752" />
     <state width="1811" height="511" key="GridCell.Tab.0.bottom/67.23.1853.1057@67.23.1853.1057" timestamp="1605850706538" />
     <state width="1522" height="174" key="GridCell.Tab.0.bottom/69.23.1851.1057@69.23.1851.1057" timestamp="1609147114094" />
     <state width="1503" height="296" key="GridCell.Tab.0.bottom/76.23.1844.1057@76.23.1844.1057" timestamp="1609120442594" />
-    <state width="1522" height="174" key="GridCell.Tab.0.center" timestamp="1609147114094">
-      <screen x="69" y="23" width="1851" height="1057" />
+    <state width="1522" height="173" key="GridCell.Tab.0.center" timestamp="1609319560877">
+      <screen x="64" y="23" width="1856" height="1057" />
     </state>
     <state width="1811" height="598" key="GridCell.Tab.0.center/54.23.1866.1057@54.23.1866.1057" timestamp="1608099533068" />
-    <state width="1811" height="598" key="GridCell.Tab.0.center/56.23.1864.1057@56.23.1864.1057" timestamp="1608111473352" />
+    <state width="1522" height="173" key="GridCell.Tab.0.center/56.23.1864.1057@56.23.1864.1057" timestamp="1609310208671" />
     <state width="1821" height="347" key="GridCell.Tab.0.center/57.23.1863.1057@57.23.1863.1057" timestamp="1602847629022" />
     <state width="1817" height="617" key="GridCell.Tab.0.center/61.23.1859.1057@61.23.1859.1057" timestamp="1608867250690" />
-    <state width="1522" height="125" key="GridCell.Tab.0.center/64.23.1856.1057@64.23.1856.1057" timestamp="1609142497790" />
+    <state width="1522" height="173" key="GridCell.Tab.0.center/64.23.1856.1057@64.23.1856.1057" timestamp="1609319560877" />
     <state width="1522" height="249" key="GridCell.Tab.0.center/66.23.1854.1057@66.23.1854.1057" timestamp="1609143128752" />
     <state width="1811" height="511" key="GridCell.Tab.0.center/67.23.1853.1057@67.23.1853.1057" timestamp="1605850706538" />
     <state width="1522" height="174" key="GridCell.Tab.0.center/69.23.1851.1057@69.23.1851.1057" timestamp="1609147114094" />
     <state width="1503" height="296" key="GridCell.Tab.0.center/76.23.1844.1057@76.23.1844.1057" timestamp="1609120442593" />
-    <state width="1522" height="174" key="GridCell.Tab.0.left" timestamp="1609147114094">
-      <screen x="69" y="23" width="1851" height="1057" />
+    <state width="1522" height="173" key="GridCell.Tab.0.left" timestamp="1609319560877">
+      <screen x="64" y="23" width="1856" height="1057" />
     </state>
     <state width="1811" height="598" key="GridCell.Tab.0.left/54.23.1866.1057@54.23.1866.1057" timestamp="1608099533068" />
-    <state width="1811" height="598" key="GridCell.Tab.0.left/56.23.1864.1057@56.23.1864.1057" timestamp="1608111473352" />
+    <state width="1522" height="173" key="GridCell.Tab.0.left/56.23.1864.1057@56.23.1864.1057" timestamp="1609310208670" />
     <state width="1821" height="347" key="GridCell.Tab.0.left/57.23.1863.1057@57.23.1863.1057" timestamp="1602847629022" />
     <state width="1817" height="617" key="GridCell.Tab.0.left/61.23.1859.1057@61.23.1859.1057" timestamp="1608867250690" />
-    <state width="1522" height="125" key="GridCell.Tab.0.left/64.23.1856.1057@64.23.1856.1057" timestamp="1609142497790" />
+    <state width="1522" height="173" key="GridCell.Tab.0.left/64.23.1856.1057@64.23.1856.1057" timestamp="1609319560877" />
     <state width="1522" height="249" key="GridCell.Tab.0.left/66.23.1854.1057@66.23.1854.1057" timestamp="1609143128752" />
     <state width="1811" height="511" key="GridCell.Tab.0.left/67.23.1853.1057@67.23.1853.1057" timestamp="1605850706538" />
     <state width="1522" height="174" key="GridCell.Tab.0.left/69.23.1851.1057@69.23.1851.1057" timestamp="1609147114094" />
     <state width="1503" height="296" key="GridCell.Tab.0.left/76.23.1844.1057@76.23.1844.1057" timestamp="1609120442593" />
-    <state width="1522" height="174" key="GridCell.Tab.0.right" timestamp="1609147114094">
-      <screen x="69" y="23" width="1851" height="1057" />
+    <state width="1522" height="173" key="GridCell.Tab.0.right" timestamp="1609319560877">
+      <screen x="64" y="23" width="1856" height="1057" />
     </state>
     <state width="1811" height="598" key="GridCell.Tab.0.right/54.23.1866.1057@54.23.1866.1057" timestamp="1608099533068" />
-    <state width="1811" height="598" key="GridCell.Tab.0.right/56.23.1864.1057@56.23.1864.1057" timestamp="1608111473352" />
+    <state width="1522" height="173" key="GridCell.Tab.0.right/56.23.1864.1057@56.23.1864.1057" timestamp="1609310208672" />
     <state width="1821" height="347" key="GridCell.Tab.0.right/57.23.1863.1057@57.23.1863.1057" timestamp="1602847629022" />
     <state width="1817" height="617" key="GridCell.Tab.0.right/61.23.1859.1057@61.23.1859.1057" timestamp="1608867250690" />
-    <state width="1522" height="125" key="GridCell.Tab.0.right/64.23.1856.1057@64.23.1856.1057" timestamp="1609142497790" />
+    <state width="1522" height="173" key="GridCell.Tab.0.right/64.23.1856.1057@64.23.1856.1057" timestamp="1609319560877" />
     <state width="1522" height="249" key="GridCell.Tab.0.right/66.23.1854.1057@66.23.1854.1057" timestamp="1609143128752" />
     <state width="1811" height="511" key="GridCell.Tab.0.right/67.23.1853.1057@67.23.1853.1057" timestamp="1605850706538" />
     <state width="1522" height="174" key="GridCell.Tab.0.right/69.23.1851.1057@69.23.1851.1057" timestamp="1609147114094" />
@@ -559,7 +542,6 @@
     <state x="250" y="118" key="MergeDialog" timestamp="1605598375345">
       <screen x="64" y="23" width="1856" height="1057" />
     </state>
-    <state x="244" y="118" key="MergeDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600655679348" />
     <state x="250" y="118" key="MergeDialog/64.23.1856.1057@64.23.1856.1057" timestamp="1605598375345" />
     <state x="253" y="118" key="MergeDialog/67.23.1853.1057@67.23.1853.1057" timestamp="1605167922857" />
     <state x="707" y="274" key="MultipleFileMergeDialog" timestamp="1606382301282">
@@ -610,20 +592,23 @@
       <screen x="61" y="23" width="1859" height="1057" />
     </state>
     <state x="535" y="294" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/61.23.1859.1057@61.23.1859.1057" timestamp="1608813030553" />
-    <state x="671" y="308" width="939" height="518" key="find.popup" timestamp="1609234534563">
-      <screen x="80" y="23" width="1840" height="1057" />
+    <state x="662" y="308" width="946" height="518" key="find.popup" timestamp="1609323749753">
+      <screen x="66" y="23" width="1854" height="1057" />
     </state>
-    <state x="654" y="308" width="952" height="486" key="find.popup/54.23.1866.1057@54.23.1866.1057" timestamp="1606202479423" />
-    <state x="655" y="308" width="951" height="486" key="find.popup/56.23.1864.1057@56.23.1864.1057" timestamp="1608083126125" />
+    <state x="199" y="457" width="955" height="548" key="find.popup/49.23.1871.1057@49.23.1871.1057" timestamp="1609315191575" />
+    <state x="654" y="308" width="952" height="490" key="find.popup/54.23.1866.1057@54.23.1866.1057" timestamp="1609298158956" />
+    <state x="205" y="457" width="951" height="548" key="find.popup/56.23.1864.1057@56.23.1864.1057" timestamp="1609312469166" />
     <state x="656" y="308" width="950" height="486" key="find.popup/57.23.1863.1057@57.23.1863.1057" timestamp="1602831360271" />
-    <state x="659" y="308" width="948" height="486" key="find.popup/61.23.1859.1057@61.23.1859.1057" timestamp="1608702402073" />
+    <state x="659" y="308" width="1028" height="490" key="find.popup/61.23.1859.1057@61.23.1859.1057" timestamp="1609308448962" />
     <state x="661" y="308" width="947" height="486" key="find.popup/64.23.1856.1057@64.23.1856.1057" timestamp="1606541582820" />
-    <state x="662" y="308" width="946" height="518" key="find.popup/66.23.1854.1057@66.23.1854.1057" timestamp="1609141165193" />
+    <state x="662" y="308" width="946" height="518" key="find.popup/66.23.1854.1057@66.23.1854.1057" timestamp="1609323749753" />
     <state x="663" y="308" width="946" height="486" key="find.popup/67.23.1853.1057@67.23.1853.1057" timestamp="1605837561100" />
-    <state x="671" y="308" width="939" height="518" key="find.popup/80.23.1840.1057@80.23.1840.1057" timestamp="1609234534563" />
-    <state x="658" y="258" width="670" height="676" key="search.everywhere.popup" timestamp="1605145425967">
-      <screen x="66" y="23" width="1854" height="1057" />
+    <state x="671" y="308" width="939" height="518" key="find.popup/80.23.1840.1057@80.23.1840.1057" timestamp="1609235735093" />
+    <state x="651" y="258" width="675" height="676" key="search.everywhere.popup" timestamp="1609310547512">
+      <screen x="56" y="23" width="1864" height="1057" />
     </state>
+    <state x="650" y="258" width="675" height="676" key="search.everywhere.popup/54.23.1866.1057@54.23.1866.1057" timestamp="1609298166238" />
+    <state x="651" y="258" width="675" height="676" key="search.everywhere.popup/56.23.1864.1057@56.23.1864.1057" timestamp="1609310547512" />
     <state x="658" y="258" width="670" height="676" key="search.everywhere.popup/66.23.1854.1057@66.23.1854.1057" timestamp="1605145425967" />
   </component>
   <component name="XDebuggerManager">
diff --git a/example/ios/Podfile b/example/ios/Podfile
index 7c53cc1..3f10ebc 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -2,8 +2,8 @@
 platform :ios, '9.0'
 
 source 'http://repo.baichuan-ios.taobao.com/baichuanSDK/AliBCSpecs.git'
-source 'https://github.com/CocoaPods/Specs.git'
-#source 'https://cdn.cocoapods.org/'
+#source 'https://github.com/CocoaPods/Specs.git'
+source 'https://cdn.cocoapods.org/'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/lib/pages/login_page/login_page.dart b/lib/pages/login_page/login_page.dart
index 2de880b..f34eacd 100644
--- a/lib/pages/login_page/login_page.dart
+++ b/lib/pages/login_page/login_page.dart
@@ -104,8 +104,24 @@ class _LoginPageContainerState extends State<LoginPageContainer> {
         Logger.log('state = ${state?.toString()}, userInfo = ${userdata?.toString()}');
         if (state == SSDKResponseState.Success) {
           try {
-            _wxUserData = jsonDecode(userdata['dbInfo']);
-            BlocProvider.of<LoginBloc>(context).add(LoginThirdWeChatEvent(model: userdata));
+            if(Platform.isIOS){
+              Map credentialDic=userdata['credential'];
+              Map rawDatalDic=userdata['rawData'];
+              var name=userdata['nickname'];
+              var gender=userdata['gender'];
+              var icon=userdata['icon'];
+              var userID=userdata['uid'];
+              var unionid=rawDatalDic['unionid'];
+              var token=credentialDic['token'];
+              Map dbInfoDic={'nickname':name,'gender':gender,'icon':icon,'userID':userID,'unionid':unionid,'token':token,};
+              Map tempUserData = {'dbInfo':jsonEncode(dbInfoDic)};
+              _wxUserData = jsonDecode(tempUserData['dbInfo']);
+              BlocProvider.of<LoginBloc>(context).add(LoginThirdWeChatEvent(model: tempUserData));
+            }else if(Platform.isAndroid){
+              _wxUserData = jsonDecode(userdata['dbInfo']);
+              BlocProvider.of<LoginBloc>(context).add(LoginThirdWeChatEvent(model: userdata));
+            }
+
             Loading.dismiss();
           } catch (e) {
             Fluttertoast.showToast(msg: '登录失败');
diff --git a/lib/util/net_util.dart b/lib/util/net_util.dart
index b442b07..deea733 100644
--- a/lib/util/net_util.dart
+++ b/lib/util/net_util.dart
@@ -55,7 +55,7 @@ class NetUtil {
     if (_dio == null) {
       var setting = await NativeUtil.getSetting();
       String domain = setting['domain']; //'http://www.hairuyi.com/';
-      _config(domain, proxyUrl: '192.168.0.66:8866');// 192.168.0.66:8866
+      _config(domain, proxyUrl: '');// 192.168.0.66:8866
     }
     return _dio;
   }