提交 1486cb3c authored 作者: yueweilu's avatar yueweilu

Merge remote-tracking branch 'origin/test' into test

part of user_security;
class UserSecurityPage extends StatefulWidget {
final UserInfoModel model;
const UserSecurityPage({
Key? key,
required this.model
}) : super(key: key);
const UserSecurityPage({Key? key, required this.model}) : super(key: key);
@override
State<UserSecurityPage> createState() => _UserSecurityPageState();
......@@ -23,7 +20,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
body: Column(
children: [
Container(
margin: EdgeInsets.symmetric(vertical: 10.w,horizontal: 10.w),
margin: EdgeInsets.symmetric(vertical: 10.w, horizontal: 10.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
......@@ -39,22 +36,25 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
child: Column(
children: [
GestureDetector(
onTap:(){
onTap: () {
context.pushNamed(Routes.changePhone);
},
child: _buildItem(title: '修改手机号码', value: widget.model.phone??'')
),
child: _buildItem(
title: '修改手机号码', value: widget.model.phone ?? '')),
Container(
margin: EdgeInsets.symmetric(horizontal: 10.w),
height: 0.5.w,
color:Colours.cF0,
color: Colours.cF0,
),
GestureDetector(
onTap: (){
context.pushNamed(Routes.changePwd,extra: widget.model);
onTap: () {
context.pushNamed(Routes.changePwd, extra: widget.model);
},
child: _buildItem(title: '修改密码', value: widget.model.password.toString().isEmpty?'未设置':'')
),
child: _buildItem(
title: '修改密码',
value: widget.model.password.toString().isEmpty
? '未设置'
: '')),
],
),
),
......@@ -84,10 +84,14 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8.0.w),
),
contentPadding: EdgeInsets.zero, // 移除内容部分的内边距
content: Wrap(children: [
contentPadding: EdgeInsets.zero,
// 移除内容部分的内边距
content: Wrap(
children: [
Container(
margin: EdgeInsets.only(top: 44.w, bottom: 29.w), // 调整上下间距
margin:
EdgeInsets.only(top: 44.w, bottom: 29.w),
// 调整上下间距
child: Center(
child: Text(
'确定注销账号吗',
......@@ -104,15 +108,20 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
width: double.infinity, // 设置分割线的宽度
color: Colours.cLine, // 设置分割线的颜色
),
],),
],
),
// 去除操作按钮区域的内边距
actionsPadding: EdgeInsets.zero,
actions: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, // 或者使用MainAxisAlignment.spaceEvenly
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
GestureDetector(
onTap: () => Navigator.of(context).pop(),
child: Container(
width: 105.w,
color: Colours.cFF,
alignment: Alignment.center,
child: const Text(
'取消',
style: TextStyle(
......@@ -122,6 +131,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
),
),
),
),
Container(
height: 39.5.w, // 设置分割线的高度
width: 1, // 设置分割线的宽度
......@@ -130,15 +140,19 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
GestureDetector(
onTap: () async {
final result = await AccountAPI.delete();
if (result){
if (result) {
CustomToast.loading();
await UserStore.to.logout();
CustomToast.dismiss();
if(context.mounted){
if (context.mounted) {
context.goNamed(Routes.splash);
}
}
},
child: Container(
width: 105.w,
color: Colours.cFF,
alignment: Alignment.center,
child: const Text(
'确定',
style: TextStyle(
......@@ -148,18 +162,13 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
),
),
),
),
],
),
],
);
},
);
},
),
],
......@@ -170,27 +179,31 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
);
}
Widget _buildItem({required String title,required String value}){
Widget _buildItem({required String title, required String value}) {
return Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
margin: EdgeInsets.only(left: 15.w, right: 15.w),
color: Colors.white,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () async{
},
onTap: () async {},
child: Container(
color: Colors.white,
height:45.w,
height: 45.w,
alignment: Alignment.centerLeft,
child: Text(title,style: TextStyle(fontSize: 13.w,height: 1.5, color: Colours.c3)),
child: Text(title,
style: TextStyle(
fontSize: 13.w, height: 1.5, color: Colours.c3)),
),
),
Row(
children: [
Text(value,style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c9),),
Text(
value,
style:
TextStyle(fontSize: 13.w, height: 1.5, color: Colours.c9),
),
Gaps.hGaps10,
Image.asset('assets/images/right_arrow.png')
],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论