整理具体的组件，分国家组件，新加坡，英国，越南

app/lib/main.dart

@@ -1,16 +1,9 @@
 import 'package:cpt_auth/router/auth_service_impl.dart';
 import 'package:cpt_auth/router/page_router.dart';
-import 'package:cpt_job/router/job_service_impl.dart';
-import 'package:cpt_job/router/page_router.dart';
-import 'package:cpt_job_sg/router/job_sg_service_impl.dart';
-import 'package:cpt_job_sg/router/page_router.dart';
-import 'package:cpt_labour/router/labour_service_impl.dart';
-import 'package:cpt_labour/router/page_router.dart';
-import 'package:cpt_labour_sg/router/labour_sg_service_impl.dart';
-import 'package:cpt_labour_sg/router/page_router.dart';
-import 'package:cpt_report/router/page_router.dart';
-import 'package:cpt_report/router/report_service_impl.dart';
+import 'package:cpt_sg/router/sg_router.dart';
+import 'package:cpt_sg/router/sg_service_impl.dart';
 import 'package:cpt_uk/router/uk_router.dart';
+import 'package:cpt_vn/router/vn_router.dart';
 import 'package:cpt_uk/router/uk_service_impl.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -19,11 +12,9 @@ import 'package:initializer/global_services_injection.dart';
 import 'package:initializer/app_initializer.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:router/componentRouter/auth_service.dart';
-import 'package:router/componentRouter/job_service.dart';
-import 'package:router/componentRouter/job_sg_service.dart';
-import 'package:router/componentRouter/labour_service.dart';
-import 'package:router/componentRouter/labour_sg_service.dart';
-import 'package:router/componentRouter/report_service.dart';
+import 'package:router/componentRouter/sg_service.dart';
+import 'package:router/componentRouter/vn_service.dart';
+import 'package:cpt_vn/router/vn_service_impl.dart';
 import 'package:cs_resources/local/theme/theme_config.dart';
 import 'package:cs_resources/local/language/translation_service.dart';
 import 'package:router/componentRouter/uk_service.dart';
@@ -38,24 +29,21 @@ import 'package:widgets/dialog/custom_loading_widget.dart';
 import 'package:widgets/widget_export.dart';
 import 'router/page_router.dart';
 
