diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
new file mode 100644
index 0000000..45922a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.SearchWorkOrderActivity">
+
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
new file mode 100644
index 0000000..45922a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.SearchWorkOrderActivity">
+
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 469789d..fa627da 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,8 @@
     android:orientation="vertical"
     android:weightSum="4">
 
+    <include layout="@layout/include_base_title" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/homeRecyclerView"
         android:layout_width="match_parent"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
new file mode 100644
index 0000000..45922a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.SearchWorkOrderActivity">
+
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 469789d..fa627da 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,8 @@
     android:orientation="vertical"
     android:weightSum="4">
 
+    <include layout="@layout/include_base_title" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/homeRecyclerView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index f37f35f..0a89b13 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -3,76 +3,85 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
-    android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/userDetailLayout"
-        style="@style/itemLayoutStyle">
-
-        <TextView
-            android:id="@+id/userNameView"
-            style="@style/textViewStyle"
-            android:text="@string/app_name" />
-
-        <ImageView style="@style/rightImageStyle" />
-    </RelativeLayout>
+    <include layout="@layout/include_base_title" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:background="@color/mainBackColor"
+        android:orientation="vertical"
+        android:padding="@dimen/dp_10">
 
         <RelativeLayout
-            android:id="@+id/helpCenterLayout"
+            android:id="@+id/userDetailLayout"
             style="@style/itemLayoutStyle">
 
             <TextView
+                android:id="@+id/userNameView"
                 style="@style/textViewStyle"
-                android:text="帮助中心" />
+                android:text="@string/app_name" />
 
             <ImageView style="@style/rightImageStyle" />
         </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@drawable/bg_layout"
+            android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/customerServiceLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/helpCenterLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="联系客服" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="帮助中心" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/updateVersionLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/customerServiceLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="版本更新" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="联系客服" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/aboutUsLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/updateVersionLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="关于我们" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="版本更新" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/dividerViewStyle" />
+
+            <RelativeLayout
+                android:id="@+id/aboutUsLayout"
+                style="@style/itemLayoutStyle">
+
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="关于我们" />
+
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
new file mode 100644
index 0000000..45922a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.SearchWorkOrderActivity">
+
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 469789d..fa627da 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,8 @@
     android:orientation="vertical"
     android:weightSum="4">
 
+    <include layout="@layout/include_base_title" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/homeRecyclerView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index f37f35f..0a89b13 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -3,76 +3,85 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
-    android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/userDetailLayout"
-        style="@style/itemLayoutStyle">
-
-        <TextView
-            android:id="@+id/userNameView"
-            style="@style/textViewStyle"
-            android:text="@string/app_name" />
-
-        <ImageView style="@style/rightImageStyle" />
-    </RelativeLayout>
+    <include layout="@layout/include_base_title" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:background="@color/mainBackColor"
+        android:orientation="vertical"
+        android:padding="@dimen/dp_10">
 
         <RelativeLayout
-            android:id="@+id/helpCenterLayout"
+            android:id="@+id/userDetailLayout"
             style="@style/itemLayoutStyle">
 
             <TextView
+                android:id="@+id/userNameView"
                 style="@style/textViewStyle"
-                android:text="帮助中心" />
+                android:text="@string/app_name" />
 
             <ImageView style="@style/rightImageStyle" />
         </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@drawable/bg_layout"
+            android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/customerServiceLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/helpCenterLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="联系客服" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="帮助中心" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/updateVersionLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/customerServiceLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="版本更新" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="联系客服" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/aboutUsLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/updateVersionLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="关于我们" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="版本更新" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/dividerViewStyle" />
+
+            <RelativeLayout
+                android:id="@+id/aboutUsLayout"
+                style="@style/itemLayoutStyle">
+
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="关于我们" />
+
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml
index 61a4490..7015d7b 100644
--- a/app/src/main/res/layout/fragment_notice.xml
+++ b/app/src/main/res/layout/fragment_notice.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7e6f01..e81feb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity android:name=".view.WellDetailActivity" />
         <activity android:name=".view.WellMonitorActivity" />
         <activity android:name=".view.WellOperationActivity" />
