Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

lib/pages/personal/personal_page.dart

@@ -328,11 +328,11 @@ class _PersonalIndexState extends State<PersonalIndex>
                               children: [
                                 '我的积分'.text.size(30.sp).black.bold.make(),
                                 Spacer(),
-                                Assets.icons.intergral
-                                    .image(width: 32.w, height: 32.w),
-                                16.w.widthBox,
-                                '123'.text.size(28.sp).black.make(),
-                                16.w.widthBox,
+                                // Assets.icons.intergral
+                                //     .image(width: 32.w, height: 32.w),
+                                // 16.w.widthBox,
+                                // '123'.text.size(28.sp).black.make(),
+                                // 16.w.widthBox,
                                 Icon(
                                   CupertinoIcons.right_chevron,
                                   size: 24.w,
@@ -375,12 +375,12 @@ class _PersonalIndexState extends State<PersonalIndex>
                           _function('我的家庭', R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
                               () => MyFamilyPage(), ''),
                           36.hb,
-                          _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG,
-                              () => CarParkingPage(), ''),
-                          36.hb,
-                          _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG,
-                              () => CarManagePage(), ''),
-                          36.hb,
+                          // _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG,
+                          //     () => CarParkingPage(), ''),
+                          // 36.hb,
+                          // _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG,
+                          //     () => CarManagePage(), ''),
+                          // 36.hb,
                           _function('我的访客', R.ASSETS_ICONS_ICON_MY_VISITOR_PNG,
                               () => CarManagePage(), ''),
                           36.hb,

lib/ui/function_and_service/task/publish_task_page.dart

@@ -780,7 +780,7 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
               _content = await Get.to(() => TaskRemarkPage(
                         text: _content,
                       )) ??
-                  '';
+                  _content;
               setState(() {});
             },
             child: Material(
@@ -796,11 +796,11 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
                         .make(),
                   ),
                   Expanded(
-                    child: '${_content == null ? '请输入任务备注' : _content}'
+                    child: '${_content.isEmptyOrNull ? '请输入任务备注' : _content}'
                         .text
                         .size(28.sp)
                         .color(Colors.black
-                            .withOpacity(_rewardType == 0 ? 0.25 : 0.85))
+                            .withOpacity(_content.isEmptyOrNull ? 0.25 : 0.85))
                         .make(),
                   ),
                   20.wb,
@@ -963,11 +963,11 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
                   .color(Colors.black.withOpacity(0.45))
                   .make(),
               Spacer(),
-              '建议上传图片不超过6张'
-                  .text
-                  .size(24.sp)
-                  .color(Colors.black.withOpacity(0.25))
-                  .make(),
+              // '建议上传图片不超过6张'
+              //     .text
+              //     .size(24.sp)
+              //     .color(Colors.black.withOpacity(0.25))
+              //     .make(),
             ],
           ),
           24.w.heightBox,