# Conflicts:
#	lib/ui/login/login_page.dart
master
王亚玲 2 years ago
commit cca1967b9d

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

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

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

Loading…
Cancel
Save