Merge branch 'dev-2.0' of http://git.qniao.cn/dating-agency/dating_touchme_app into dev-2.0

lib/controller/mine/mine_controller.dart

@@ -8,6 +8,7 @@ import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart';
 import 'package:dating_touchme_app/pages/mine/real_name_page.dart';
 import 'package:dating_touchme_app/pages/mine/rose_page.dart';
 import 'package:dating_touchme_app/pages/mine/user_help_center_page.dart';
+import 'package:dating_touchme_app/pages/setting/match_league_page.dart';
 import 'package:dating_touchme_app/pages/setting/match_spread_page.dart';
 import 'package:dating_touchme_app/pages/setting/match_task_page.dart';
 import 'package:flutter/material.dart';
@@ -37,7 +38,7 @@ class MineController extends GetxController {
   }
 
   void registerMatch(int type) async {
-    if (GlobalData().userData!.auditProfilePhoto != null) {
+    if (!matchmakerFlag.value && GlobalData().userData!.auditProfilePhoto != null) {
       showGeneralDialog(
         context: Get.context!,
         pageBuilder: (BuildContext buildContext, Animation<double> animation,
@@ -61,7 +62,8 @@ class MineController extends GetxController {
       return;
     }
     if(type == 1){
-      await Get.to(() => MatchSpreadPage());
+      // await Get.to(() => MatchSpreadPage());
+      Get.to(() => MatchLeaguePage());
     } else if(type == 2){
       Get.to(() => MatchTaskPage());
     }

lib/pages/setting/match_task_page.dart

@@ -150,7 +150,7 @@ class TaskItem extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          TDText(item.subTaskName, style: TextStyle(color: Color(0xFF333333), fontSize: 16.w)),
+          TDText(item.subTaskDesc, style: TextStyle(color: Color(0xFF333333), fontSize: 16.w)),
           SizedBox(height: 4.w),
           TDProgress(
             type: TDProgressType.linear,