diff --git a/lib/controller/setting/task_controller.dart b/lib/controller/setting/task_controller.dart
index 9edb9bf..f48316e 100644
--- a/lib/controller/setting/task_controller.dart
+++ b/lib/controller/setting/task_controller.dart
@@ -13,6 +13,7 @@ class TaskController extends GetxController {
   final weekTask = MatchmakerTask().obs;
   final monthTask = MatchmakerTask().obs;
   final loading = true.obs;
+  final isEmpty = true.obs;
 
   @override
   void onInit() {
@@ -27,15 +28,18 @@ class TaskController extends GetxController {
       final result = await _homeApi.getMatchmakerTask(taskType: 1);
       if (result.data.isSuccess && result.data.data != null) {
         dayTask.value = result.data.data!;
+        isEmpty.value = false;
       }
       final result2 = await _homeApi.getMatchmakerTask(taskType: 2);
       if (result2.data.isSuccess && result2.data.data != null) {
         weekTask.value = result2.data.data!;
+        isEmpty.value = false;
       }
       // Get.log(weekTask.value.toString());
       final result3 = await _homeApi.getMatchmakerTask(taskType: 3);
       if (result3.data.isSuccess && result3.data.data != null) {
         monthTask.value = result3.data.data!;
+        isEmpty.value = false;
       }
     } finally {
       loading.value = false;
diff --git a/lib/pages/setting/match_task_page.dart b/lib/pages/setting/match_task_page.dart
index d353d4e..e2234b1 100644
--- a/lib/pages/setting/match_task_page.dart
+++ b/lib/pages/setting/match_task_page.dart
@@ -31,7 +31,7 @@ class MatchTaskPage extends StatelessWidget {
                     padding: EdgeInsets.symmetric(vertical: 12.w, horizontal: 18.w),
                     child: Column(
                       children: [
-                        Row(
+                        if(controller.dayTask.value.taskName != null && controller.dayTask.value.taskName!.isNotEmpty)Row(
                           children: [
                             TDText(controller.dayTask.value.taskName, style: TextStyle(color: Color(0xFF333333), fontWeight: FontWeight.bold, fontSize: 16.w)),
                             SizedBox(width: 4.w),
@@ -47,8 +47,8 @@ class MatchTaskPage extends StatelessWidget {
                             TDText('任务截止时间：${controller.dayTask.value.taskEndDate}', style: TextStyle(color: Color(0xFF666666), fontSize: 16.w)),
                           ],
                         ),
-                        SizedBox(height: 12.w,),
-                        ...controller.dayTask.value.subList!.asMap().entries.map((entry){
+                        if(controller.dayTask.value.taskName != null && controller.dayTask.value.taskName!.isNotEmpty)SizedBox(height: 12.w,),
+                        if(controller.dayTask.value.taskName != null && controller.dayTask.value.taskName!.isNotEmpty)...controller.dayTask.value.subList!.asMap().entries.map((entry){
                           return TaskItem(item: entry.value);
                         }),
                         if(controller.weekTask.value.taskName != null && controller.weekTask.value.taskName!.isNotEmpty) SizedBox(height: 24.w,),
@@ -93,25 +93,40 @@ class MatchTaskPage extends StatelessWidget {
                         if(controller.monthTask.value.taskName != null && controller.monthTask.value.taskName!.isNotEmpty)...controller.monthTask.value.subList!.asMap().entries.map((entry){
                           return TaskItem(item: entry.value);
                         }),
-                        SizedBox(height: 12.w,),
-                        Row(
+                        !controller.isEmpty.value ? Column(
                           children: [
-                            TDText('注意事项', style: TextStyle(color: Color(0xFF333333), fontSize: 16.w)),
-                          ],
-                        ),
-                        SizedBox(height: 4.w,),
-                        Row(
-                          children: [
-                            Text('1.月任务未通过将受到惩罚；', style: TextStyle(fontSize: 12.w, color: Color(0xFF999999))),
-                          ],
-                        ),
-                        SizedBox(height: 4.w,),
-                        Row(
-                          children: [
-                            Text('2.任务开始时间为成为红娘的那一刻起；', style: TextStyle(fontSize: 12.w, color: Color(0xFF999999))),
+                            SizedBox(height: 12.w,),
+                            Row(
+                              children: [
+                                TDText('注意事项', style: TextStyle(color: Color(0xFF333333), fontSize: 16.w)),
+                              ],
+                            ),
+                            SizedBox(height: 4.w,),
+                            Row(
+                              children: [
+                                Text('1.月任务未通过将受到惩罚；', style: TextStyle(fontSize: 12.w, color: Color(0xFF999999))),
+                              ],
+                            ),
+                            SizedBox(height: 4.w,),
+                            Row(
+                              children: [
+                                Text('2.任务开始时间为成为红娘的那一刻起；', style: TextStyle(fontSize: 12.w, color: Color(0xFF999999))),
+                              ],
+                            ),
+                            SizedBox(height: 12.w),
                           ],
-                        ),
-                        SizedBox(height: 12.w),
+                        ) : Center(
+                          child: TDResult(
+                            icon: Column(
+                              children: [
+                                SizedBox(height: 100,),
+                                Icon(TDIcons.task_time, size: 70, color: Color(0xFFCCCCCC)),
+                                SizedBox(height: 24,),
+                              ],
+                            ),
+                            description: '暂无任务',
+                          ),
+                        )
                       ],
                     ),
                   )