修改时间小数点的问题修复

状态颜色值的修复

packages/cpt_sg/lib/modules/job/job_applied/dialog_applied_butch_modify.dart

@@ -60,11 +60,11 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
       children: [
         //Title （如果使用 Container 为最外层容器则默认为 match_parent 的效果，除非我们限制宽度和最大高度最小高度）
         Container(
-          padding: EdgeInsets.symmetric(horizontal: 16.5),
+          padding: const EdgeInsets.symmetric(horizontal: 16.5),
           width: double.infinity,
-          decoration: BoxDecoration(
+          decoration: const BoxDecoration(
             color: Colors.white,
-            borderRadius: const BorderRadius.all(Radius.circular(15)),
+            borderRadius: BorderRadius.all(Radius.circular(15)),
           ),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -89,12 +89,12 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
 
               //选择时间
               Container(
-                padding: EdgeInsets.only(left: 16, right: 10),
-                margin: EdgeInsets.only(top: 10),
+                padding: const EdgeInsets.only(left: 16, right: 10),
+                margin: const EdgeInsets.only(top: 10),
                 height: 45,
-                decoration: BoxDecoration(
+                decoration: const BoxDecoration(
                   color: ColorConstants.grayECECEC,
-                  borderRadius: const BorderRadius.all(Radius.circular(5)),
+                  borderRadius: BorderRadius.all(Radius.circular(5)),
                 ),
                 child: Row(
                   mainAxisSize: MainAxisSize.max,
@@ -109,7 +109,7 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                       isFontMedium: true,
                       textColor: ColorConstants.black33,
                     ).expanded(),
-                    MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                    const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                   ],
                 ),
               ).onTap(() {
@@ -127,12 +127,12 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
 
               //选择结束日期
               Container(
-                padding: EdgeInsets.only(left: 16, right: 10),
-                margin: EdgeInsets.only(top: 10),
+                padding: const EdgeInsets.only(left: 16, right: 10),
+                margin: const EdgeInsets.only(top: 10),
                 height: 45,
-                decoration: BoxDecoration(
+                decoration: const BoxDecoration(
                   color: ColorConstants.grayECECEC,
-                  borderRadius: const BorderRadius.all(Radius.circular(5)),
+                  borderRadius: BorderRadius.all(Radius.circular(5)),
                 ),
                 child: Row(
                   mainAxisSize: MainAxisSize.max,
@@ -147,7 +147,7 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                       isFontMedium: true,
                       textColor: ColorConstants.black33,
                     ).expanded(),
-                    MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                    const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                   ],
                 ),
               ).onTap(() {
@@ -169,25 +169,25 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                   "hour",
                   "",
                   hintText: "Enter...".tr,
-                  hintStyle: TextStyle(
+                  hintStyle: const TextStyle(
                     color: ColorConstants.gray88,
                     fontSize: 14,
                     fontWeight: FontWeight.w400,
                   ),
                   controller: hourController,
                   focusNode: hourFocusNode,
-                  margin: EdgeInsets.only(left: 0, right: 0, top: 8),
+                  margin: const EdgeInsets.only(left: 0, right: 0, top: 8),
                   showDivider: false,
                   fillBackgroundColor: ColorConstants.grayECECEC,
                   fillCornerRadius: 5,
-                  padding: EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 0),
+                  padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 0),
                   height: 40,
-                  style: TextStyle(
+                  style: const TextStyle(
                     color: ColorConstants.black33,
                     fontSize: 14,
                     fontWeight: FontWeight.w400,
                   ),
-                  inputType: TextInputType.numberWithOptions(signed: false, decimal: true),
+                  inputType: const TextInputType.numberWithOptions(decimal: true, signed: false),
                   textInputAction: TextInputAction.next,
                   enabled: true,
                   onSubmit: (key, value) {},
@@ -207,12 +207,12 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
               ),
 
               Container(
-                padding: EdgeInsets.only(left: 16, right: 10),
-                margin: EdgeInsets.only(top: 10),
+                padding: const EdgeInsets.only(left: 16, right: 10),
+                margin: const EdgeInsets.only(top: 10),
                 height: 45,
-                decoration: BoxDecoration(
+                decoration: const BoxDecoration(
                   color: ColorConstants.grayECECEC,
-                  borderRadius: const BorderRadius.all(Radius.circular(5)),
+                  borderRadius: BorderRadius.all(Radius.circular(5)),
                 ),
                 child: Row(
                   mainAxisSize: MainAxisSize.max,
@@ -227,7 +227,7 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                       isFontMedium: true,
                       textColor: ColorConstants.black33,
                     ).expanded(),
-                    MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                    const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                   ],
                 ),
               ).onTap(() {
@@ -236,8 +236,8 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
 
               //分割线
               Container(
-                margin: EdgeInsets.only(top: 25),
-                color: Color(0XFFCECECE),
+                margin: const EdgeInsets.only(top: 25),
+                color: const Color(0XFFCECECE),
                 height: 0.5,
               ),
               Row(
@@ -253,13 +253,13 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                           fontSize: 17.5,
                           isFontMedium: true,
                           textAlign: TextAlign.center,
-                          textColor: Color(0XFF0085C4),
+                          textColor: const Color(0XFF0085C4),
                           cornerRadius: 3,
                           borderWidth: 1,
                         ),
                       )),
                   Container(
-                    color: Color(0xff09141F).withOpacity(0.13),
+                    color: const Color(0xff09141F).withOpacity(0.13),
                     width: 0.5,
                   ),
                   Expanded(
@@ -276,7 +276,7 @@ class _DialogAppliedButchModifyState extends State<DialogAppliedButchModify> {
                           fontSize: 17.5,
                           isFontMedium: true,
                           textAlign: TextAlign.center,
-                          textColor: Color(0XFF0085C4),
+                          textColor: const Color(0XFF0085C4),
                           cornerRadius: 3,
                         ),
                       )),

packages/cpt_th/lib/modules/job_er/applied_er_edit/applied_er_edit_page.dart

@@ -409,7 +409,7 @@ class _JobAppliedEditState extends BaseState<AppliedErEditPage, AppliedErEditCon
                         height: 45,
                         fillBackgroundColor: const Color(0xFF4DCFF6).withOpacity(0.2),
                         enabled: true,
-                        textInputType: TextInputType.number,
+                        textInputType: const TextInputType.numberWithOptions(decimal: true, signed: false),
                         formData: state.formData,
                         textInputAction: TextInputAction.done,
                         onSubmit: (key, value) {

packages/cpt_th/lib/modules/job_er/job_list_er/job_list_er_item.dart

@@ -194,11 +194,13 @@ class JobListErItem extends StatelessWidget {
                 isFontRegular: true,
                 textColor: "Completed" == item.statusShow
                     ? ColorConstants.textGreen05DC82
-                    : "Cancelled" == item.statusShow
-                        ? ColorConstants.textRedFF6262
-                        : "Revised" == item.statusShow || "Pending" == item.statusShow
-                            ? ColorConstants.textYellowFFBB1B
-                            : ColorConstants.textBlue06D9FF,
+                    : "Cancelled" == item.statusShow || "Rejected" == item.statusShow
+                    ? ColorConstants.textRedFF6262
+                    : "Revised" == item.statusShow || "Pending" == item.statusShow
+                    ? ColorConstants.textYellowFFBB1B
+                    : "Approved" == item.statusShow
+                    ? ColorConstants.textYellowFFF600
+                    : ColorConstants.textBlue06D9FF,
                 fontSize: 14,
               ).expanded(),
             ],

packages/cpt_th/lib/modules/labour/labour_request_list/labour_request_item.dart

@@ -224,13 +224,15 @@ class LabourRequestItem extends StatelessWidget {
                     item.statusShow == null ? "" : item.statusShow!.tr,
                     marginLeft: 5,
                     isFontRegular: true,
-                    textColor: "Approved" == item.statusShow
+                    textColor: "Completed" == item.statusShow
                         ? ColorConstants.textGreen05DC82
-                        : "Rejected" == item.statusShow
-                            ? ColorConstants.textRedFF6262
-                            : "Recall" == item.statusShow
-                                ? ColorConstants.textYellowFFBB1B
-                                : ColorConstants.textBlue06D9FF,
+                        : "Cancelled" == item.statusShow || "Rejected" == item.statusShow
+                        ? ColorConstants.textRedFF6262
+                        : "Revised" == item.statusShow || "Pending" == item.statusShow
+                        ? ColorConstants.textYellowFFBB1B
+                        : "Approved" == item.statusShow
+                        ? ColorConstants.textYellowFFF600
+                        : ColorConstants.textBlue06D9FF,
                     fontSize: 14,
                   ),
                   Visibility(

packages/cpt_th/lib/modules/labour/labour_review_list/labour_review_item.dart

@@ -159,12 +159,14 @@ class LabourReviewItem extends StatelessWidget {
                     item.statusShow == null ? "" : item.statusShow!.tr,
                     marginLeft: 5,
                     isFontRegular: true,
-                    textColor: "Approved" == item.statusShow
+                    textColor: "Completed" == item.statusShow
                         ? ColorConstants.textGreen05DC82
-                        : "Rejected" == item.statusShow
+                        : "Cancelled" == item.statusShow || "Rejected" == item.statusShow
                         ? ColorConstants.textRedFF6262
-                        : "Recall" == item.statusShow
+                        : "Revised" == item.statusShow || "Pending" == item.statusShow
                         ? ColorConstants.textYellowFFBB1B
+                        : "Approved" == item.statusShow
+                        ? ColorConstants.textYellowFFF600
                         : ColorConstants.textBlue06D9FF,
                     fontSize: 14,
                   ).expanded(),
@@ -175,7 +177,6 @@ class LabourReviewItem extends StatelessWidget {
           ).marginOnly(top:10),
 
 
-
           //按钮组
           Visibility(
             visible: true,

packages/cs_domain/lib/constants/api_constants.dart

@@ -2,7 +2,7 @@
 
 class ApiConstants {
   //当前服务器环境
-  static const isServerRelease = true;
+  static const isServerRelease = false;
 
   //新加坡的域名
   static const sgBaseUrl = isServerRelease ? 'https://casualabour.com/' : 'http://singapore-dev.casualabour.com';

packages/cs_resources/lib/constants/color_constants.dart

@@ -29,6 +29,8 @@ class ColorConstants {
   static const Color textBlackHint = Color(0xFF757575);
   static const Color textGray9EB0C1 = Color(0xFF9EB0C1);
   static const Color textYellowFFBB1B = Color(0xFFFFBB1B);
+  static const Color textYellowF8AE00 = Color(0xFFF8AE00);
+  static const Color textYellowFFF600 = Color(0xFFfff600);
   static const Color textGreen05DC82 = Color(0xFF05DC82);
   static const Color textGreen0AC074 = Color(0xFF0AC074);
   static const Color textGreen00FB92 = Color(0xFF00FB92);
@@ -36,7 +38,6 @@ class ColorConstants {
   static const Color textBlue06D9FF = Color(0xFF06D9FF);
   static const Color textBlue5CEEFF = Color(0xFF5CEEFF);
   static const Color textBlue56AAFF = Color(0xFF56AAFF);
-  static const Color textYellowF8AE00 = Color(0xFFF8AE00);
   static const Color textPurpleFF35EE = Color(0xFFFF35EE);
   static const Color redFF4066 = Color(0xFFFE4066);