+        <activity android:name=".view.SearchWorkOrderActivity" />
         <activity android:name=".view.WorkOrderDetailActivity" />
         <activity android:name=".view.UserDetailActivity" />
         <activity android:name=".view.ChangePasswordActivity" />
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 2aaff8c..32a6764 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -17,7 +17,6 @@
 import com.casic.app.smartwell.vm.UserDetailViewModel
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_base_title.*
 
 class MainActivity : BaseActivity() {
 
@@ -36,7 +35,7 @@
     override fun initLayoutView(): Int = R.layout.activity_main
 
     override fun setupTopBarLayout() {
-        titleView.text = "首页"
+
     }
 
     override fun initData() {
@@ -57,19 +56,15 @@
             when (menuItem.itemId) {
                 R.id.nav_home -> {
                     mainViewPager.currentItem = 0
-                    titleView.text = "首页"
                 }
                 R.id.nav_order -> {
                     mainViewPager.currentItem = 1
-                    titleView.text = "工单"
                 }
                 R.id.nav_notice -> {
                     mainViewPager.currentItem = 2
-                    titleView.text = "消息"
                 }
                 R.id.nav_mine -> {
                     mainViewPager.currentItem = 3
-                    titleView.text = "我的"
                 }
             }
             false
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
new file mode 100644
index 0000000..226d94b
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.app.smartwell.view
+
+import android.view.View
+import com.casic.app.smartwell.R
+import com.casic.app.smartwell.base.BaseActivity
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SearchWorkOrderActivity : BaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_order_search
+
+    override fun setupTopBarLayout() {
+        titleView.text = "工单查询"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
index d985854..500b6ff 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WorkOrderDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.view
 
+import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
@@ -17,6 +18,7 @@
 import com.casic.app.smartwell.vm.WellDetailViewModel
 import com.casic.app.smartwell.vm.WorkOrderDetailViewModel
 import kotlinx.android.synthetic.main.activity_order_detail.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class WorkOrderDetailActivity : BaseActivity() {
 
@@ -27,7 +29,9 @@
     override fun initLayoutView(): Int = R.layout.activity_order_detail
 
     override fun setupTopBarLayout() {
-
+        titleView.text = "工单详情"
+        leftBackView.visibility = View.VISIBLE
+        leftBackView.setOnClickListener { finish() }
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index c992283..917e20c 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -11,6 +11,7 @@
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class HomePageFragment : BaseFragment() {
 
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun initData() {
+        titleView.text = "首页"
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
         homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
index a0a31e6..80f5c04 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt
@@ -20,6 +20,7 @@
 import com.pengxh.app.multilib.base.BaseFragment
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_mine.*
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class MinePageFragment : BaseFragment() {
 
@@ -31,6 +32,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun initData() {
+        titleView.text = "我的"
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
         if (userDetailJson != "") {
             userDataModel = gson.fromJson(
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
index f8bc825..30d737b 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NoticePageFragment.kt
@@ -2,12 +2,14 @@
 
 import com.casic.app.smartwell.R
 import com.pengxh.app.multilib.base.BaseFragment
+import kotlinx.android.synthetic.main.include_base_title.*
 
 class NoticePageFragment : BaseFragment(){
+
     override fun initLayoutView(): Int = R.layout.fragment_notice
 
     override fun initData() {
-
+        titleView.text = "消息"
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
index c0df2ec..2f86d32 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt
@@ -3,7 +3,9 @@
 import androidx.fragment.app.Fragment
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.TopViewPagerAdapter
+import com.casic.app.smartwell.extensions.navigatePageTo
 import com.casic.app.smartwell.utils.Constant
+import com.casic.app.smartwell.view.SearchWorkOrderActivity
 import com.pengxh.app.multilib.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_order.*
 import java.util.*
@@ -22,6 +24,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_order
 
     override fun initData() {
+        titleView.text = "工单"
         val topViewPagerAdapter = TopViewPagerAdapter(
             childFragmentManager,
             Constant.SUB_PAGE_TITLES,
@@ -32,6 +35,8 @@
     }
 
     override fun initEvent() {
-
+        rightOptionView.setOnClickListener {
+            requireContext().navigatePageTo(SearchWorkOrderActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..f25c40a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96px"
+    android:height="96px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M918.98,822.46l-144.83,-144.9c-1.41,-1.41 -2.94,-2.82 -4.48,-4.1 101.06,-146.24 86.46,-348.29 -43.78,-478.53 -146.62,-146.62 -384.38,-146.62 -531.01,0s-146.62,384.32 0,530.94c130.24,130.18 332.22,144.83 478.59,43.78 1.34,1.54 2.69,3.07 4.1,4.48l144.9,144.83c26.82,26.88 69.89,26.69 96.51,0C945.86,892.1 945.66,849.09 918.98,822.46zM677.7,677.63c-120,119.94 -314.56,119.94 -434.5,0C123.2,557.63 123.2,363.14 243.2,243.2s314.5,-120 434.5,0C797.63,363.14 797.63,557.63 677.7,677.63z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 98adb01..a7fbbba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context=".view.MainActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <com.pengxh.app.multilib.widget.NoScrollViewPager
         android:id="@+id/mainViewPager"
         android:layout_width="match_parent"
@@ -26,5 +24,4 @@
         app:itemTextColor="@drawable/bottom_text_color"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
new file mode 100644
index 0000000..45922a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical"
+    tools:context=".view.SearchWorkOrderActivity">
+
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 469789d..fa627da 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,8 @@
     android:orientation="vertical"
     android:weightSum="4">
 
+    <include layout="@layout/include_base_title" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/homeRecyclerView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index f37f35f..0a89b13 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -3,76 +3,85 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
-    android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/userDetailLayout"
-        style="@style/itemLayoutStyle">
-
-        <TextView
-            android:id="@+id/userNameView"
-            style="@style/textViewStyle"
-            android:text="@string/app_name" />
-
-        <ImageView style="@style/rightImageStyle" />
-    </RelativeLayout>
+    <include layout="@layout/include_base_title" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:background="@color/mainBackColor"
+        android:orientation="vertical"
+        android:padding="@dimen/dp_10">
 
         <RelativeLayout
-            android:id="@+id/helpCenterLayout"
+            android:id="@+id/userDetailLayout"
             style="@style/itemLayoutStyle">
 
             <TextView
+                android:id="@+id/userNameView"
                 style="@style/textViewStyle"
-                android:text="帮助中心" />
+                android:text="@string/app_name" />
 
             <ImageView style="@style/rightImageStyle" />
         </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@drawable/bg_layout"
+            android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/customerServiceLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/helpCenterLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="联系客服" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="帮助中心" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/updateVersionLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/customerServiceLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="版本更新" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="联系客服" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
 
-        <View style="@style/dividerViewStyle" />
+            <View style="@style/dividerViewStyle" />
 
-        <RelativeLayout
-            android:id="@+id/aboutUsLayout"
-            style="@style/itemLayoutStyle">
+            <RelativeLayout
+                android:id="@+id/updateVersionLayout"
+                style="@style/itemLayoutStyle">
 
-            <TextView
-                style="@style/textViewStyle"
-                android:text="关于我们" />
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="版本更新" />
 
-            <ImageView style="@style/rightImageStyle" />
-        </RelativeLayout>
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+
+            <View style="@style/dividerViewStyle" />
+
+            <RelativeLayout
+                android:id="@+id/aboutUsLayout"
+                style="@style/itemLayoutStyle">
+
+                <TextView
+                    style="@style/textViewStyle"
+                    android:text="关于我们" />
+
+                <ImageView style="@style/rightImageStyle" />
+            </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml
index 61a4490..7015d7b 100644
--- a/app/src/main/res/layout/fragment_notice.xml
+++ b/app/src/main/res/layout/fragment_notice.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <include layout="@layout/include_base_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 06a483f..e798ed8 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -6,6 +6,30 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:background="@color/mainThemeColor">
+
+        <TextView
+            android:id="@+id/titleView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/titleFontSize" />
+
+        <ImageView
+            android:id="@+id/rightOptionView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_search_white" />
+    </RelativeLayout>
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/workOrderTabLayout"
         android:layout_width="match_parent"