Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

# Conflicts:
#	lib/ui/login/login_page.dart

lib/ui/loading.dart

@@ -19,7 +19,6 @@ class Loading extends StatefulWidget {
 }
 
 class _LoadingState extends State<Loading> {
-
   Future initialAll() async {
     await HiveStore.init();
   }
@@ -32,7 +31,10 @@ class _LoadingState extends State<Loading> {
     if (kDebugMode) {
       print('env :$env');
     }
-    DevEV.instance.setEnvironment( context, environment: env == 'dev',);
+    DevEV.instance.setEnvironment(
+      context,
+      environment: env == 'dev',
+    );
     Future.delayed(const Duration(milliseconds: 1000), () async {
       await initialAll();
       if (!await userProvider.init()) {
@@ -51,16 +53,16 @@ class _LoadingState extends State<Loading> {
     //启动图片
     return Scaffold(
       backgroundColor: Colors.white,
-      body:Stack(
+      body: Stack(
         children: [
           Positioned(
             bottom: 158.w,
             left: 143.w,
-            child: Image.asset(
-                Assets.images.start.path,width:434.sp,height:148.sp , fit: BoxFit.fill),),
+            child: Image.asset(Assets.images.start.path,
+                width: 434.sp, height: 148.sp, fit: BoxFit.fill),
+          ),
         ],
-      ));
-
-
-  }}
-
+      ),
+    );
+  }
+}

lib/ui/login/login_page.dart

@@ -142,10 +142,7 @@ class _LoginPageState extends State<LoginPage> {
                     'code': _smsCodeController.text
                   });
                   if (base.code == 0) {
-                    print("123123${base.data['token']}");
                     await UserTool.userProvider.setToken(base.data['token']);
-                    // print(a);
-                    // print("4567899");
                     Get.offAll(const TabNavigator());
                   } else {
                     CloudToast.show(base.msg);

lib/ui/widget/appdialog.dart

@@ -119,7 +119,7 @@ _getVip() {
               TextSpan(
                 children: [
                   TextSpan(
-                      text: "03",
+                      text: "07",
                       style: TextStyle(
                           color: const Color(0xFFFFEAB0),
                           fontSize: 56.sp,