-void main() async{
+void main() async {
   //运行App
   // FlutterBugly.postCatchedException(() async {
-    //交给初始化构造器去统一初始化
-    await AppInitializer.initializeRunalone();
+  //交给初始化构造器去统一初始化
+  await AppInitializer.initializeRunalone();
 
-    //全局自定义单例服务的注入
-    GlobalServicesInjection.init(additionalDependencies: () {
-      Get.lazyPut<AuthService>(() => AuthServiceImpl());
-      Get.lazyPut<LabourService>(() => LabourServiceImpl());
-      Get.lazyPut<JobService>(() => JobServiceImpl());
-      Get.lazyPut<ReportService>(() => ReportServiceImpl());
-      Get.lazyPut<JobSGService>(() => JobSGServiceImpl());
-      Get.lazyPut<LabourSGService>(() => LabourSGServiceImpl());
-      Get.lazyPut<UKService>(() => UKServiceImpl());
-    });
+  //全局自定义单例服务的注入
+  GlobalServicesInjection.init(additionalDependencies: () {
+    Get.lazyPut<AuthService>(() => AuthServiceImpl());
+    Get.lazyPut<UKService>(() => UKServiceImpl());
+    Get.lazyPut<VNService>(() => VNServiceImpl());
+    Get.lazyPut<SGService>(() => SGServiceImpl());
+  });
 
-    runApp(MyApp());
+  runApp(MyApp());
   // });
 }
 
@@ -129,8 +117,7 @@ class MyApp extends StatelessWidget {
           enableLog: true,
           //默认路由与路由表的加载
           initialRoute: RouterPath.splash,
-          getPages: PageRouter.routes + BasicPageRouter.routes + AuthPageRouter.routes + JobPageRouter.routes + LabourPageRouter.routes +
-              ReportPageRouter.routes + LabourSGPageRouter.routes + JobPageSGRouter.routes + UKPageRouter.routes,
+          getPages: PageRouter.routes + BasicPageRouter.routes + AuthPageRouter.routes + UKPageRouter.routes + VNPageRouter.routes + SGPageRouter.routes,
           //对原生导航的兼容；SmartDialog路由配置生命周期处理
           navigatorObservers: [GetXRouterObserver(), FlutterSmartDialog.observer, routeObserver],
           //默认页面动画
@@ -145,7 +132,7 @@ class MyApp extends StatelessWidget {
           //本地化相关
           locale: TranslationService.locale,
           fallbackLocale: TranslationService.fallbackLocale,
-          localizationsDelegates:  const [
+          localizationsDelegates: const [
             GlobalMaterialLocalizations.delegate,
             GlobalWidgetsLocalizations.delegate,
             GlobalCupertinoLocalizations.delegate,

app/lib/modules/splash/splash_controller.dart

@@ -20,7 +20,6 @@ class SplashController extends GetxController {
   }
 }
 
-
 void _gotoNextPage() async {
   // await AppInitializer.delayInitialize(futureTasks: [
   //   () async {
@@ -47,12 +46,15 @@ void _gotoNextPage() async {
   if (UserService.to.isLogin) {
     //去Attendance页面签到
     Log.d("去首页页面");
-    if (ConfigService.to.selectCountry.value == 2) {
+    if (ConfigService.to.selectCountry.value == 1) {
+      //去新加坡首页
+      ComponentRouterServices.sgService.startSGMainPage();
+    } else if (ConfigService.to.selectCountry.value == 2) {
       //去英国首页
       ComponentRouterServices.ukService.startUKMainPage();
     } else {
-      //去新加坡首页
-      ComponentRouterServices.authService.startPopAllMainPage();
+      //去越南首页
+      ComponentRouterServices.vnService.startVNMainPage();
     }
   } else {
     //去登录页面

app/pubspec.yaml

@@ -40,24 +40,15 @@ dependencies:
   cpt_auth:
     path: ../packages/cpt_auth
 
-  cpt_job:
-    path: ../packages/cpt_job
-
-  cpt_job_sg:
-    path: ../packages/cpt_job_sg
-
-  cpt_labour:
-    path: ../packages/cpt_labour
-
-  cpt_labour_sg:
-    path: ../packages/cpt_labour_sg
-
-  cpt_report:
-    path: ../packages/cpt_report
-
   cpt_uk:
     path: ../packages/cpt_uk
 
+  cpt_vn:
+    path: ../packages/cpt_vn
+
+  cpt_sg:
+    path: ../packages/cpt_sg
+
   initializer:
     path: ../packages/cs_initializer
 

app/pubspec_overrides.yaml

@@ -1,17 +1,13 @@
-# melos_managed_dependency_overrides: cpt_auth,cpt_job,cpt_labour,cpt_report,cs_resources,domain,initializer,plugin_basic,plugin_platform,router,shared,widgets,cpt_job_sg,cpt_labour_sg
+# melos_managed_dependency_overrides: cpt_auth,cs_resources,domain,initializer,plugin_basic,plugin_platform,router,shared,widgets,cpt_uk,cpt_vn,cpt_sg
 dependency_overrides:
   cpt_auth:
     path: ../packages/cpt_auth
-  cpt_job:
-    path: ../packages/cpt_job
-  cpt_job_sg:
-    path: ../packages/cpt_job_sg
-  cpt_labour:
-    path: ../packages/cpt_labour
-  cpt_labour_sg:
-    path: ../packages/cpt_labour_sg
-  cpt_report:
-    path: ../packages/cpt_report
+  cpt_sg:
+    path: ../packages/cpt_sg
+  cpt_uk:
+    path: ../packages/cpt_uk
+  cpt_vn:
+    path: ../packages/cpt_vn
   cs_resources:
     path: ../packages/cs_resources
   domain:

melos.yaml

@@ -10,12 +10,9 @@ packages:
   - "packages/cs_plugin_platform/"
   - "packages/cs_initializer/"
   - "packages/cpt_auth/"
-  - "packages/cpt_job/"
-  - "packages/cpt_job_sg/"
-  - "packages/cpt_labour/"
-  - "packages/cpt_labour_sg/"
-  - "packages/cpt_report/"
   - "packages/cpt_uk/"
+  - "packages/cpt_vn/"
+  - "packages/cpt_sg/"
 
 
 command:

packages/cpt_auth/lib/modules/login/login_controller.dart

@@ -1,5 +1,3 @@
-import 'package:cpt_auth/modules/main/main_page.dart';
-import 'package:cpt_auth/modules/reset_psd/reset_psd_page.dart';
 import 'package:cpt_auth/modules/select_country/select_country_page.dart';
 import 'package:domain/entity/response/hotel_info_entity.dart';
 import 'package:domain/repository/auth_repository.dart';
@@ -10,9 +8,7 @@ import 'package:plugin_basic/service/user_service.dart';
 import 'package:plugin_platform/engine/sp/sp_util.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
-import 'package:plugin_platform/http/http_provider.dart';
 import 'package:router/componentRouter/component_router_service.dart';
-import 'package:shared/utils/event_bus.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/util.dart';
 
@@ -88,12 +84,15 @@ class LoginController extends GetxController with DioCancelableMixin {
       SPUtil.putInt(AppConstant.storageIsAdmin, state.loginOptionPosition);
     }
 
-    if (ConfigService.to.selectCountry.value == 2) {
+    if (ConfigService.to.selectCountry.value == 1) {
+      //去新加坡首页
+      ComponentRouterServices.sgService.startSGMainPage();
+    } else if (ConfigService.to.selectCountry.value == 2) {
       //去英国首页
       ComponentRouterServices.ukService.startUKMainPage();
     } else {
-      //去新加坡首页
-      ComponentRouterServices.authService.startPopAllMainPage();
+      //去越南首页
+      ComponentRouterServices.vnService.startVNMainPage();
     }
   }
 

packages/cpt_auth/lib/modules/login/login_page.dart

@@ -106,7 +106,7 @@ class _LoginPageState extends BaseState<LoginPage, LoginController> with StateLi
                               ? "Singapore".tr
                               : ConfigService.to.selectCountry.value == 2
                                   ? "United Kingdom".tr
-                                  : "Singapore".tr,
+                                  : "Vietnam".tr,
                           textColor: ColorConstants.white,
                           isFontMedium: true,
                           marginRight: 5,

packages/cpt_auth/lib/modules/select_country/select_country_controller.dart

@@ -20,8 +20,8 @@ class SelectCountryController extends GetxController {
       //英国
       baseUrl = ApiConstants.ukBaseUrl;
     } else {
-      //默认无效-还是新加坡
-      baseUrl = ApiConstants.sgBaseUrl;
+      //默认是越南
+      baseUrl = ApiConstants.vnBaseUrl;
     }
 
     Log.d("当前选择的国家：$country 当前要切换的域名为：$baseUrl");

packages/cpt_auth/lib/modules/select_country/select_country_page.dart

@@ -154,6 +154,37 @@ class SelectCountryPage extends BaseStatelessPage<SelectCountryController> {
                         ConfigService.to.selectCountry.value = 2;
                       }),
 
+                      //越南
+                      Container(
+                        width: double.infinity,
+                        margin: const EdgeInsets.only(top: 13.5, left: 20, right: 20),
+                        padding: const EdgeInsets.symmetric(vertical: 13, horizontal: 17),
+                        decoration: BoxDecoration(
+                          color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
+                          borderRadius: BorderRadius.circular(5.0), // 设置圆角
+                        ),
+                        child: Row(
+                          children: [
+                            const MyAssetImage(Assets.cptAuthVnIcon, width: 50, height: 33),
+                            MyTextView(
+                              "Vietnam".tr,
+                              marginLeft: 17,
+                              textColor: ColorConstants.white,
+                              isFontMedium: true,
+                              fontSize: 18,
+                            ).expanded(),
+                            Obx(() {
+                              return Visibility(
+                                visible: ConfigService.to.selectCountry.value == 0,
+                                child: const MyAssetImage(Assets.cptAuthCheckedIcon, width: 22, height: 22),
+                              );
+                            }),
+                          ],
+                        ),
+                      ).onTap(() {
+                        ConfigService.to.selectCountry.value = 0;
+                      }),
+
                       //Next按钮
                       Stack(
                         children: [

packages/cpt_auth/lib/router/auth_service_impl.dart

@@ -1,5 +1,4 @@
 import 'package:cpt_auth/modules/login/login_page.dart';
-import 'package:cpt_auth/modules/main/main_page.dart';
 import 'package:cpt_auth/modules/reset_psd/reset_psd_page.dart';
 import 'package:cpt_auth/modules/setting/setting_page.dart';
 import 'package:plugin_basic/basic_export.dart';
@@ -39,11 +38,6 @@ class AuthServiceImpl extends GetxService implements AuthService {
     ResetPasswordPage.startInstance();
   }
 
-  //启动首页页面并关闭其他全部页面
-  @override
-  void startPopAllMainPage() {
-    MainPage.startWithPopAll();
-  }
 
   @override
   void startSettingPage() {

packages/cpt_auth/lib/router/page_router.dart

@@ -5,17 +5,11 @@ import 'package:get/get.dart';
 import 'package:router/path/router_path.dart';
 
 import '../modules/login/login_page.dart';
-import '../modules/main/main_page.dart';
 import '../modules/reset_psd/reset_psd_page.dart';
 import '../modules/select_country/select_country_page.dart';
 
 class AuthPageRouter {
   static final routes = [
-    //首页
-    GetPage(
-      name: RouterPath.main,
-      page: () => MainPage(),
-    ),
 
     //登录
     GetPage(

packages/cpt_job/.gitignore

@@ -1,31 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-*.lock
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Visual Studio Code related
-.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-proguardMapping.txt

packages/cpt_job/lib/router/job_service_impl.dart

@@ -1,40 +0,0 @@
-import 'package:cpt_job/modules/job_list/job_list_page.dart';
-import 'package:plugin_basic/basic_export.dart';
-import 'package:router/componentRouter/job_service.dart';
-import 'package:shared/utils/log_utils.dart';
-
-import '../modules/attendance_review_list/attendance_review_page.dart';
-import '../modules/sign_in_sign_out/sign_in_sign_out_page.dart';
-
-class JobServiceImpl extends GetxService implements JobService {
-  @override
-  void onInit() {
-    super.onInit();
-    //初始化资源
-    Log.d("JobServiceImpl 初始化资源");
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    //销毁资源
-    Log.d("JobServiceImpl 销毁资源");
-  }
-
-  // 启动签到签出页面
-  @override
-  void startSignInSignOutPage() {
-    SignInSignOutPage.startInstance();
-  }
-
-  @override
-  void startJobListPage() {
-    JobListPage.startInstance();
-  }
-
-  @override
-  void startAttendanceReviewPage() {
-    AttendanceReviewPage.startInstance();
-  }
-
-}

packages/cpt_job/lib/router/page_router.dart

@@ -1,71 +0,0 @@
-import 'package:cpt_job/modules/applied_staff_detail/applied_staff_detail_page.dart';
-import 'package:cpt_job/modules/applied_staff_reviews/applied_staff_reviews_page.dart';
-import 'package:cpt_job/modules/applied_workflow/applied_workflow_page.dart';
-import 'package:cpt_job/modules/job_applied/job_applied_page.dart';
-import 'package:cpt_job/modules/job_applied_edit/job_applied_edit_page.dart';
-import 'package:get/get.dart';
-import 'package:router/path/router_path.dart';
-
-import '../modules/attendance_review_list/attendance_review_page.dart';
-import '../modules/job_list/job_list_page.dart';
-import '../modules/job_list_detail/job_list_detail_page.dart';
-import '../modules/sign_in_sign_out/sign_in_sign_out_page.dart';
-
-class JobPageRouter {
-  static final routes = [
-    //签到签出
-    GetPage(
-      name: RouterPath.jobSignInSignOut,
-      page: () => SignInSignOutPage(),
-    ),
-
-    //工作列表
-    GetPage(
-      name: RouterPath.jobList,
-      page: () => JobListPage(),
-    ),
-
-    //工作列表详情
-    GetPage(
-      name: RouterPath.jobListDetail,
-      page: () => JobListDetailPage(),
-    ),
-
-    //工作已申请列表
-    GetPage(
-      name: RouterPath.jobAppliedStaffList,
-      page: () => JobAppliedPage(),
-    ),
-
-    //工作已申请列表
-    GetPage(
-      name: RouterPath.jobAppliedStaffWorkflow,
-      page: () => AppliedWorkflowPage(),
-    ),
-
-    //编辑申请
-    GetPage(
-      name: RouterPath.jobAppliedStaffEdit,
-      page: () => JobAppliedEditPage(),
-    ),
-
-    //员工详情
-    GetPage(
-      name: RouterPath.jobAppliedStaffDetail,
-      page: () => AppliedStaffDetailPage(),
-    ),
-
-    //员工评价
-    GetPage(
-      name: RouterPath.jobAppliedStaffReviews,
-      page: () => AppliedStaffReviewsPage(),
-    ),
-
-    //工作考勤的审核列表
-    GetPage(
-      name: RouterPath.jobAttendanceReviewList,
-      page: () => AttendanceReviewPage(),
-    ),
-
-  ];
-}

packages/cpt_job/pubspec.yaml

@@ -1,40 +0,0 @@
-name: cpt_job
-description: 默认越南的工作模块
-
-version: 1.0.0
-
-environment:
-  sdk: '>=3.0.2 <4.0.0'
-
-dependencies:
-
-  flutter_localizations:
-    sdk: flutter
-
-  flutter:
-    sdk: flutter
-
-  #基础组件的依赖
-  domain:
-    path: ../cs_domain
-
-  plugin_basic:
-    path: ../cs_plugin_basic
-
-  plugin_platform:
-    path: ../cs_plugin_platform
-
-  shared:
-    path: ../cs_shared
-
-  cs_resources:
-    path: ../cs_resources
-
-  router:
-    path: ../cs_router
-
-  widgets:
-    path: ../cs_widgets
-
-flutter:
-  uses-material-design: true

packages/cpt_job/pubspec_overrides.yaml

@@ -1,16 +0,0 @@
-# melos_managed_dependency_overrides: cs_resources,domain,plugin_basic,plugin_platform,router,shared,widgets
-dependency_overrides:
-  cs_resources:
-    path: ../cs_resources
-  domain:
-    path: ../cs_domain
-  plugin_basic:
-    path: ../cs_plugin_basic
-  plugin_platform:
-    path: ../cs_plugin_platform
-  router:
-    path: ../cs_router
-  shared:
-    path: ../cs_shared
-  widgets:
-    path: ../cs_widgets

packages/cpt_job_sg/.gitignore

@@ -1,31 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-*.lock
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Visual Studio Code related
-.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-proguardMapping.txt

packages/cpt_job_sg/lib/router/job_sg_service_impl.dart

@@ -1,30 +0,0 @@
-import 'package:cpt_job_sg/modules/revise_list/revise_list_page.dart';
-import 'package:plugin_basic/basic_export.dart';
-import 'package:router/componentRouter/job_sg_service.dart';
-
-import '../modules/job_applied/job_applied_page.dart';
-
-class JobSGServiceImpl extends GetxService implements JobSGService {
-  @override
-  void onInit() {
-    super.onInit();
-    //初始化资源
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    //销毁资源
-  }
-
-  @override
-  void startJobAppliedPage(String? jobId,void Function(dynamic value)? cb) {
-    JobAppliedPage.startInstance(jobId,cb);
-  }
-
-  @override
-  void startReviseListPage() {
-    ReviseListPage.startInstance();
-  }
-
-}

packages/cpt_job_sg/lib/router/page_router.dart

@@ -1,58 +0,0 @@
-import 'package:cpt_job_sg/modules/revise_list/revise_list_page.dart';
-import 'package:cpt_job_sg/modules/revise_log/revise_log_page.dart';
-import 'package:get/get.dart';
-import 'package:router/path/router_path.dart';
-
-import '../modules/applied_staff/applied_staff_page.dart';
-import '../modules/applied_staff_detail/applied_staff_detail_page.dart';
-import '../modules/applied_staff_reviews/applied_staff_reviews_page.dart';
-import '../modules/job_applied/job_applied_page.dart';
-import '../modules/revise_add_edit/revise_add_edit_page.dart';
-import '../modules/revise_applied/revise_applied_page.dart';
-
-class JobPageSGRouter {
-  static final routes = [
-    // 工作列表 （新加坡）
-    // 新加坡工作列表已申请列表
-    GetPage(
-      name: RouterPath.jobListAppliedSG,
-      page: () => JobAppliedPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.jobListAppliedStaffListSG,
-      page: () => AppliedStaffPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.jobListAppliedStaffDetailSG,
-      page: () => AppliedStaffDetailPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.jobListAppliedStaffReviewSG,
-      page: () => AppliedStaffReviewsPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.reviseListSG,
-      page: () => ReviseListPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.reviseLogSG,
-      page: () => ReviseLogPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.reviseEditSG,
-      page: () => ReviseAddEditPage(),
-    ),
-
-    GetPage(
-      name: RouterPath.reviseAppliedSG,
-      page: () => ReviseAppliedPage(),
-    ),
-
-  ];
-}

packages/cpt_job_sg/pubspec_overrides.yaml

@@ -1,16 +0,0 @@
-# melos_managed_dependency_overrides: cs_resources,domain,plugin_basic,plugin_platform,router,shared,widgets
-dependency_overrides:
-  cs_resources:
-    path: ../cs_resources
-  domain:
-    path: ../cs_domain
-  plugin_basic:
-    path: ../cs_plugin_basic
-  plugin_platform:
-    path: ../cs_plugin_platform
-  router:
-    path: ../cs_router
-  shared:
-    path: ../cs_shared
-  widgets:
-    path: ../cs_widgets

packages/cpt_labour/.gitignore

@@ -1,31 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-*.lock
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Visual Studio Code related
-.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-proguardMapping.txt

packages/cpt_labour/lib/router/labour_service_impl.dart

@@ -1,40 +0,0 @@
-import 'package:cpt_labour/modules/labour_review_list/labour_review_page.dart';
-import 'package:plugin_basic/basic_export.dart';
-import 'package:router/componentRouter/labour_service.dart';
-import 'package:shared/utils/log_utils.dart';
-
-import '../modules/labour_request_list/labour_request_list_page.dart';
-import '../modules/labour_template_list/labour_template_list_page.dart';
-
-class LabourServiceImpl extends GetxService implements LabourService {
-
-  @override
-  void startLabourRequestPage() {
-    LabourRequestListPage.startInstance();
-  }
-
-  @override
-  void startLabourTemplatePage() {
-    LabourTemplateListPage.startInstance();
-  }
-
-  @override
-  void startLabourReviewPage() {
-    LabourReviewPage.startInstance();
-  }
-
-  @override
-  void onInit() {
-    super.onInit();
-    //初始化资源
-    Log.d("LabourServiceImpl 初始化资源");
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    //销毁资源
-    Log.d("LabourServiceImpl 销毁资源");
-  }
-
-}

packages/cpt_labour/lib/router/page_router.dart

@@ -1,66 +0,0 @@
-
-import 'package:get/get.dart';
-import 'package:router/path/router_path.dart';
-import '../modules/labour_request_add/labour_request_add_page.dart';
-import '../modules/labour_request_list/labour_request_list_page.dart';
-import '../modules/labour_request_workflow/labour_request_workflow_page.dart';
-import '../modules/labour_review_edit/labour_review_edit_page.dart';
-import '../modules/labour_review_list/labour_review_page.dart';
-import '../modules/labour_review_workflow/labour_request_workflow_page.dart';
-import '../modules/labour_template_add/labour_template_add_page.dart';
-import '../modules/labour_template_list/labour_template_list_page.dart';
-
-class LabourPageRouter {
-
-  static final routes = [
-
-    //用工请求列表
-    GetPage(
-      name: RouterPath.jobLabourRequestList,
-      page: () => LabourRequestListPage(),
-    ),
-
-    //用工请求添加
-    GetPage(
-      name: RouterPath.jobLabourRequestAdd,
-      page: () => LabourRequestAddPage(),
-    ),
-
-    //用工请求状态修改工作流
-    GetPage(
-      name: RouterPath.jobLabourRequestWorkflow,
-      page: () => LabourRequestWorkflowPage(),
-    ),
-
-    //用工请求状态修改工作流
-    GetPage(
-      name: RouterPath.labourTemplateList,
-      page: () => LabourTemplateListPage(),
-    ),
-
-    //用工请求状态修改工作流
-    GetPage(
-      name: RouterPath.labourTemplateAdd,
-      page: () => LabourTemplateAddPage(),
-    ),
-
-    //用工请求审核列表
-    GetPage(
-      name: RouterPath.labourReviewList,
-      page: () => LabourReviewPage(),
-    ),
-
-    //用工请求审核编辑
-    GetPage(
-      name: RouterPath.labourReviewEdit,
-      page: () => LabourReviewEditPage(),
-    ),
-
-    //用工请求审核工作流
-    GetPage(
-      name: RouterPath.labourReviewWorkflow,
-      page: () => LabourReviewWorkflowPage(),
-    ),
-
-  ];
-}

packages/cpt_labour/pubspec_overrides.yaml

@@ -1,16 +0,0 @@
-# melos_managed_dependency_overrides: cs_resources,domain,plugin_basic,plugin_platform,router,shared,widgets
-dependency_overrides:
-  cs_resources:
-    path: ../cs_resources
-  domain:
-    path: ../cs_domain
-  plugin_basic:
-    path: ../cs_plugin_basic
-  plugin_platform:
-    path: ../cs_plugin_platform
-  router:
-    path: ../cs_router
-  shared:
-    path: ../cs_shared
-  widgets:
-    path: ../cs_widgets

packages/cpt_labour_sg/lib/router/labour_sg_service_impl.dart

@@ -1,35 +0,0 @@
-import 'package:cpt_labour_sg/modules/job_list/job_list_page.dart';
-import 'package:cpt_labour_sg/modules/job_title_list/job_title_list_page.dart';
-import 'package:plugin_basic/basic_export.dart';
-import 'package:router/componentRouter/labour_sg_service.dart';
-
-import '../modules/labour_request_list/labour_request_list_page.dart';
-
-class LabourSGServiceImpl extends GetxService implements LabourSGService {
-  @override
-  void onInit() {
-    super.onInit();
-    //初始化资源
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    //销毁资源
-  }
-
-  @override
-  void startLabourRequestPage() {
-    LabourRequestListPage.startInstance();
-  }
-
-  @override
-  void startJobTitlePage() {
-    JobTitleListPage.startInstance();
-  }
-
-  @override
-  void startJobListPage() {
-    JobListPage.startInstance();
-  }
-}

packages/cpt_labour_sg/lib/router/page_router.dart

@@ -1,68 +0,0 @@
-
-import 'package:cpt_labour_sg/modules/job_template_add/job_template_add_page.dart';
-import 'package:cpt_labour_sg/modules/job_template_list/job_template_list_page.dart';
-import 'package:cpt_labour_sg/modules/job_title_list/job_title_list_page.dart';
-import 'package:get/get.dart';
-import 'package:router/path/router_path.dart';
-
-import '../modules/job_list/job_list_page.dart';
-import '../modules/job_list_edit/job_list_edit_page.dart';
-import '../modules/labour_request_add/labour_request_add_page.dart';
-import '../modules/labour_request_edit/labour_request_edit_page.dart';
-import '../modules/labour_request_list/labour_request_list_page.dart';
-
-
-class LabourSGPageRouter {
-
-  static final routes = [
-
-    // 工作标题列表
-    GetPage(
-      name: RouterPath.jobTitleListSG,
-      page: () => JobTitleListPage(),
-    ),
-
-    // 工作模板列表
-    GetPage(
-      name: RouterPath.jobTemplateListSG,
-      page: () => JobTemplateListPage(),
-    ),
-
-    // 添加模板
-    GetPage(
-      name: RouterPath.jobTemplateAddSG,
-      page: () => JobTemplateAddPage(),
-    ),
-
-    // 用工的编辑
-    GetPage(
-      name: RouterPath.labourRequestEditSG,
-      page: () => LabourRequestEditPage(),
-    ),
-
-    // 用工请求
-    GetPage(
-      name: RouterPath.labourRequestSG,
-      page: () => LabourRequestListPage(),
-    ),
-
-    // 用工请求添加
-    GetPage(
-      name: RouterPath.labourRequestAddSG,
-      page: () => LabourRequestAddPage(),
-    ),
-
-    // 新加坡工作列表
-    GetPage(
-      name: RouterPath.jobListSG,
-      page: () => JobListPage(),
-    ),
-
-    // 新加坡工作列表编辑
-    GetPage(
-      name: RouterPath.jobListEditSG,
-      page: () => JobListEditPage(),
-    ),
-
-  ];
-}

packages/cpt_labour_sg/pubspec.yaml

@@ -1,40 +0,0 @@
-name: cpt_labour_sg
-description: 指定的新加坡用工模块
-
-version: 1.0.0
-
-environment:
-  sdk: '>=3.0.2 <4.0.0'
-
-dependencies:
-
-  flutter_localizations:
-    sdk: flutter
-
-  flutter:
-    sdk: flutter
-
-  #基础组件的依赖
-  domain:
-    path: ../cs_domain
-
-  plugin_basic:
-    path: ../cs_plugin_basic
-
-  plugin_platform:
-    path: ../cs_plugin_platform
-
-  shared:
-    path: ../cs_shared
-
-  cs_resources:
-    path: ../cs_resources
-
-  router:
-    path: ../cs_router
-
-  widgets:
-    path: ../cs_widgets
-
-flutter:
-  uses-material-design: true

packages/cpt_report/lib/router/page_router.dart

@@ -1,50 +0,0 @@
-import 'package:cpt_report/modules/device_list/device_list_page.dart';
-import 'package:cpt_report/modules/report_finance/report_finance_page.dart';
-import 'package:cpt_report/modules/report_labour/report_labour_page.dart';
-import 'package:cpt_report/modules/report_list/report_list_page.dart';
-import 'package:cpt_report/modules/report_staff_request/report_staff_request_page.dart';
-import 'package:get/get.dart';
-import 'package:router/path/router_path.dart';
-
-import '../modules/report_labour_vn/report_labour_vn_page.dart';
-
-class ReportPageRouter {
-  static final routes = [
-    //设备列表
-    GetPage(
-      name: RouterPath.deviceList,
-      page: () => DeviceListPage(),
-    ),
-
-    //报表列表
-    GetPage(
-      name: RouterPath.reportList,
-      page: () => ReportListPage(),
-    ),
-
-    //财务报表
-    GetPage(
-      name: RouterPath.reportFinance,
-      page: () => ReportFinancePage(),
-    ),
-
-    //员工申请
-    GetPage(
-      name: RouterPath.reportStaffRequest,
-      page: () => ReportStaffRequestPage(),
-    ),
-
-    //用工统计
-    GetPage(
-      name: RouterPath.reportCasualLabour,
-      page: () => ReportLabourPage(),
-    ),
-
-    //用工统计（越南单独页面）
-    GetPage(
-      name: RouterPath.reportLabourVN,
-      page: () => ReportLabourVNPage(),
-    ),
-
-  ];
-}

packages/cpt_report/lib/router/report_service_impl.dart

@@ -1,29 +0,0 @@
-import 'package:cpt_report/modules/device_list/device_list_page.dart';
-import 'package:cpt_report/modules/report_list/report_list_page.dart';
-import 'package:plugin_basic/basic_export.dart';
-import 'package:router/componentRouter/report_service.dart';
-
-class ReportServiceImpl extends GetxService implements ReportService {
-
-  @override
-  void onInit() {
-    super.onInit();
-    //初始化资源
-  }
-
-  @override
-  void onClose() {
-    super.onClose();
-    //销毁资源
-  }
-
-  @override
-  void startDeviceListPage() {
-    DeviceListPage.startInstance();
-  }
-
-  @override
-  void startReportMainPage() {
-    ReportListPage.startInstance();
-  }
-}

packages/cpt_report/pubspec.yaml

@@ -1,40 +0,0 @@
-name: cpt_report
-description: ProfileComponent Profile-Me组件
-
-version: 1.0.0
-
-environment:
-  sdk: '>=3.0.2 <4.0.0'
-
-dependencies:
-
-  flutter_localizations:
-    sdk: flutter
-
-  flutter:
-    sdk: flutter
-
-  #基础组件的依赖
-  domain:
-    path: ../cs_domain
-
-  plugin_basic:
-    path: ../cs_plugin_basic
-
-  plugin_platform:
-    path: ../cs_plugin_platform
-
-  shared:
-    path: ../cs_shared
-
-  cs_resources:
-    path: ../cs_resources
-
-  router:
-    path: ../cs_router
-
-  widgets:
-    path: ../cs_widgets
-
-flutter:
-  uses-material-design: true

packages/cpt_job_sg/lib/modules/job_applied/job_applied_controller.dart

@@ -1,5 +1,3 @@
-import 'package:cpt_job_sg/modules/applied_staff/applied_staff_page.dart';
-import 'package:cpt_job_sg/modules/revise_applied/revise_applied_page.dart';
 import 'package:domain/entity/response/job_applied_edit_index_s_g_entity.dart';
 import 'package:domain/entity/response/job_applied_list_s_g_entity.dart';
 import 'package:domain/repository/job_sg_repository.dart';
@@ -22,7 +20,9 @@ import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/picker/option_pick_util.dart';
 import 'package:widgets/widget_export.dart';
 
+import '../applied_staff/applied_staff_page.dart';
 import '../applied_staff_detail/applied_staff_detail_page.dart';
+import '../revise_applied/revise_applied_page.dart';
 import 'applied_staff_reviews.dart';
 import 'dialog_applied_butch_modify.dart';
 import 'dialog_applied_modify.dart';

packages/cpt_job_sg/lib/modules/revise_add_edit/revise_add_edit_page.dart

@@ -1,4 +1,3 @@
-import 'package:cpt_job_sg/modules/revise_add_edit/revise_add_edit_item.dart';
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -21,6 +20,7 @@ import 'package:widgets/shatter/round_my_text_field.dart';
 import 'package:widgets/widget_export.dart';
 
 import 'revise_add_edit_controller.dart';
+import 'revise_add_edit_item.dart';
 import 'revise_add_edit_state.dart';
 
 /**

packages/cpt_job_sg/lib/modules/revise_applied/revise_applied_controller.dart

@@ -1,4 +1,3 @@
-import 'package:cpt_job_sg/modules/revise_add_edit/revise_add_edit_page.dart';
 import 'package:domain/entity/response/revise_list_s_g_entity.dart';
 import 'package:domain/repository/job_sg_repository.dart';
 import 'package:get/get.dart';
@@ -10,6 +9,7 @@ import 'package:widgets/dialog/app_default_dialog.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/widget_export.dart';
 
+import '../revise_add_edit/revise_add_edit_page.dart';
 import '../revise_log/revise_log_page.dart';
 import 'revise_applied_state.dart';
 

packages/cpt_job_sg/lib/modules/revise_list/revise_list_controller.dart

@@ -1,4 +1,3 @@
-import 'package:cpt_job_sg/modules/revise_add_edit/revise_add_edit_page.dart';
 import 'package:domain/entity/response/revise_index_s_g_entity.dart';
 import 'package:domain/entity/response/revise_list_s_g_entity.dart';
 import 'package:domain/repository/job_sg_repository.dart';
@@ -13,6 +12,7 @@ import 'package:widgets/dialog/app_default_dialog.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/widget_export.dart';
 
+import '../revise_add_edit/revise_add_edit_page.dart';
 import '../revise_log/revise_log_page.dart';
 import 'revise_list_filter.dart';
 import 'revise_list_state.dart';

packages/cpt_job_sg/lib/modules/revise_list/revise_list_page.dart

@@ -18,7 +18,7 @@ import 'revise_list_item.dart';
 import 'revise_list_controller.dart';
 import 'revise_list_state.dart';
 
-/**
+/*
  * Revise的全部列表
  */
 class ReviseListPage extends BaseStatefulPage<ReviseListController> {

packages/cpt_labour_sg/lib/modules/job_list/job_list_controller.dart

@@ -1,4 +1,4 @@
-import 'package:cpt_labour_sg/modules/labour_request_add/labour_request_add_page.dart';
+import 'package:cpt_sg/modules/job/job_applied/job_applied_page.dart';
 import 'package:domain/entity/response/job_list_index_s_g_entity.dart';
 import 'package:domain/entity/response/job_list_s_g_entity.dart';
 import 'package:domain/repository/labour_sg_repository.dart';
@@ -15,6 +15,7 @@ import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../job_list_edit/job_list_edit_page.dart';
+import '../labour_request_add/labour_request_add_page.dart';
 import 'job_list_filter.dart';
 import 'job_list_state.dart';
 
@@ -199,7 +200,7 @@ class JobListController extends GetxController with DioCancelableMixin {
 
   /// 去已申请的成员列表
   void gotoJobAppliedPage(int index) {
-    ComponentRouterServices.jobSGService.startJobAppliedPage(state.datas[index].jobId, (result) {
+    JobAppliedPage.startInstance(state.datas[index].jobId, (result) {
       if (result is String?) {
         //添加成功之后刷新
         fetchItemByIdAndRefreshItem(result ?? "");

packages/cpt_labour_sg/lib/modules/job_template_add/job_template_add_controller.dart

@@ -1,4 +1,3 @@
-import 'package:cpt_labour_sg/modules/job_template_list/add_edit_template.dart';
 import 'package:domain/entity/response/job_template_edit_index_entity.dart';
 import 'package:domain/repository/labour_sg_repository.dart';
 import 'package:get/get.dart';