diff --git a/assets/translations/strings_en.i18n.json b/assets/translations/strings_en.i18n.json index c305154..16fde23 100755 --- a/assets/translations/strings_en.i18n.json +++ b/assets/translations/strings_en.i18n.json @@ -274,7 +274,11 @@ "initial": { "title": "Processing Payment", "description": "Please wait while we process your payment" - } + }, + "backToHome": "Back to Home", + "viewSubscription": "View Subscription", + "remainingTime": "Remaining Time", + "timeoutMessage": "Order has timed out, please place a new order" }, "home": { "welcome": "Welcome to BearVPN", diff --git a/assets/translations/strings_zh.i18n.json b/assets/translations/strings_zh.i18n.json index 9bce732..17ee361 100755 --- a/assets/translations/strings_zh.i18n.json +++ b/assets/translations/strings_zh.i18n.json @@ -337,7 +337,11 @@ "initial": { "title": "支付中", "description": "请稍候,正在处理您的支付" - } + }, + "backToHome": "返回首页", + "viewSubscription": "查看订阅", + "remainingTime": "剩余时间", + "timeoutMessage": "订单已超时,请重新下单" }, "dialog": { "confirm": "确认", diff --git a/lib/app/common/app_config.dart b/lib/app/common/app_config.dart index 9f32845..6898ddb 100755 --- a/lib/app/common/app_config.dart +++ b/lib/app/common/app_config.dart @@ -1036,10 +1036,10 @@ class AppConfig { /// 基础url // static String baseUrl = "http://103.112.98.72:8088"; - /// 请求域名地址 + /// 请求域名地址调试模式 String get baseUrl { if (kDebugMode) { - return "https://api.maodag.top"; + return "http://154.12.35.103:8080"; } return "${KRProtocol.kr_https}://${KRDomain.kr_api}"; } diff --git a/lib/app/localization/app_translations.dart b/lib/app/localization/app_translations.dart index eff9817..afa5e31 100755 --- a/lib/app/localization/app_translations.dart +++ b/lib/app/localization/app_translations.dart @@ -806,6 +806,14 @@ class AppTranslationsOrderStatus { /// 初始状态 String get initialTitle => 'orderStatus.initial.title'.tr; String get initialDescription => 'orderStatus.initial.description'.tr; + + /// 操作按钮 + String get backToHome => 'orderStatus.backToHome'.tr; + String get viewSubscription => 'orderStatus.viewSubscription'.tr; + + /// 倒计时相关 + String get remainingTime => 'orderStatus.remainingTime'.tr; + String get timeoutMessage => 'orderStatus.timeoutMessage'.tr; } /// 支付模块的翻译类 diff --git a/lib/app/modules/kr_order_status/controllers/kr_order_status_controller.dart b/lib/app/modules/kr_order_status/controllers/kr_order_status_controller.dart index 0d0fde5..09d3dea 100755 --- a/lib/app/modules/kr_order_status/controllers/kr_order_status_controller.dart +++ b/lib/app/modules/kr_order_status/controllers/kr_order_status_controller.dart @@ -151,7 +151,7 @@ class KROrderStatusController extends GetxController { print('⏱️ 订单支付超时(15分钟)'); kr_statusTitle.value = AppTranslations.kr_orderStatus.closedTitle; - kr_statusDescription.value = '订单已超时,请重新下单'; + kr_statusDescription.value = AppTranslations.kr_orderStatus.timeoutMessage; kr_isLoading.value = false; } } @@ -198,7 +198,7 @@ class KROrderStatusController extends GetxController { case kr_statusPending: // 待支付状态,继续轮询 kr_statusTitle.value = AppTranslations.kr_orderStatus.pendingTitle; - kr_statusDescription.value = '${AppTranslations.kr_orderStatus.pendingDescription}\n剩余时间: ${kr_formattedCountdown.value}'; + kr_statusDescription.value = '${AppTranslations.kr_orderStatus.pendingDescription}\n${AppTranslations.kr_orderStatus.remainingTime}: ${kr_formattedCountdown.value}'; kr_statusIcon.value = 'payment_success'; break; diff --git a/lib/app/modules/kr_order_status/views/kr_order_status_view.dart b/lib/app/modules/kr_order_status/views/kr_order_status_view.dart index 4dcb823..0e6f4aa 100755 --- a/lib/app/modules/kr_order_status/views/kr_order_status_view.dart +++ b/lib/app/modules/kr_order_status/views/kr_order_status_view.dart @@ -141,7 +141,7 @@ class KROrderStatusView extends GetView { elevation: 0, ), child: Text( - AppTranslations.kr_orderStatus.backToHome ?? '返回首页', + AppTranslations.kr_orderStatus.backToHome, style: KrAppTextStyle( fontSize: 16, fontWeight: FontWeight.w600, @@ -172,7 +172,7 @@ class KROrderStatusView extends GetView { ), ), child: Text( - AppTranslations.kr_orderStatus.viewSubscription ?? '查看订阅', + AppTranslations.kr_orderStatus.viewSubscription, style: KrAppTextStyle( fontSize: 16, fontWeight: FontWeight.w600,