diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index c4ac71a..8ff4bbb 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -114,7 +114,6 @@
                 loginViewModel.loadState.observe(this, { loginState ->
                     when (loginState) {
                         is LoadState.Success -> {
-                            "登录成功".show(this)
                             DialogHelper.dismissLoadingDialog()
                         }
                         else -> {

diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index c4ac71a..8ff4bbb 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -114,7 +114,6 @@
                 loginViewModel.loadState.observe(this, { loginState ->
                     when (loginState) {
                         is LoadState.Success -> {
-                            "登录成功".show(this)
                             DialogHelper.dismissLoadingDialog()
                         }
                         else -> {
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index 5975763..d7ce465 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,6 +27,7 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
+            "登录成功".show(BaseApplication.obtainInstance())
         } else {
             loadState.value = LoadState.Fail
             response.toErrorMessage().show(BaseApplication.obtainInstance())

diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index c4ac71a..8ff4bbb 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -114,7 +114,6 @@
                 loginViewModel.loadState.observe(this, { loginState ->
                     when (loginState) {
                         is LoadState.Success -> {
-                            "登录成功".show(this)
                             DialogHelper.dismissLoadingDialog()
                         }
                         else -> {
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index 5975763..d7ce465 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,6 +27,7 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
+            "登录成功".show(BaseApplication.obtainInstance())
         } else {
             loadState.value = LoadState.Fail
             response.toErrorMessage().show(BaseApplication.obtainInstance())
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index d32198e..858051d 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -12,7 +12,8 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -131,31 +132,32 @@
                     android:paddingHorizontal="@dimen/dp_10"
                     android:textColor="@color/mainTextColor" />
             </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
-                android:padding="@dimen/dp_20">
-
-                <Button
-                    android:id="@+id/clearButton"
-                    style="@style/WhiteButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_weight="1"
-                    android:text="清空"
-                    android:textColor="@color/mainTextColor" />
-
-                <Button
-                    android:id="@+id/searchButton"
-                    style="@style/MainButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_weight="1"
-                    android:text="查询" />
-            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_20">
+
+        <Button
+            android:id="@+id/clearButton"
+            style="@style/WhiteButtonStyle"
+            android:layout_width="0dp"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_weight="1"
+            android:text="清空"
+            android:textColor="@color/mainTextColor" />
+
+        <Button
+            android:id="@+id/searchButton"
+            style="@style/MainButtonStyle"
+            android:layout_width="0dp"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_weight="1"
+            android:text="查询" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file