diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
index bd23995..375cbd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
@@ -19,6 +19,7 @@
 import com.casic.app.smartwell.view.fragment.InHandleOrderFragment
 import com.casic.app.smartwell.vm.*
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
+import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
@@ -175,6 +176,20 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
 
+                val orderFlow = orderDetail.flow!!
+                if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
+                    transferTipsView.visibility = View.VISIBLE
+                    transferTipsView.setOnClickListener {
+                        TimeLineBottomSheet.Builder()
+                            .setContext(this)
+                            .setFlowItems(orderFlow)
+                            .build().show()
+                    }
+                } else {
+                    transferOrderButton.visibility = View.VISIBLE
+                    transferTipsView.visibility = View.GONE
+                }
                 //转单
                 transferOrderButton.setChangeAlphaWhenPress(true)
                 transferOrderButton.setOnClickListener {

diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
index bd23995..375cbd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
@@ -19,6 +19,7 @@
 import com.casic.app.smartwell.view.fragment.InHandleOrderFragment
 import com.casic.app.smartwell.vm.*
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
+import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
@@ -175,6 +176,20 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
 
+                val orderFlow = orderDetail.flow!!
+                if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
+                    transferTipsView.visibility = View.VISIBLE
+                    transferTipsView.setOnClickListener {
+                        TimeLineBottomSheet.Builder()
+                            .setContext(this)
+                            .setFlowItems(orderFlow)
+                            .build().show()
+                    }
+                } else {
+                    transferOrderButton.visibility = View.VISIBLE
+                    transferTipsView.visibility = View.GONE
+                }
                 //转单
                 transferOrderButton.setChangeAlphaWhenPress(true)
                 transferOrderButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
index 8bd9917..6f2325a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
@@ -128,6 +128,7 @@
                 //工单流转细节
                 val orderFlow = orderDetail.flow!!
                 if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
                     transferTipsView.visibility = View.VISIBLE
                     transferTipsView.setOnClickListener {
                         TimeLineBottomSheet.Builder()
@@ -136,6 +137,7 @@
                             .build().show()
                     }
                 } else {
+                    transferOrderButton.visibility = View.VISIBLE
                     transferTipsView.visibility = View.GONE
                 }
                 acceptDateView.text = orderDetail.getJobTime

diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
index bd23995..375cbd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
@@ -19,6 +19,7 @@
 import com.casic.app.smartwell.view.fragment.InHandleOrderFragment
 import com.casic.app.smartwell.vm.*
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
+import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
@@ -175,6 +176,20 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
 
+                val orderFlow = orderDetail.flow!!
+                if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
+                    transferTipsView.visibility = View.VISIBLE
+                    transferTipsView.setOnClickListener {
+                        TimeLineBottomSheet.Builder()
+                            .setContext(this)
+                            .setFlowItems(orderFlow)
+                            .build().show()
+                    }
+                } else {
+                    transferOrderButton.visibility = View.VISIBLE
+                    transferTipsView.visibility = View.GONE
+                }
                 //转单
                 transferOrderButton.setChangeAlphaWhenPress(true)
                 transferOrderButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
index 8bd9917..6f2325a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
@@ -128,6 +128,7 @@
                 //工单流转细节
                 val orderFlow = orderDetail.flow!!
                 if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
                     transferTipsView.visibility = View.VISIBLE
                     transferTipsView.setOnClickListener {
                         TimeLineBottomSheet.Builder()
@@ -136,6 +137,7 @@
                             .build().show()
                     }
                 } else {
+                    transferOrderButton.visibility = View.VISIBLE
                     transferTipsView.visibility = View.GONE
                 }
                 acceptDateView.text = orderDetail.getJobTime
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 b282abd..66f16a1 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
@@ -353,9 +353,27 @@
 
                 <RelativeLayout style="@style/itemLayoutStyle">
 
-                    <TextView
-                        style="@style/textViewStyle"
-                        android:text="接单时间" />
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingHorizontal="@dimen/dp_10">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:text="接单时间"
+                            android:textColor="@color/mainTextColor"
+                            android:textSize="@dimen/titleFontSize" />
+
+                        <ImageView
+                            android:id="@+id/transferTipsView"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:background="@drawable/ic_info"
+                            android:visibility="gone" />
+                    </LinearLayout>
 
                     <TextView
                         android:id="@+id/acceptDateView"

diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
index bd23995..375cbd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt
@@ -19,6 +19,7 @@
 import com.casic.app.smartwell.view.fragment.InHandleOrderFragment
 import com.casic.app.smartwell.vm.*
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
+import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
@@ -175,6 +176,20 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
 
+                val orderFlow = orderDetail.flow!!
+                if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
+                    transferTipsView.visibility = View.VISIBLE
+                    transferTipsView.setOnClickListener {
+                        TimeLineBottomSheet.Builder()
+                            .setContext(this)
+                            .setFlowItems(orderFlow)
+                            .build().show()
+                    }
+                } else {
+                    transferOrderButton.visibility = View.VISIBLE
+                    transferTipsView.visibility = View.GONE
+                }
                 //转单
                 transferOrderButton.setChangeAlphaWhenPress(true)
                 transferOrderButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
index 8bd9917..6f2325a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt
@@ -128,6 +128,7 @@
                 //工单流转细节
                 val orderFlow = orderDetail.flow!!
                 if (orderFlow.size != 0) {
+                    transferOrderButton.visibility = View.GONE
                     transferTipsView.visibility = View.VISIBLE
                     transferTipsView.setOnClickListener {
                         TimeLineBottomSheet.Builder()
@@ -136,6 +137,7 @@
                             .build().show()
                     }
                 } else {
+                    transferOrderButton.visibility = View.VISIBLE
                     transferTipsView.visibility = View.GONE
                 }
                 acceptDateView.text = orderDetail.getJobTime
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 b282abd..66f16a1 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
@@ -353,9 +353,27 @@
 
                 <RelativeLayout style="@style/itemLayoutStyle">
 
-                    <TextView
-                        style="@style/textViewStyle"
-                        android:text="接单时间" />
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingHorizontal="@dimen/dp_10">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:text="接单时间"
+                            android:textColor="@color/mainTextColor"
+                            android:textSize="@dimen/titleFontSize" />
+
+                        <ImageView
+                            android:id="@+id/transferTipsView"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:background="@drawable/ic_info"
+                            android:visibility="gone" />
+                    </LinearLayout>
 
                     <TextView
                         android:id="@+id/acceptDateView"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 35cd7e6..cd56a65 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -75,9 +75,9 @@
         android:id="@+id/currentStateView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_10"
         android:drawablePadding="@dimen/dp_5"
         android:gravity="center_vertical"
+        android:paddingVertical="@dimen/dp_10"
         android:text="@string/app_name"
         android:textColor="@color/mainThemeColor"
         app:drawableStartCompat="@mipmap/clock" />