Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application
-        android:label="动我"
+        android:label="趣恋恋"
         android:name="${applicationName}"
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher">

lib/controller/mine/user_controller.dart

@@ -93,6 +93,9 @@ class UserController extends GetxController {
           if(result.data.data == null){
             var information = UserData();
             information.matchmakerFlag = baseInfo.matchmakerFlag;
+            if(information.matchmakerFlag!){
+              information.matchmakerType = baseInfo.matchmakerType;
+            }
             information.realName = baseInfo.realName;
             information.phone = baseInfo.phone;
             GlobalData().userData = information;
@@ -107,6 +110,9 @@ class UserController extends GetxController {
           }
           final information = result.data.data!;
           information.matchmakerFlag = baseInfo.matchmakerFlag;
+          if(information.matchmakerFlag!){
+            information.matchmakerType = baseInfo.matchmakerType;
+          }
           information.realName = baseInfo.realName;
           information.phone = baseInfo.phone;
           GlobalData().userData = information;

lib/model/mine/user_base_data.dart

@@ -6,6 +6,7 @@ class UserBaseData {
   final String phone;
   final String realName;
   final String userId;
+  final int matchmakerType;
 
   UserBaseData({
     required this.matchmakerFlag,
@@ -14,12 +15,14 @@ class UserBaseData {
     required this.phone,
     required this.realName,
     required this.userId,
+    required this.matchmakerType,
   });
 
   // 从JSON映射创建实例
   factory UserBaseData.fromJson(Map<String, dynamic> json) {
     return UserBaseData(
       matchmakerFlag: json['matchmakerFlag'] ?? false,
+      matchmakerType: json['matchmakerType'] ?? 0,
       matchmakingCornerFlag: json['matchmakingCornerFlag'] ?? false,
       nickName: json['nickName'] ?? '',
       phone: json['phone'] ?? '',
@@ -32,6 +35,7 @@ class UserBaseData {
   Map<String, dynamic> toJson() {
     return {
       'matchmakerFlag': matchmakerFlag,
+      'matchmakerType': matchmakerType,
       'matchmakingCornerFlag': matchmakingCornerFlag,
       'nickName': nickName,
       'phone': phone,