fix: 跳转登录页
This commit is contained in:
@ -31,7 +31,7 @@ class LoginPageController extends GetxController {
|
|||||||
|
|
||||||
// 倒计时60s
|
// 倒计时60s
|
||||||
RxInt seconds = 60.obs;
|
RxInt seconds = 60.obs;
|
||||||
late Timer timer;
|
Timer? timer;
|
||||||
RxBool smsCodeSendStatus = false.obs;
|
RxBool smsCodeSendStatus = false.obs;
|
||||||
|
|
||||||
// 默认密码登录
|
// 默认密码登录
|
||||||
@ -43,7 +43,7 @@ class LoginPageController extends GetxController {
|
|||||||
late int webSmsCode;
|
late int webSmsCode;
|
||||||
|
|
||||||
RxInt validSeconds = 180.obs;
|
RxInt validSeconds = 180.obs;
|
||||||
late Timer validTimer;
|
Timer? validTimer;
|
||||||
late String qrcodeKey;
|
late String qrcodeKey;
|
||||||
|
|
||||||
// 监听pageView切换
|
// 监听pageView切换
|
||||||
@ -329,7 +329,7 @@ class LoginPageController extends GetxController {
|
|||||||
var res = await LoginHttp.queryWebQrcodeStatus(qrcodeKey);
|
var res = await LoginHttp.queryWebQrcodeStatus(qrcodeKey);
|
||||||
if (res['status']) {
|
if (res['status']) {
|
||||||
await LoginUtils.confirmLogin('', null);
|
await LoginUtils.confirmLogin('', null);
|
||||||
validTimer.cancel();
|
validTimer?.cancel();
|
||||||
Get.back();
|
Get.back();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,8 +15,10 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
final LoginPageController _loginPageCtr = Get.put(LoginPageController());
|
final LoginPageController _loginPageCtr = Get.put(LoginPageController());
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void dispose() {
|
||||||
super.initState();
|
_loginPageCtr.validTimer?.cancel();
|
||||||
|
_loginPageCtr.timer?.cancel();
|
||||||
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -51,7 +53,7 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
icon: const Icon(Icons.language),
|
icon: const Icon(Icons.language, size: 20),
|
||||||
),
|
),
|
||||||
IconButton(
|
IconButton(
|
||||||
tooltip: '二维码登录',
|
tooltip: '二维码登录',
|
||||||
@ -90,7 +92,7 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
Map data = snapshot.data as Map;
|
Map data = snapshot.data as Map;
|
||||||
return QrImageView(
|
return QrImageView(
|
||||||
data: data['data']['url'],
|
data: data['data']['url'],
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.white,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return const Center(
|
return const Center(
|
||||||
@ -131,9 +133,11 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
);
|
).then((value) {
|
||||||
|
_loginPageCtr.validTimer!.cancel();
|
||||||
|
});
|
||||||
},
|
},
|
||||||
icon: const Icon(Icons.qr_code),
|
icon: const Icon(Icons.qr_code, size: 20),
|
||||||
),
|
),
|
||||||
const SizedBox(width: 22),
|
const SizedBox(width: 22),
|
||||||
],
|
],
|
||||||
@ -164,17 +168,9 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
fontSize: 34,
|
fontSize: 34,
|
||||||
fontWeight: FontWeight.w500),
|
fontWeight: FontWeight.w500),
|
||||||
),
|
),
|
||||||
Row(
|
Text(
|
||||||
children: [
|
'请使用您的 BiliBili 账号登录。',
|
||||||
Text(
|
style: Theme.of(context).textTheme.titleSmall!,
|
||||||
'请使用您的 BiliBili 账号登录。',
|
|
||||||
style: Theme.of(context).textTheme.titleSmall!,
|
|
||||||
),
|
|
||||||
GestureDetector(
|
|
||||||
onTap: () {},
|
|
||||||
child: const Icon(Icons.info_outline, size: 16),
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
margin: const EdgeInsets.only(top: 38, bottom: 15),
|
margin: const EdgeInsets.only(top: 38, bottom: 15),
|
||||||
|
@ -33,8 +33,7 @@ class MineController extends GetxController {
|
|||||||
|
|
||||||
onLogin() async {
|
onLogin() async {
|
||||||
if (!userLogin.value) {
|
if (!userLogin.value) {
|
||||||
// RoutePush.loginPush();
|
Get.toNamed('/loginPage', preventDuplicates: false);
|
||||||
Get.toNamed('/loginPage');
|
|
||||||
} else {
|
} else {
|
||||||
int mid = userInfo.value.mid!;
|
int mid = userInfo.value.mid!;
|
||||||
String face = userInfo.value.face!;
|
String face = userInfo.value.face!;
|
||||||
|
Reference in New Issue
Block a user