diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
index da793abc1e..68fe7170da 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
@@ -103,7 +103,7 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener {
             R.id.tv_taxi_passenger_number_second -> {selectIndex(1)}
             R.id.tv_taxi_passenger_number_third -> {selectIndex(2)}
             R.id.tv_taxi_passenger_number_fourth -> {selectIndex(3)}
-            R.id.tv_taxi_passenger_number_submit -> {checkAndCommit()}
+            R.id.tv_taxi_passenger_number_submit -> {clearNumber()}
             else -> {}
         }
     }
@@ -130,9 +130,27 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener {
                 index++
             }
             changeStyle()
+            numSelect.forEach {
+                if(it==null){
+                    return
+                }
+            }
+
+            checkAndCommit()
         }
     }
 
+    private fun clearNumber(){
+        for(i in numSelect.indices){
+            numSelect[i] = null
+        }
+        numSelectTextView.forEach {
+            it?.text = ""
+        }
+        index = 0
+        changeStyle()
+    }
+
     private fun deleteNumver() {
         if (index in 0..3) {
             if(numSelect[index]==null){
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
index e7dc22f64a..3887d99934 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
@@ -189,7 +189,7 @@
                 android:layout_marginTop="@dimen/dp_14"
                 tools:text="蘑菇 3291号为您服务"
                 android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
-                android:textSize="@dimen/dp_24"
+                android:textSize="24px"
                 app:layout_constraintStart_toStartOf="@+id/tv_small_mogo"
                 app:layout_constraintTop_toBottomOf="@+id/tv_small_mogo" />
 
@@ -198,12 +198,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_84"
-                android:layout_marginTop="@dimen/dp_129"
+                android:layout_marginTop="308px"
                 android:text="@string/taxi_p_check_input_phone_tail_title"
                 android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
-                android:textSize="@dimen/sp_36"
+                android:textSize="@dimen/dp_36"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_taxi_number" />
+                app:layout_constraintTop_toTopOf="parent" />
 
 
             <TextView
@@ -246,11 +246,12 @@
 
 
             <TextView
-                android:id="@+id/tv_taxi_passenger_number_nine"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_98"
+                android:id="@+id/tv_taxi_passenger_number_back"
+                android:layout_marginEnd="@dimen/dp_39"
+                android:layout_marginBottom="@dimen/dp_80"
                 style="@style/och_check_number_keyboard"
-                android:text="9"
+                android:text="@string/tv_delete"
+                android:textSize="@dimen/dp_36"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_zero"
                 app:layout_constraintHorizontal_chainStyle="packed"
@@ -258,81 +259,87 @@
 
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_zero"
-                android:layout_marginEnd="@dimen/dp_30"
+                android:layout_marginEnd="@dimen/dp_39"
                 android:text="0"
                 style="@style/och_check_number_keyboard"
-                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_back"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_nine"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" />
-
-            <TextView
-                android:id="@+id/tv_taxi_passenger_number_back"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:background="@drawable/bg_taxi_p_keyboard_background"
-                android:text="@string/tv_delete"
-                style="@style/och_check_number_keyboard"
-                android:textSize="@dimen/sp_36"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_submit"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_zero"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" />
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_back"
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_back" />
 
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_submit"
                 style="@style/och_check_number_keyboard"
-                android:background="@drawable/bg_taxi_p_keyboard_submit_background"
-                android:text="确定"
-                android:textColor="@color/taxi_autopilot_text_color_normal"
+                android:text="清空"
                 android:textSize="@dimen/sp_36"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_back"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" />
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_zero"
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_back" />
 
 
-            <TextView
-                android:id="@+id/tv_taxi_passenger_number_five"
-                style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_30"
-                android:text="5"
-                app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_nine"
-                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_six"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_taxi_passenger_number_six"
-                style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:text="6"
-                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_seven"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_five"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_five" />
-
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_seven"
                 style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:background="@drawable/bg_taxi_p_keyboard_background"
+                android:layout_marginEnd="@dimen/dp_39"
+                android:layout_marginBottom="24px"
                 android:text="7"
+                app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_back"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_eight"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_six"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_five" />
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_eight"
                 style="@style/och_check_number_keyboard"
+                android:layout_marginEnd="@dimen/dp_39"
                 android:text="8"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_nine"
                 app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_seven"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_five" />
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_seven" />
+
+
+            <TextView
+                android:id="@+id/tv_taxi_passenger_number_nine"
+                style="@style/och_check_number_keyboard"
+                android:text="9"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_eight"
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_seven" />
+
+            <TextView
+                android:id="@+id/tv_taxi_passenger_number_four"
+                style="@style/och_check_number_keyboard"
+                android:layout_marginEnd="@dimen/dp_39"
+                android:layout_marginBottom="24px"
+                android:text="4"
+                app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_seven"
+                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_five"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_taxi_passenger_number_five"
+                style="@style/och_check_number_keyboard"
+                android:layout_marginEnd="@dimen/dp_39"
+                android:text="5"
+                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_six"
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_four"
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_four" />
+
+            <TextView
+                android:id="@+id/tv_taxi_passenger_number_six"
+                style="@style/och_check_number_keyboard"
+                android:text="6"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_five"
+                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_four" />
 
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_one"
                 style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_30"
+                android:layout_marginEnd="@dimen/dp_39"
+                android:layout_marginBottom="24px"
                 android:text="1"
-                app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_five"
+                app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_four"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_two"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -340,7 +347,7 @@
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_two"
                 style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
+                android:layout_marginEnd="@dimen/dp_39"
                 android:text="2"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_three"
                 app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_one"
@@ -349,18 +356,9 @@
             <TextView
                 android:id="@+id/tv_taxi_passenger_number_three"
                 style="@style/och_check_number_keyboard"
-                android:layout_marginEnd="@dimen/dp_30"
                 android:text="3"
-                app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_four"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_two"
-                app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_one" />
-
-            <TextView
-                android:id="@+id/tv_taxi_passenger_number_four"
-                style="@style/och_check_number_keyboard"
-                android:text="4"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_three"
+                app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_two"
                 app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_one" />
 
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
index e50749e0fd..6776cc12e1 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
@@ -28,7 +28,7 @@
     </style>
 
     <style name="och_check_number_keyboard">
-        <item name="android:layout_width">@dimen/dp_150</item>
+        <item name="android:layout_width">@dimen/dp_212</item>
         <item name="android:layout_height">@dimen/dp_80</item>
         <item name="android:background">@drawable/bg_taxi_p_keyboard_background</item>
         <item name="android:gravity">center</item>