Commit 726abbf8 authored by skeyboy's avatar skeyboy

登录页调整

parent 153beb76
...@@ -189,6 +189,10 @@ class SignInController extends GetxController { ...@@ -189,6 +189,10 @@ class SignInController extends GetxController {
EasyLoading.showToast('请先输入手机号'); EasyLoading.showToast('请先输入手机号');
return; return;
} }
if(codeEnable.value == false) {
EasyLoading.show(status: "验证码发送太过频繁,请稍后再试");
return;
}
if (codeEnable.value) { if (codeEnable.value) {
EasyLoading.show(status: "发送验证码中"); EasyLoading.show(status: "发送验证码中");
MsmEntity? res = MsmEntity? res =
......
import 'dart:io'; import 'dart:io';
import 'dart:math';
import 'package:chart/common/routers/routes.dart'; import 'package:chart/common/routers/routes.dart';
import 'package:chart/pages/application/index.dart'; import 'package:chart/pages/application/index.dart';
...@@ -628,7 +629,7 @@ class SignInPage extends GetView<SignInController> { ...@@ -628,7 +629,7 @@ class SignInPage extends GetView<SignInController> {
const Spacer(), const Spacer(),
], ],
), ),
SizedBox(height: defaultPadding * 4), SizedBox(height: defaultPadding * 6),
], ],
), ),
Row( Row(
...@@ -645,32 +646,66 @@ class SignInPage extends GetView<SignInController> { ...@@ -645,32 +646,66 @@ class SignInPage extends GetView<SignInController> {
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
cursorColor: kPrimaryColor, cursorColor: kPrimaryColor,
onSaved: (email) {}, onSaved: (email) {},
style:
const TextStyle(color: Color(0xFF6F35A5)),
decoration: const InputDecoration( decoration: const InputDecoration(
labelStyle: TextStyle(color: Colors.black),
fillColor: kPrimaryLightColor,
iconColor: Color(0xFF6F35A5),
prefixIconColor: Color(0xFF6F35A5),
filled: true,
contentPadding:
EdgeInsets.fromLTRB(10, 10, 10, 10),
border: OutlineInputBorder(
borderRadius:
BorderRadius.all(Radius.circular(30)),
borderSide: BorderSide.none,
),
hintText: "输入手机号", hintText: "输入手机号",
hintStyle:
TextStyle(color: Color(0xFF6F35A5)),
prefixIcon: Padding( prefixIcon: Padding(
padding: EdgeInsets.all(defaultPadding), padding: EdgeInsets.only(
left: defaultPadding,
right: defaultPadding),
child: Icon(Icons.phone_android), child: Icon(Icons.phone_android),
), ),
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: defaultPadding), vertical: defaultPadding * 1.5),
child: TextFormField( child: TextFormField(
controller: controller.codeController, controller: controller.codeController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
textInputAction: TextInputAction.done, textInputAction: TextInputAction.done,
obscureText: true, obscureText: true,
cursorColor: kPrimaryColor, cursorColor: kPrimaryColor,
style: TextStyle(color: Color(0xFF6F35A5)),
decoration: const InputDecoration( decoration: const InputDecoration(
labelStyle: TextStyle(color: Colors.black),
fillColor: kPrimaryLightColor,
contentPadding:
EdgeInsets.fromLTRB(10, 10, 10, 10),
iconColor: Color(0xFF6F35A5),
prefixIconColor: Color(0xFF6F35A5),
filled: true,
border: OutlineInputBorder(
borderRadius:
BorderRadius.all(Radius.circular(30)),
borderSide: BorderSide.none,
),
hintText: "输入验证码", hintText: "输入验证码",
hintStyle:
TextStyle(color: Color(0xFF6F35A5)),
prefixIcon: Padding( prefixIcon: Padding(
padding: EdgeInsets.all(defaultPadding), padding: EdgeInsets.all(defaultPadding),
child: Icon(Icons.verified_sharp), child: Icon(Icons.lock),
), ),
), ),
), ),
), ),
const SizedBox(height: defaultPadding),
Row( Row(
children: [ children: [
Flexible(child: Container()), Flexible(child: Container()),
...@@ -684,22 +719,21 @@ class SignInPage extends GetView<SignInController> { ...@@ -684,22 +719,21 @@ class SignInPage extends GetView<SignInController> {
) )
], ],
), ),
const SizedBox(height: defaultPadding), const SizedBox(height: defaultPadding * 6),
Hero( Hero(
tag: "login_btn", tag: "login_btn",
child: Container( child: GestureDetector(
width: Get.width - 40, onTap: () => controller.handleSignIn(),
height: 45, child: Container(
child: Padding( width: Get.width - 40,
padding: const EdgeInsets.all(8.0), height: 50,
child: ElevatedButton( alignment: Alignment.center,
// style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Color(0xFF6F35A5))), decoration: BoxDecoration(
onPressed: () { borderRadius: BorderRadius.all(
controller.handleSignIn(); Radius.circular(45 / 2.0)),
}, color: Color(0xFF6F35A5)),
child: Text( child: Text(
"登录".toUpperCase(), "登录".toUpperCase(),
),
), ),
), ),
), ),
......
...@@ -395,9 +395,7 @@ class HomeController extends GetxController with SingleGetTickerProviderMixin { ...@@ -395,9 +395,7 @@ class HomeController extends GetxController with SingleGetTickerProviderMixin {
//只有Android才会存在登录情况 //只有Android才会存在登录情况
if (GetPlatform.isAndroid) { if (GetPlatform.isAndroid) {
var rev = await Get.toNamed(AppRoutes.SIGN_IN); var rev = await Get.toNamed(AppRoutes.SIGN_IN);
if (isLogin) { print(rev);
virtualPay();
}
} }
} else { } else {
if (GetPlatform.isAndroid) { if (GetPlatform.isAndroid) {
......
...@@ -30,8 +30,7 @@ class MyPage extends GetView<MyController> { ...@@ -30,8 +30,7 @@ class MyPage extends GetView<MyController> {
alignment: Alignment.center, alignment: Alignment.center,
child: Container( child: Container(
// color: Colors.amber, // color: Colors.amber,
padding: padding: EdgeInsets.symmetric(horizontal: 20, vertical: 0),
EdgeInsets.symmetric(horizontal: 20, vertical: 0),
child: RichText( child: RichText(
textAlign: TextAlign.center, textAlign: TextAlign.center,
text: TextSpan(children: [ text: TextSpan(children: [
...@@ -182,12 +181,33 @@ class MyPage extends GetView<MyController> { ...@@ -182,12 +181,33 @@ class MyPage extends GetView<MyController> {
), ),
), ),
), ),
UserStore.to.isLogin ? UserStore.to.isLogin
Column(children: [ SizedBox(height: 145,), ? Column(
BrnBigMainButton(title: "退出", onTap: () { children: [
UserStore.to.logout(); SizedBox(
Get.back(); height: 145,
})],) : Container() ),
GestureDetector(
onTap: () {
UserStore.to.logout();
Get.back();
},
child: Container(
width: Get.width - 40,
height: 45,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius:
BorderRadius.all(Radius.circular(45 / 2.0)),
color: Color(0xFF6F35A5)),
child: Text(
"退出".toUpperCase(),
),
),
),
],
)
: Container()
// GradientButton(child: Text("321"), callback: () {}) // GradientButton(child: Text("321"), callback: () {})
], ],
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment