diff --git a/lib/component/home_page/DynamicReportDetailWidget.dart b/lib/component/home_page/DynamicReportDetailWidget.dart index db66b02..40135cc 100644 --- a/lib/component/home_page/DynamicReportDetailWidget.dart +++ b/lib/component/home_page/DynamicReportDetailWidget.dart @@ -667,6 +667,7 @@ class _DynamicReportDetailWidgetState extends State { height: 200.rpx, child: Center( child: CircularProgressIndicator( + strokeWidth: 2, color: themeController.currentColor.sc1, ), ), diff --git a/lib/controller/device/blueteeth_bind_controller.dart b/lib/controller/device/blueteeth_bind_controller.dart index a8c6b29..a904db1 100644 --- a/lib/controller/device/blueteeth_bind_controller.dart +++ b/lib/controller/device/blueteeth_bind_controller.dart @@ -229,7 +229,7 @@ class BlueteethBindController extends GetControllerEx { String serviceApi = ServiceConstant.device_bind; String queryUrl = "$serviceAddress$serviceName$serviceApi"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } @@ -291,7 +291,7 @@ class BlueteethBindController extends GetControllerEx { String serviceApi = ServiceConstant.device_bind; String queryUrl = "$serviceAddress$serviceName$serviceApi"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } diff --git a/lib/controller/login/login_controller.dart b/lib/controller/login/login_controller.dart index 5a2dbe9..5fee37d 100644 --- a/lib/controller/login/login_controller.dart +++ b/lib/controller/login/login_controller.dart @@ -175,6 +175,9 @@ class LoginController extends GetControllerEx { if (AppConstants().ent_type == APPPackageType.DONGHUA.code) { data['code'] = "dh"; } + if (AppConstants().ent_type == APPPackageType.TH.code) { + data['code'] = "theh"; + } var response = await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data)); if (response != null) { @@ -248,6 +251,9 @@ class LoginController extends GetControllerEx { } if (AppConstants().ent_type == APPPackageType.DONGHUA.code) { data['code'] = "dh"; + } + if (AppConstants().ent_type == APPPackageType.TH.code) { + data['code'] = "theh"; } var response = await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data)); diff --git a/lib/controller/mh_controller/find_password_controller.dart b/lib/controller/mh_controller/find_password_controller.dart index a6014c0..29585b3 100644 --- a/lib/controller/mh_controller/find_password_controller.dart +++ b/lib/controller/mh_controller/find_password_controller.dart @@ -50,7 +50,7 @@ class FindPasswordController extends GetControllerEx { String serviceName = ServiceConstant.server_service; String serviceApi = ServiceConstant.send_code; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; - var data = {"userName": model.phone, "type": 2}; + var data = {"userName": model.phone, "type": 2, "code": "mht"}; await requestWithLog( logTitle: "忘记密码请求验证码", method: MyHttpMethod.post, diff --git a/lib/pages/main_bottom/home_page.dart b/lib/pages/main_bottom/home_page.dart index ce17f50..e077ea0 100644 --- a/lib/pages/main_bottom/home_page.dart +++ b/lib/pages/main_bottom/home_page.dart @@ -151,7 +151,6 @@ class _HomePageState extends State { ), ), SizedBox(height: 13.rpx), - ], ), ), @@ -586,23 +585,23 @@ class _HomePageState extends State { borderRadius: AppConstants() .button_container_radius, // 圆角半径 onTap: () { - // Get.toNamed("/qrView"); - if (userInfoController.model.login == - LoginStatus.LOGIN.code) { - // Get.toNamed("/deviceType"); - TopSlideNotification.show( - context, - text: "待开发功能".tr, - ); - } else { - TopSlideNotification.show( - context, - text: "必须登录提示".tr, - textColor: themeController - .currentColor.sc9, - ); - Get.toNamed("/loginPage"); - } + Get.toNamed("/qrView"); + // if (userInfoController.model.login == + // LoginStatus.LOGIN.code) { + // // Get.toNamed("/deviceType"); + // TopSlideNotification.show( + // context, + // text: "待开发功能".tr, + // ); + // } else { + // TopSlideNotification.show( + // context, + // text: "必须登录提示".tr, + // textColor: themeController + // .currentColor.sc9, + // ); + // Get.toNamed("/loginPage"); + // } }, colors: [ // 渐变色 @@ -1043,6 +1042,7 @@ class _HomePageState extends State { return Expanded( child: Center( child: CircularProgressIndicator( + strokeWidth: 2, color: themeController.currentColor.sc1, )), // child: Column( diff --git a/lib/pages/main_bottom/xiaoe/XiaoeModel.dart b/lib/pages/main_bottom/xiaoe/XiaoeModel.dart index 406434b..d58fcdb 100644 --- a/lib/pages/main_bottom/xiaoe/XiaoeModel.dart +++ b/lib/pages/main_bottom/xiaoe/XiaoeModel.dart @@ -537,8 +537,6 @@ class XiaoeController extends GetControllerEx { ef.log('开始运行小e Web应用...'); - - await web.runApp('xiaoe').then((x) { ef.log('web.runApp 执行完成，结果: $x'); ready.value = true; @@ -751,6 +749,7 @@ class XiaoeView extends GetComponent { mainAxisSize: MainAxisSize.min, children: [ CircularProgressIndicator( + strokeWidth: 2, valueColor: AlwaysStoppedAnimation( Colors.white), ), diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart index 7f96c78..0317753 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -758,6 +758,7 @@ class WebviewTestView extends GetComponent { mainAxisSize: MainAxisSize.min, children: [ CircularProgressIndicator( + strokeWidth: 2, valueColor: AlwaysStoppedAnimation( Colors.white), diff --git a/lib/pages/mh_page/user/controller/bind_tel_controller.dart b/lib/pages/mh_page/user/controller/bind_tel_controller.dart index c44ff9f..255e9c3 100644 --- a/lib/pages/mh_page/user/controller/bind_tel_controller.dart +++ b/lib/pages/mh_page/user/controller/bind_tel_controller.dart @@ -117,7 +117,8 @@ class AuthBindTelController extends GetControllerEx { var data = { "userName": model.phone!, 'type': 5, - "ccode":userInfoController.select_country_code.value, + "ccode": userInfoController.select_country_code.value, + "code": "mht" }; if (img != null) { if (img!['code'] != null) { @@ -147,7 +148,7 @@ class AuthBindTelController extends GetControllerEx { Future updateUserPhone() async { EasyDartModule.logger.info("更新用户资料"); DailyLogUtils.writeLog("更新用户资料"); - try { + try { ApiResponse apiResponse = ApiResponse(code: -1, msg: "保存失败".tr); String serviceAddress = ServiceConstant.service_address; String serviceName = ServiceConstant.server_service; @@ -167,7 +168,7 @@ class AuthBindTelController extends GetControllerEx { final data = { 'phone': model.phone, 'verify': model.code, - 'merge': true, + 'merge': true, }; var response = diff --git a/lib/pages/mh_page/user/controller/mht_register_controller.dart b/lib/pages/mh_page/user/controller/mht_register_controller.dart index 012cc26..e06b001 100644 --- a/lib/pages/mh_page/user/controller/mht_register_controller.dart +++ b/lib/pages/mh_page/user/controller/mht_register_controller.dart @@ -150,10 +150,7 @@ class MHTRegisterController extends GetControllerEx { String serviceName = ServiceConstant.server_service; String serviceApi = ServiceConstant.send_code; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; - var data = { - "userName": model.register_phone!, - 'type':4, - }; + var data = {"userName": model.register_phone!, 'type': 4, "code": "mht"}; await requestWithLog( logTitle: "获取验证码".tr, method: MyHttpMethod.post, diff --git a/lib/pages/mh_page/user/controller/update_password_controller.dart b/lib/pages/mh_page/user/controller/update_password_controller.dart index 18cb704..40a155e 100644 --- a/lib/pages/mh_page/user/controller/update_password_controller.dart +++ b/lib/pages/mh_page/user/controller/update_password_controller.dart @@ -143,7 +143,7 @@ class UpdatePasswordController extends GetControllerEx { String serviceName = ServiceConstant.server_service; String serviceApi = ServiceConstant.send_code; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; - var data = {"userName": model.phone, "type": 3}; + var data = {"userName": model.phone, "type": 3, "code": "mht"}; await requestWithLog( data: data, logTitle: "发送验证码".tr, diff --git a/lib/pages/person/select_city.dart b/lib/pages/person/select_city.dart index a15f33c..338c099 100644 --- a/lib/pages/person/select_city.dart +++ b/lib/pages/person/select_city.dart @@ -748,6 +748,7 @@ Widget _buildLoadingBottomSheet( mainAxisSize: MainAxisSize.min, children: [ CircularProgressIndicator( + strokeWidth: 2, color: confirmTextColor, ), SizedBox(height: 20.rpx), diff --git a/lib/pages/policy/user_policy.dart b/lib/pages/policy/user_policy.dart index e91f5cc..142eac5 100644 --- a/lib/pages/policy/user_policy.dart +++ b/lib/pages/policy/user_policy.dart @@ -115,7 +115,9 @@ class _UserPrivacyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child: CircularProgressIndicator( + strokeWidth: 2, + ), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/sleep_report/quick_health_report_page.dart b/lib/pages/sleep_report/quick_health_report_page.dart index ad40e41..6e9a1ba 100644 --- a/lib/pages/sleep_report/quick_health_report_page.dart +++ b/lib/pages/sleep_report/quick_health_report_page.dart @@ -161,6 +161,7 @@ class _QuickHealthReportPageState extends State { top: true, child: Center( child: CircularProgressIndicator( + strokeWidth: 2, color: themeController.currentColor.sc1, )), ),