diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index d6b6592..eb597f6 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_10"
             android:text="标题"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/codeView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index d6b6592..eb597f6 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_10"
             android:text="标题"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/codeView"
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 292fe69..e2cf675 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -17,16 +17,16 @@
             android:layout_marginStart="@dimen/dp_10"
             android:text="工单转至"
             android:textColor="@color/mainThemeColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:padding="@dimen/dp_10"
-            android:src="@drawable/ic_delete" />
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <ListView

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index d6b6592..eb597f6 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_10"
             android:text="标题"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/codeView"
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 292fe69..e2cf675 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -17,16 +17,16 @@
             android:layout_marginStart="@dimen/dp_10"
             android:text="工单转至"
             android:textColor="@color/mainThemeColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:padding="@dimen/dp_10"
-            android:src="@drawable/ic_delete" />
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <ListView
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 4a1392e..8fa77a8 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -141,7 +141,7 @@
                 android:gravity="center_vertical"
                 android:text="详细地址"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <ImageView
                 android:id="@+id/locationTipsView"

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index d6b6592..eb597f6 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_10"
             android:text="标题"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/codeView"
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 292fe69..e2cf675 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -17,16 +17,16 @@
             android:layout_marginStart="@dimen/dp_10"
             android:text="工单转至"
             android:textColor="@color/mainThemeColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:padding="@dimen/dp_10"
-            android:src="@drawable/ic_delete" />
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <ListView
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 4a1392e..8fa77a8 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -141,7 +141,7 @@
                 android:gravity="center_vertical"
                 android:text="详细地址"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <ImageView
                 android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index a8fe9f3..3a5a091 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -11,5 +11,5 @@
         android:gravity="center"
         android:text="@string/unknown"
         android:textColor="@color/subTextColor"
-        android:textSize="@dimen/titleFontSize" />
+        android:textSize="@dimen/textFontSize" />
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
index bcd9351..947ca7c 100644
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/widgets/ChangePasswordDialog.kt
@@ -72,6 +72,7 @@
                 return@setOnClickListener
             }
             listener.onConfirmClick(oldPwd, newPwd)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4d3c44d..6f6522c 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/mainTextColor"
         android:pathData="M557.26,512l248.89,-248.91a32,32 0,1 0,-45.25 -45.25L512,466.75 263.1,217.84a32,32 0,0 0,-45.26 45.25L466.74,512l-248.9,248.9a32,32 0,0 0,45.26 45.25L512,557.25l248.9,248.9a32,32 0,0 0,45.25 -45.25z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 8b2f135..3b74257 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index 45d24f5..7c98eaf 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -43,7 +43,7 @@
                             android:gravity="center_vertical"
                             android:text="现场情况"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/stateTipsView"
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 94716ff..58775d2 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 4cebb3e..aab59fe 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"
@@ -133,30 +134,30 @@
                     android:textColor="@color/mainTextColor"
                     android:textSize="@dimen/textFontSize" />
             </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="清空" />
-
-                <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: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="清空" />
+
+        <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
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 7af8ac8..06d9822 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -133,7 +133,7 @@
                             android:gravity="center_vertical"
                             android:text="详细地址"
                             android:textColor="@color/mainTextColor"
-                            android:textSize="@dimen/titleFontSize" />
+                            android:textSize="@dimen/textFontSize" />
 
                         <ImageView
                             android:id="@+id/tipsImageView"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 2793bc0..09dc038 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -16,16 +16,16 @@
             android:gravity="center"
             android:text="工单流转记录"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_delete" />
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml
index fe1d29a..6b206ec 100644
--- a/app/src/main/res/layout/dialog_cancel_alarm.xml
+++ b/app/src/main/res/layout/dialog_cancel_alarm.xml
@@ -21,7 +21,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -99,8 +99,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_pwd.xml b/app/src/main/res/layout/dialog_change_pwd.xml
index bda9d4f..ebe3e05 100644
--- a/app/src/main/res/layout/dialog_change_pwd.xml
+++ b/app/src/main/res/layout/dialog_change_pwd.xml
@@ -20,7 +20,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="修改密码"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_select_date.xml b/app/src/main/res/layout/dialog_select_date.xml
index bd0f9fc..ead448c 100644
--- a/app/src/main/res/layout/dialog_select_date.xml
+++ b/app/src/main/res/layout/dialog_select_date.xml
@@ -20,8 +20,8 @@
             android:gravity="center_horizontal"
             android:paddingVertical="@dimen/dp_10"
             android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="@dimen/titleFontSize" />
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/textFontSize" />
 
         <View
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/redTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <View
                 android:layout_width="@dimen/lineViewSize"
@@ -87,8 +87,8 @@
                 android:background="@drawable/bg_button"
                 android:gravity="center"
                 android:text="确定"
-                android:textColor="@color/buttonColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/textFontSize" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index d6b6592..eb597f6 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_10"
             android:text="标题"
             android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/codeView"
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 292fe69..e2cf675 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -17,16 +17,16 @@
             android:layout_marginStart="@dimen/dp_10"
             android:text="工单转至"
             android:textColor="@color/mainThemeColor"
-            android:textSize="@dimen/titleFontSize" />
+            android:textSize="@dimen/textFontSize" />
 
         <ImageView
             android:id="@+id/dismissView"
-            android:layout_width="@dimen/titleViewHeight"
-            android:layout_height="@dimen/titleViewHeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:padding="@dimen/dp_10"
-            android:src="@drawable/ic_delete" />
+            android:src="@drawable/ic_error" />
     </RelativeLayout>
 
     <ListView
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 4a1392e..8fa77a8 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -141,7 +141,7 @@
                 android:gravity="center_vertical"
                 android:text="详细地址"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/titleFontSize" />
+                android:textSize="@dimen/textFontSize" />
 
             <ImageView
                 android:id="@+id/locationTipsView"
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index a8fe9f3..3a5a091 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -11,5 +11,5 @@
         android:gravity="center"
         android:text="@string/unknown"
         android:textColor="@color/subTextColor"
-        android:textSize="@dimen/titleFontSize" />
+        android:textSize="@dimen/textFontSize" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 7477f33..60a5741 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -82,8 +82,7 @@
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
-            app:qmui_borderColor="@color/mainThemeColor"
-            app:qmui_borderWidth="1px" />
+            app:qmui_borderColor="@color/mainThemeColor" />
     </RelativeLayout>
 
     <RelativeLayout