diff --git a/.gitignore b/.gitignore index e469c2b..2ea8576 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ .packages build/ # If you're building an application, you may want to check-in your pubspec.lock -pubspec.lock +/pubspec.lock # Directory created by dartdoc # If you don't generate documentation locally you can remove this line. diff --git a/lib/controller/mine/auth_controller.dart b/lib/controller/mine/auth_controller.dart index 7183607..343b58e 100644 --- a/lib/controller/mine/auth_controller.dart +++ b/lib/controller/mine/auth_controller.dart @@ -20,14 +20,12 @@ class AuthController extends GetxController { } void _loadInitialData() { isLoading.value = true; - Future.delayed(Duration(seconds: 1), () { - dataList.assignAll([ - AuthCard( title: '手机绑定', desc: '防止账号丢失', index: 1), - AuthCard( title: '真实头像', desc: '提高交友成功率', index: 2), - AuthCard( title: '实名认证', desc: '提高交友成功率', index: 3), - ]); - isLoading.value = false; - }); + dataList.assignAll([ + AuthCard( title: '手机绑定', desc: '防止账号丢失', index: 1, authed: true), + AuthCard( title: '真实头像', desc: '提高交友成功率', index: 2, authed: false), + AuthCard( title: '实名认证', desc: '提高交友成功率', index: 3, authed: false), + ]); + isLoading.value = false; } // 登录方法 @@ -53,10 +51,12 @@ class AuthCard { final String title; final String desc; final int index; + final bool authed; AuthCard({ required this.desc, required this.title, required this.index, + required this.authed, }); } diff --git a/lib/controller/mine/mine_controller.dart b/lib/controller/mine/mine_controller.dart index b32c408..29e7bf8 100644 --- a/lib/controller/mine/mine_controller.dart +++ b/lib/controller/mine/mine_controller.dart @@ -1,4 +1,5 @@ import 'package:dating_touchme_app/generated/assets.dart'; +import 'package:dating_touchme_app/pages/mine/auth_center_page.dart'; import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart'; import 'package:dating_touchme_app/pages/mine/rose_page.dart'; import 'package:get/get.dart'; @@ -18,7 +19,7 @@ class MineController extends GetxController { {"icon": Assets.imagesRose, "title": "我的玫瑰", "subTitle": "新人限时福利", "path": () => RosePage()}, {"icon": Assets.imagesWallet, "title": "我的钱包", "subTitle": "提现无门槛", "path": () => MyWalletPage()}, {"icon": Assets.imagesShop, "title": "商城中心", "subTitle": "不定期更新商品", "path": () => Null}, - {"icon": Assets.imagesCert, "title": "认证中心", "subTitle": "未认证", "path": () => Null}, + {"icon": Assets.imagesCert, "title": "认证中心", "subTitle": "未认证", "path": () => AuthCenterPage()}, ].obs; List settingList = [ diff --git a/lib/controller/mine/user_controller.dart b/lib/controller/mine/user_controller.dart index 02929d1..0b23f83 100644 --- a/lib/controller/mine/user_controller.dart +++ b/lib/controller/mine/user_controller.dart @@ -73,6 +73,7 @@ class UserController extends GetxController { if (response.data.isSuccess) { // 检查data是否为null或者是空对象 final information = response.data.data; + if (information == null || information.id.isEmpty || information.genderCode.isNaN || information.birthYear == null) { //跳转到完善信息 SmartDialog.showToast('转到完善信息'); diff --git a/lib/pages/mine/auth_center_page.dart b/lib/pages/mine/auth_center_page.dart index 8df46e4..cf66016 100644 --- a/lib/pages/mine/auth_center_page.dart +++ b/lib/pages/mine/auth_center_page.dart @@ -1,9 +1,11 @@ import 'package:dating_touchme_app/extension/ex_widget.dart'; +import 'package:dating_touchme_app/pages/mine/real_name_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import '../../controller/mine/auth_controller.dart'; +import 'edit_info_page.dart'; class AuthCenterPage extends StatelessWidget { AuthCenterPage({super.key}); @@ -92,19 +94,31 @@ class AuthCenterPage extends StatelessWidget { Spacer(), Row( children: [ - Text('去认证', style: TextStyle(fontSize: 12, color: Colors.grey[500])), + Text( + item.authed ? '已认证' : '去认证', + style: TextStyle( + fontSize: 12, + color: item.authed ? Color(0xff26C77C) : Colors.grey[500] + ) + ), SizedBox(width: 4), - Icon( + item.authed ? SizedBox(width: 24) : Icon( Icons.navigate_next, // Material Icons - // size: 128.0, // 设置图标大小 - color: Colors.grey, // 设置图标颜色 - ) + // size: 128.0, // 设置图标大小#26C77C + color: Colors.grey[500] + ), ], ) ], ), ).onTap((){ - print(item.index); + if(!item.authed){ + if(item.index == 2){ + Get.to(() => EditInfoPage()); + } else if(item.index == 3){ + Get.to(() => RealNamePage()); + } + } }); }