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

lib/controller/mine/auth_controller.dart

@@ -110,6 +110,7 @@ class AuthController extends GetxController {
       // 处理响应
       if (response.data.isSuccess) {
         GlobalData().userData!.identityCard = idcard.value;
+        GlobalData().userData!.name = name.value;
         SmartDialog.showToast('认证成功');
         if(type == 1){
           // 进入认证成功之后的下一个页面;

lib/controller/setting/spread_controller.dart

@@ -5,9 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
-
-import '../../generated/assets.dart';
 
 class SpreadController extends GetxController with WidgetsBindingObserver {
 
@@ -44,7 +41,7 @@ class SpreadController extends GetxController with WidgetsBindingObserver {
         button.value = '立即续费';
       }
     } else if(activePay.value == 0){
-      button.value = canApply ? '立即加入' : '去相亲';
+      button.value = canApply ? '免费加入' : '去相亲';
     } else {
       button.value = '立即加入';
     }
@@ -182,6 +179,11 @@ class SpreadController extends GetxController with WidgetsBindingObserver {
         } else {
           matchmakerOrderType = 3;
         }
+      } else {
+        await _userApi.applyMatchmaker({
+          "phone": GlobalData().userData!.phone,
+          "name": GlobalData().userData!.name
+        });
       }
       final response = await _userApi.submitMatchmakerOrder({
         "productSpecId": roseList[activePay.value].productSpecId,
@@ -209,7 +211,6 @@ class SpreadController extends GetxController with WidgetsBindingObserver {
         SmartDialog.showToast(response.data.message ?? '网络异常');
       }
     } catch (e) {
-      print('玫瑰列表获取失败: $e');
       SmartDialog.showToast('下单失败');
     }
   }

lib/model/mine/user_data.dart

@@ -4,7 +4,7 @@ import 'package:dating_touchme_app/model/home/marriage_data.dart';
 class UserData {
   String? id;
   String? nickName;
-  final String? name;
+  String? name;
   String? profilePhoto;
   String? identityCard;
   int? genderCode;

lib/network/api_urls.dart

@@ -108,4 +108,6 @@ class ApiUrls {
   static const String submitMatchmakerOrder = 'dating-agency-mall/user/submit/matchmaker-order';
   static const String kickingRtcChannelUser =
       'dating-agency-chat-audio/user/kicking/rtc-channel-user';
+  static const String applyMatchmaker =
+      'dating-agency-uec/user/apply/matchmaker';
 }

lib/network/user_api.dart

@@ -218,4 +218,9 @@ abstract class UserApi {
         @Query('pageSize') required int pageSize,
       }
   );
+
+  @POST(ApiUrls.applyMatchmaker)
+  Future<HttpResponse<BaseResponse<dynamic>>> applyMatchmaker(
+      @Body() Map<String, dynamic> data,
+  );
 }

lib/network/user_api.g.dart

@@ -1340,6 +1340,40 @@ class _UserApi implements UserApi {
     return httpResponse;
   }
 
+  @override
+  Future<HttpResponse<BaseResponse<dynamic>>> applyMatchmaker(
+    Map<String, dynamic> data,
+  ) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(data);
+    final _options = _setStreamType<HttpResponse<BaseResponse<dynamic>>>(
+      Options(method: 'POST', headers: _headers, extra: _extra)
+          .compose(
+            _dio.options,
+            'dating-agency-uec/user/apply/matchmaker',
+            queryParameters: queryParameters,
+            data: _data,
+          )
+          .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
+    );
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<dynamic> _value;
+    try {
+      _value = BaseResponse<dynamic>.fromJson(
+        _result.data!,
+        (json) => json as dynamic,
+      );
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    final httpResponse = HttpResponse(_value, _result);
+    return httpResponse;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||