From b6cef16f356c81342d790b5a008023128b7ea16b Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Mon, 14 Aug 2023 10:07:16 +0300
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=98=E5=88=86=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E6=98=BE=E7=A4=BA=E5=9F=8E=E5=B8=82=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle_app/lib/app/login/login/logic.dart |  8 +++++++-
 circle_app/lib/main.dart                  | 21 +++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/circle_app/lib/app/login/login/logic.dart b/circle_app/lib/app/login/login/logic.dart
index 6638178..7af4980 100644
--- a/circle_app/lib/app/login/login/logic.dart
+++ b/circle_app/lib/app/login/login/logic.dart
@@ -6,6 +6,7 @@ import 'package:circle_app/util/util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -60,8 +61,9 @@ class LoginLogic extends GetxController {
     var data = await DioManager.instance.post(
         url: Api.sendCode, params: {"phone": phoneEditingController.text});
     var bean = BaseResponse<Data>.fromJson(data, (data) => Data.fromJson(data));
-    showOKToast(bean.msg);
+
     if (bean.code == 200) {
+      showOKToast('发送成功！');
       if (kDebugMode) {
         print("验证码：${bean.data!.code}");
         // codeEditingController.text = bean.data!.code.toString();
@@ -77,6 +79,8 @@ class LoginLogic extends GetxController {
         }
         update();
       });
+    } else {
+      showOKToast(bean.msg);
     }
   }
 
@@ -100,10 +104,12 @@ class LoginLogic extends GetxController {
       showOKToast('请勾选同意用户协议和隐私协议');
       return;
     }
+    SmartDialog.showLoading(msg: '正在登录中...');
     var data = await DioManager.instance.post(url: Api.login, params: {
       "phone": phoneEditingController.text,
       "code": codeEditingController.text
     });
+    SmartDialog.dismiss();
     var bean = BaseResponse<LoginData>.fromJson(
         data, (data) => LoginData.fromJson(data));
     if (bean.code == 200) {
diff --git a/circle_app/lib/main.dart b/circle_app/lib/main.dart
index e15151f..7a38728 100644
--- a/circle_app/lib/main.dart
+++ b/circle_app/lib/main.dart
@@ -112,14 +112,9 @@ createCustomMsg(String userId, String imId) async {
     );
     if (data['code'] == 200) {
       String desc = '';
+      String cityStr = '';
       Map<String, dynamic> info = {};
-      if (data['data']['both_cities'] != null) {
-        List city = data['data']['both_cities'];
-        print('城市'+city.toString());
-        if (city.isNotEmpty) {
-          desc = '你们都在$city留下过足迹';
-        }
-      }
+
       if (data['data']['both_interests'] != null) {
         List<dynamic> both_interests = data['data']['both_interests'];
         List<String> circleList = [];
@@ -134,9 +129,19 @@ createCustomMsg(String userId, String imId) async {
           }
         }
       }
+
+      if (data['data']['both_cities'] != null) {
+        List city = data['data']['both_cities'];
+        print('城市'+city.toString());
+        if (city.isNotEmpty) {
+          desc = '你们都在${city.length > 1 ? city.join('、'): city.first}留下过足迹';
+          cityStr = '你们都在${city.length > 1 ? city.join('、'): city.first}留下过足迹';
+        }
+      }
+
       if (desc.isNotEmpty) {
         if (data['data']['both_cities'] != null) {
-          info['city'] = desc;
+          info['city'] = cityStr;
         }
         info['interests'] = data['data']['interests'] ?? [];
         info['guide_text'] = data['data']['guide_text'] ?? '';