Commit a1ad7f166f0adfc8e932d6136139af06d2b70240

Authored by 常守达
1 parent 545418f3

fix(today):引导进入首页不展示会员页

... ... @@ -41,11 +41,13 @@ class HomeController extends GetxController {
/// 当前选中的底部 tab 索引
final selectedIndex = 0.obs;
final lastFlutterUrl = ''.obs;
var isFromOnboard = false;
@override
void onInit() {
super.onInit();
_mainChannel.setMethodCallHandler(_handleNativeMethodCall);
isFromOnboard = Get.arguments?['isFromOnboard'] ?? false;
SchedulerBinding.instance.addPostFrameCallback((_) async {
try {
final route = await _platformHostApi.requestUnhandedUrl();
... ... @@ -113,6 +115,10 @@ class HomeController extends GetxController {
}
Future<bool> maybeShowMembershipOffer() async {
if (isFromOnboard) {
isFromOnboard = false;
return false;
}
if (userStateService.isVip) return false;
final userId = userStateService.userId;
... ...
... ... @@ -364,7 +364,6 @@ class TodayController extends GetMaterialController {
}
}
case AppFailure():
hasUploaded = false;
}
showHealthDataAuthCardStatus.value = !hasUploaded ? -1 : result.status;
} catch (e) {}
... ...
... ... @@ -773,6 +773,8 @@ class _TopDateBar extends StatelessWidget {
'assets/images/common/ic_pro.png',
width: 20,
height: 20,
fit: BoxFit.contain,
alignment: Alignment.center,
color: context.colors.textPrimary,
),
const SizedBox(width: 2),
... ... @@ -781,6 +783,7 @@ class _TopDateBar extends StatelessWidget {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
height: 1,
color: context.colors.textPrimary,
),
),
... ...
... ... @@ -42,7 +42,7 @@ class MembershipOfferController extends GetxController {
final orderResult = await _payApi.createOrderByApple(productId);
if (orderResult is! AppSuccess<ApplePayOrderResponse>) {
if (isFromOnboard) {
Get.offAllNamed(AppRoutes.home);
Get.offAllNamed(AppRoutes.home, arguments: {'isFromOnboard': true});
}
return;
}
... ... @@ -51,7 +51,7 @@ class MembershipOfferController extends GetxController {
if (orderUuid == null || orderUuid.isEmpty) {
AppToast.show(l10n.purchaseOrderInfoUnavailable);
if (isFromOnboard) {
Get.offAllNamed(AppRoutes.home);
Get.offAllNamed(AppRoutes.home, arguments: {'isFromOnboard': true});
}
return;
}
... ... @@ -78,7 +78,7 @@ class MembershipOfferController extends GetxController {
AppToast.show(_applePaymentFailureMessage(result!));
if (isFromOnboard) {
Get.offAllNamed(AppRoutes.home);
Get.offAllNamed(AppRoutes.home, arguments: {'isFromOnboard': true});
}
}
... ...