|
|
@@ -45,13 +45,12 @@ class MinePage extends BasePage<MineController> {
|
|
|
child: SingleChildScrollView(
|
|
|
child: Column(children: [
|
|
|
SizedBox(height: 70.w),
|
|
|
- GestureDetector(
|
|
|
- behavior: HitTestBehavior.opaque,
|
|
|
- onTap: () => controller.onLoginClick(),
|
|
|
- child: Row(
|
|
|
- children: [
|
|
|
- SizedBox(width: 12.w),
|
|
|
- Obx(() {
|
|
|
+ Row(
|
|
|
+ children: [
|
|
|
+ SizedBox(width: 12.w),
|
|
|
+ GestureDetector(
|
|
|
+ onTap: () => controller.onEditUserAvatarClick(),
|
|
|
+ child: Obx(() {
|
|
|
return controller.isLogin
|
|
|
? (controller.mineInfo.avatar != null
|
|
|
? buildAvatarView(controller.mineInfo.avatar!)
|
|
|
@@ -60,18 +59,18 @@ class MinePage extends BasePage<MineController> {
|
|
|
: Assets.images.iconMineNoLogin
|
|
|
.image(width: 54.w, height: 54.w);
|
|
|
}),
|
|
|
- SizedBox(width: 10.w),
|
|
|
- Expanded(child: buildLoginInfo()),
|
|
|
- //Spacer(),
|
|
|
- Obx(() {
|
|
|
- return Visibility(
|
|
|
- visible: controller.isOpenFreeMember == true,
|
|
|
- child: GestureDetector(
|
|
|
- onTap: () => controller.onMemberTryOutClick(),
|
|
|
- child: buildMemberTryOutView()));
|
|
|
- })
|
|
|
- ],
|
|
|
- ),
|
|
|
+ ),
|
|
|
+ SizedBox(width: 10.w),
|
|
|
+ Expanded(child: buildLoginInfo()),
|
|
|
+ //Spacer(),
|
|
|
+ Obx(() {
|
|
|
+ return Visibility(
|
|
|
+ visible: controller.isOpenFreeMember == true,
|
|
|
+ child: GestureDetector(
|
|
|
+ onTap: () => controller.onMemberTryOutClick(),
|
|
|
+ child: buildMemberTryOutView()));
|
|
|
+ })
|
|
|
+ ],
|
|
|
),
|
|
|
SizedBox(height: 20.w),
|
|
|
buildExperienceContent(),
|
|
|
@@ -174,38 +173,43 @@ class MinePage extends BasePage<MineController> {
|
|
|
}
|
|
|
|
|
|
Widget buildLoginInfo() {
|
|
|
- return Column(
|
|
|
- mainAxisAlignment: MainAxisAlignment.center,
|
|
|
- crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
- children: [
|
|
|
- Row(
|
|
|
- children: [
|
|
|
- Obx(() {
|
|
|
- String desc = "";
|
|
|
- if (controller.isLogin && controller.phone?.isNotEmpty == true) {
|
|
|
- desc = controller.getUserName(controller.phone!);
|
|
|
- } else {
|
|
|
- desc = StringName.mineAccountGoLogin;
|
|
|
- }
|
|
|
- return Text(desc,
|
|
|
- style: TextStyle(
|
|
|
- fontSize: 16.sp,
|
|
|
- color: '#333333'.color,
|
|
|
- fontWeight: FontWeight.bold));
|
|
|
- }),
|
|
|
- SizedBox(width: 6.w),
|
|
|
- Obx(() {
|
|
|
- return Visibility(
|
|
|
- visible: controller.isLogin &&
|
|
|
- controller.memberStatusInfo != null &&
|
|
|
- controller.memberStatusInfo?.expired == false,
|
|
|
- child: Assets.images.iconVip.image(width: 28.w));
|
|
|
- })
|
|
|
- ],
|
|
|
- ),
|
|
|
- SizedBox(height: 6.w),
|
|
|
- buildLoginDesc(),
|
|
|
- ],
|
|
|
+ return GestureDetector(
|
|
|
+ behavior: HitTestBehavior.translucent,
|
|
|
+ onTap: controller.onMineDescClick,
|
|
|
+ child: Column(
|
|
|
+ mainAxisAlignment: MainAxisAlignment.center,
|
|
|
+ crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
+ children: [
|
|
|
+ Row(
|
|
|
+ children: [
|
|
|
+ Obx(() {
|
|
|
+ String desc = "";
|
|
|
+ if (controller.isLogin &&
|
|
|
+ controller.phone?.isNotEmpty == true) {
|
|
|
+ desc = controller.getUserName(controller.phone!);
|
|
|
+ } else {
|
|
|
+ desc = StringName.mineAccountGoLogin;
|
|
|
+ }
|
|
|
+ return Text(desc,
|
|
|
+ style: TextStyle(
|
|
|
+ fontSize: 16.sp,
|
|
|
+ color: '#333333'.color,
|
|
|
+ fontWeight: FontWeight.bold));
|
|
|
+ }),
|
|
|
+ SizedBox(width: 6.w),
|
|
|
+ Obx(() {
|
|
|
+ return Visibility(
|
|
|
+ visible: controller.isLogin &&
|
|
|
+ controller.memberStatusInfo != null &&
|
|
|
+ controller.memberStatusInfo?.expired == false,
|
|
|
+ child: Assets.images.iconVip.image(width: 28.w));
|
|
|
+ })
|
|
|
+ ],
|
|
|
+ ),
|
|
|
+ SizedBox(height: 6.w),
|
|
|
+ buildLoginDesc(),
|
|
|
+ ],
|
|
|
+ ),
|
|
|
);
|
|
|
}
|
|
|
|