diff --git a/src/App.vue b/src/App.vue
index cfec83f..6bbca27 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,8 +12,6 @@ function wrapUniTextApi() {
const rawShowToast = uni.showToast
const rawShowModal = uni.showModal
const rawShowLoading = uni.showLoading
- const rawSetNavigationBarTitle = uni.setNavigationBarTitle
- const rawSetNavigationBarColor = uni.setNavigationBarColor
uni.showToast = (options = {}) => {
const next = { ...options }
@@ -45,25 +43,6 @@ function wrapUniTextApi() {
}
return rawShowModal(next)
}
- uni.setNavigationBarTitle = (options = {}) => {
- const next = { ...options }
- if (typeof next.title === 'string') {
- next.title = translateLiteral(next.title)
- }
- const result = rawSetNavigationBarTitle(next)
- setTimeout(() => {
- const pages = getCurrentPages()
- if (pages && pages.length > 0) {
- const route = pages[pages.length - 1].route || ''
- if (route === 'pages/login') {
- rawSetNavigationBarColor({ frontColor: '#000000', backgroundColor: '#ffffff' })
- } else {
- rawSetNavigationBarColor({ frontColor: '#ffffff', backgroundColor: '#22486e' })
- }
- }
- }, 150)
- return result
- }
}
export default {
diff --git a/src/components/common/NavBar.vue b/src/components/common/NavBar.vue
new file mode 100644
index 0000000..4de5575
--- /dev/null
+++ b/src/components/common/NavBar.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+ {{ translatedTitle }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/page_record/feedingRecordForm.vue b/src/page_record/feedingRecordForm.vue
index 386563d..46b4eb5 100644
--- a/src/page_record/feedingRecordForm.vue
+++ b/src/page_record/feedingRecordForm.vue
@@ -1,5 +1,6 @@
+
@@ -52,6 +53,7 @@
diff --git a/src/pages/common/webview/index.vue b/src/pages/common/webview/index.vue
index 8388c76..3a0cdfe 100644
--- a/src/pages/common/webview/index.vue
+++ b/src/pages/common/webview/index.vue
@@ -1,11 +1,17 @@
-
-
+
+
+
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 1c839fd..aa2afe5 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,11 +1,10 @@
+
-
-
@@ -18,13 +17,18 @@
diff --git a/src/pages/work.vue b/src/pages/work.vue
index 1682fb9..26df729 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -1,14 +1,31 @@
-
-
+
+
+
+
+
+
diff --git a/src/pages_function/pages/planList/index.vue b/src/pages_function/pages/planList/index.vue
index 64e2974..df9aae7 100644
--- a/src/pages_function/pages/planList/index.vue
+++ b/src/pages_function/pages/planList/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/src/pages_function/pages/taskList/index.vue b/src/pages_function/pages/taskList/index.vue
index 7897d5e..8fd3ad8 100644
--- a/src/pages_function/pages/taskList/index.vue
+++ b/src/pages_function/pages/taskList/index.vue
@@ -1,5 +1,6 @@
+
{{ t('taskList.filter') }}
@@ -106,11 +107,12 @@ import { ref, reactive, computed, onMounted } from 'vue'
import { onReachBottom, onShow, onLoad } from '@dcloudio/uni-app'
import { useI18n } from 'vue-i18n'
import request from '@/utils/request'
-import { setNavigationTitle } from '@/locales'
+import NavBar from '@/components/common/NavBar.vue'
import { DICT_TYPE, getDictLabel, useDict } from '@/utils/dict'
const { t } = useI18n()
const { mes_task_status } = useDict(DICT_TYPE.MES_TASK_STATUS)
+const pageTitle = computed(() => t('dashboard.production'))
const statusOptions = computed(() => {
return [{ label: t('functionCommon.all'), value: '' }, ...(mes_task_status.value || [])]
@@ -261,7 +263,6 @@ onReachBottom(() => {
})
onShow(() => {
- setNavigationTitle('dashboard.productionPlan')
})
diff --git a/src/pages_mine/pages/about/index.vue b/src/pages_mine/pages/about/index.vue
index 72cd379..7c7e7c5 100644
--- a/src/pages_mine/pages/about/index.vue
+++ b/src/pages_mine/pages/about/index.vue
@@ -1,5 +1,6 @@
+