diff --git a/lib/controller/discover/room_controller.dart b/lib/controller/discover/room_controller.dart index 37648c3..bd6c2fa 100644 --- a/lib/controller/discover/room_controller.dart +++ b/lib/controller/discover/room_controller.dart @@ -70,21 +70,6 @@ class RoomController extends GetxController with WidgetsBindingObserver { if(state == AppLifecycleState.resumed){ // print('_handleAppResumed'); } - switch (state) { - case AppLifecycleState.resumed: - print('_handleAppResumed'); - break; - case AppLifecycleState.paused: - // _handleAppPaused(); - print('_handleAppPaused'); - break; - case AppLifecycleState.inactive: - // _handleAppInactive(); - print('_handleAppInactive'); - break; - default: - break; - } } @override diff --git a/lib/controller/mine/edit_info_controller.dart b/lib/controller/mine/edit_info_controller.dart index 843e9e1..bd6da61 100644 --- a/lib/controller/mine/edit_info_controller.dart +++ b/lib/controller/mine/edit_info_controller.dart @@ -288,29 +288,10 @@ class EditInfoController extends GetxController { birthday.value = userData.value?.birthDate ?? ""; } - goPreview() async { - try { - final response = await _userApi.getMarriageInformationDetailsById(miId: userData.value?.id ?? ""); - if (response.data.isSuccess && response.data.data != null) { - final data = response.data.data; - - - Get.to(() => UserInformationPage( - miId: userData.value?.id ?? "", - userId: GlobalData().userId ?? "", - )); - } else { - // 响应失败,抛出异常 - throw Exception(response.data.message ?? '获取数据失败'); - } - } catch(e){ - print('收入列表获取失败: $e'); - SmartDialog.showToast('收入列表获取失败'); - rethrow; - } + goPreview() { + Get.to(() => UserInformationPage(miId: userData.value?.id ?? "", userId: GlobalData().userId ?? "")); } - int calculateAge(String birthdayStr) { final birthday = DateTime.parse(birthdayStr); // 自动识别 1996-1-20 final today = DateTime.now(); diff --git a/lib/controller/setting/spread_controller.dart b/lib/controller/setting/spread_controller.dart index 59d2bbc..cda96ed 100644 --- a/lib/controller/setting/spread_controller.dart +++ b/lib/controller/setting/spread_controller.dart @@ -108,7 +108,8 @@ class SpreadController extends GetxController with WidgetsBindingObserver { final data = response.data.data; fluwx.open(target: MiniProgram( username: 'gh_9ea8d46add6f', - path:"pages/index/index?amount=${roseList[activePay.value].unitSellingPrice}&paymentOrderId=${data!.paymentOrderId}&url=match-fee" + path: "pages/index/index?amount=${roseList[activePay.value].unitSellingPrice}&paymentOrderId=${data!.paymentOrderId}&url=match-fee", + miniProgramType: WXMiniProgramType.preview )); countdownSeconds.value = 3; SmartDialog.showToast('开始支付'); diff --git a/lib/pages/home/user_information_page.dart b/lib/pages/home/user_information_page.dart index 68cd53c..b5cf999 100644 --- a/lib/pages/home/user_information_page.dart +++ b/lib/pages/home/user_information_page.dart @@ -1,4 +1,5 @@ import 'package:cached_network_image/cached_network_image.dart'; +import 'package:dating_touchme_app/controller/global.dart'; import 'package:dating_touchme_app/controller/home/user_information_controller.dart'; import 'package:dating_touchme_app/generated/assets.dart'; import 'package:dating_touchme_app/model/home/marriage_data.dart'; @@ -354,7 +355,7 @@ class UserInformationPage extends StatelessWidget { ), ], ), - bottomNavigationBar: SafeArea( + bottomNavigationBar: miId != GlobalData().userData!.id ? SafeArea( child: SizedBox( height: 48.h, child: Row( @@ -416,7 +417,7 @@ class UserInformationPage extends StatelessWidget { ], ), ) - ), + ) : null, ) : SizedBox(); }, );