diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
index 7c3a1a1..a099415 100644
--- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
+++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
@@ -332,8 +332,9 @@ bool isSendLoging = false;
         var data = await DioManager.instance
             .post(url: Api.shieldWordCheck, params: {'text': text, 'type': 2});
         isSendLoging = false;
+        List words = [];
         if (data['data']['code'] == 10000) {
-          List words = data['data']['words'];
+          words = data['data']['words'];
           if (words.isNotEmpty) {
             for (int i = 0; i < words.length; i++) {
               text = text.replaceAll(words[i], '*');
@@ -341,10 +342,17 @@ bool isSendLoging = false;
           }
         }
 
-        MessageUtils.handleMessageError(
-            widget.model.sendTextMessage(
-                text: text, convID: widget.conversationID, convType: convType),
-            context);
+        if (words.isEmpty) {
+          MessageUtils.handleMessageError(
+              widget.model.sendTextMessage(
+                  text: text, convID: widget.conversationID, convType: convType),
+              context);
+        } else {
+          textEditingController.text = text;
+          showOKToast('含违规词汇，无法发送');
+          return;
+        }
+
       }
       textEditingController.clear();
       currentCursor = null;
diff --git a/circle_app/lib/app/login/complete_material/view.dart b/circle_app/lib/app/login/complete_material/view.dart
index 9cca0a0..c63e08f 100644
--- a/circle_app/lib/app/login/complete_material/view.dart
+++ b/circle_app/lib/app/login/complete_material/view.dart
@@ -174,9 +174,10 @@ class Complete_materialPage extends StatelessWidget {
                             left: 28.sp,
                             right: 28.sp),
                         height: 116.sp,
+                        width: Get.width - 50.sp,
                         child: Stack(
                           children: [
-                            Image.asset(getLoginImage('desc_bg')),
+                            Image.asset(getLoginImage('desc_bg'),width: Get.width - 50.sp,fit: BoxFit.fill,),
                             TextField(
                               maxLines: 4,
                               controller:
diff --git a/circle_app/lib/app/login/login/view.dart b/circle_app/lib/app/login/login/view.dart
index 4b5d5b9..bcb94a9 100644
--- a/circle_app/lib/app/login/login/view.dart
+++ b/circle_app/lib/app/login/login/view.dart
@@ -26,14 +26,14 @@ class LoginPage extends StatelessWidget {
           width: Get.width,
           height: Get.height,
         ),
-        Scaffold(
-            resizeToAvoidBottomInset: false,
-            backgroundColor: Colors.transparent,
-            body: GestureDetector(
-              onTap: () {
-                FocusManager.instance.primaryFocus?.unfocus();
-              },
-              child: GetBuilder<LoginLogic>(builder: (logic) {
+        GestureDetector(
+          onTap: () {
+            FocusManager.instance.primaryFocus?.unfocus();
+          },
+          child: Scaffold(
+              resizeToAvoidBottomInset: false,
+              backgroundColor: Colors.transparent,
+              body: GetBuilder<LoginLogic>(builder: (logic) {
                 return Stack(
                 alignment: Alignment.center,
                 children: [
@@ -287,8 +287,8 @@ class LoginPage extends StatelessWidget {
 
                 ],
                 );
-              }),
-            )),
+              })),
+        ),
       ],
     );
   }