返回箭头

main.js

@@ -1,108 +1,117 @@
-import Vue from 'vue'
-import App from './App'
-import store from './store' // store
-import plugins from './plugins' // plugins
-import './permission' // permission
-import {refreshToken} from "@/api/login";
-// import uView from 'uview-ui'
-import uView from '@/uni_modules/uview-ui'
-import $ from '@/pages/common/fun.js'
-import {
-	showConfirm,
-} from '@/utils/common'
-import {	
-	getRefreshToken,	
-	getExpiresTime,
-	setToken
-} from '@/utils/auth'
-// 在main.js中注册全局组件
-import isLodingModel from './components/loading/loading.vue'
-Vue.component('isLodingModel', isLodingModel)
-// import navInfo from "@/pagesA/components/my-nav/nav.vue"
-// Vue.component('navInfo', navInfo)
-Vue.use(uView)
-Vue.use(plugins)
-Vue.config.productionTip = false
-Vue.prototype.$store = store
-Vue.prototype.$ = $
-Vue.prototype.$screenHeight = uni.getSystemInfoSync().windowHeight
-App.mpType = 'app'
-const app = new Vue({
-	...App
-})
-app.$mount()
-var rsing=0
-// rs()
-// let isrefresh=false
-// function rs(){
-// 	const nowTime = new Date().getTime()
-// 	if (rsing==0 && nowTime > (getExpiresTime()-10*1000)&& !isrefresh) {
-// 		refreshToken({
-// 			refreshToken: getRefreshToken()
-// 		}).then((res) => {
-// 			setToken(res.data)
-// 			 isrefresh = true; // 设置标志变量为 true
-// 			rsing=0
-// 			setTimeout(function() {
-// 				isrefresh = false;
-// 			}, 11 * 1000)
-// 		}).catch(() => {
-// 			showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
-// 				if (res.confirm) {
-// 					uni.navigateTo({
-// 						url: '/pages/login'
-// 					})
-// 				}
-// 			})
-// 		})
-// 	}
-// 	 setTimeout(function(){
-// 		 rs()
-// 	 },1*1000)
-// }
-// 判断是否断网的函数
-function isOffline() {
-  return !navigator.onLine;
-}
-
-// 监听断网事件
-window.addEventListener('offline', function() {
-  if (isOffline()) {
-    showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then((res) => {
-      if (res.confirm) {
-        uni.navigateTo({
-          url: '/pages/login',
-        });
-      }
-    });
-  }
-});
-// #ifdef H5
-Vue.mixin({
-    mounted() {
-        if (this.isWeiXinBrowser() && !this.isCustomNav()) {
-            this.navTitle()
-        }
-    },
-    methods: {
-        isWeiXinBrowser() {
-            let ua = navigator.userAgent.toLowerCase()
-            return ua.indexOf('micromessenger') != -1
-        },
-        isCustomNav() {
-            return this.$mp && this.$mp.appOptions && this.$mp.appOptions.window && this.$mp.appOptions.window.navigationStyle === 'custom';
-        },
-        navTitle() {
-            this.$nextTick(() => {
-                let navTitleDom = document.getElementsByTagName('uni-page-head')
-                if (navTitleDom.length) {
-                    navTitleDom[0].style.display = 'none'
-                    if (typeof wx !== 'undefined' && wx.hideNavigationBarLoading) {
-                        wx.hideNavigationBarLoading()
-                    }
-                }
-            })
-        }
-    }
-})
-// #endif
+import Vue from 'vue'
+import App from './App'
+import store from './store' // store
+import plugins from './plugins' // plugins
+import './permission' // permission
+import {
+	refreshToken
+} from "@/api/login";
+// import uView from 'uview-ui'
+import uView from '@/uni_modules/uview-ui'
+import $ from '@/pages/common/fun.js'
+import {
+	showConfirm,
+} from '@/utils/common'
+import {
+	getRefreshToken,
+	getExpiresTime,
+	setToken
+} from '@/utils/auth'
+// 在main.js中注册全局组件
+import isLodingModel from './components/loading/loading.vue'
+Vue.component('isLodingModel', isLodingModel)
+// import navInfo from "@/pagesA/components/my-nav/nav.vue"
+// Vue.component('navInfo', navInfo)
+Vue.use(uView)
+Vue.use(plugins)
+Vue.config.productionTip = false
+Vue.prototype.$store = store
+Vue.prototype.$ = $
+Vue.prototype.$screenHeight = uni.getSystemInfoSync().windowHeight
+App.mpType = 'app'
+const app = new Vue({
+	...App
+})
+app.$mount()
+var rsing = 0
+// rs()
+// let isrefresh=false
+// function rs(){
+// 	const nowTime = new Date().getTime()
+// 	if (rsing==0 && nowTime > (getExpiresTime()-10*1000)&& !isrefresh) {
+// 		refreshToken({
+// 			refreshToken: getRefreshToken()
+// 		}).then((res) => {
+// 			setToken(res.data)
+// 			 isrefresh = true; // 设置标志变量为 true
+// 			rsing=0
+// 			setTimeout(function() {
+// 				isrefresh = false;
+// 			}, 11 * 1000)
+// 		}).catch(() => {
+// 			showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+// 				if (res.confirm) {
+// 					uni.navigateTo({
+// 						url: '/pages/login'
+// 					})
+// 				}
+// 			})
+// 		})
+// 	}
+// 	 setTimeout(function(){
+// 		 rs()
+// 	 },1*1000)
+// }
+// 判断是否断网的函数
+function isOffline() {
+	return !navigator.onLine;
+}
+
+// 监听断网事件
+window.addEventListener('offline', function() {
+	if (isOffline()) {
+		showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then((res) => {
+			if (res.confirm) {
+				uni.navigateTo({
+					url: '/pages/login',
+				});
+			}
+		});
+	}
+});
+// #ifdef H5
+Vue.mixin({
+	mounted() {
+		if (this.isWeiXinBrowser() && !this.isCustomNav()) {		
+			this.navTitle()
+		}
+	},
+	methods: {
+		isWeiXinBrowser() {
+			let ua = navigator.userAgent.toLowerCase()
+			return ua.indexOf('micromessenger') != -1
+		},
+		isCustomNav() {
+			return this.$mp && this.$mp.appOptions && this.$mp.appOptions.window && this.$mp.appOptions.window
+				.navigationStyle === 'custom';
+		},
+		navTitle() {
+			const currentPath = this.$route.path; 
+			this.$nextTick(() => {
+				let navTitleDom = document.getElementsByClassName('uni-page-head__title');
+				// let navTitleDoms = navTitleDom.getElementsByTagName('');
+				if (navTitleDom.length) {
+					if(currentPath == '/'||currentPath == '/pages/index' ||currentPath == '/pages/work/index'||currentPath == '/pages/mine/index'){
+						 navTitleDom[0].style.display = 'none';
+					}else{
+						navTitleDom[0].innerText = '返回';
+					}
+					if (typeof wx !== 'undefined' && wx.hideNavigationBarLoading) {
+						wx.hideNavigationBarLoading()
+					}
+				}
+			})
+		}
+	}
+})
+// #endif

pages.json

@@ -1,991 +1,991 @@
-{
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [{
-			"path": "pages/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#66c0c4"
-			}
-		}, {
-			"path": "pages/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#4cb2b6"
-				// "navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/work/index",
-			"style": {
-				"navigationBarTitleText": "工作台"
-				// "navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/mine/index",
-			"style": {
-				// 个人中心
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/mine/avatar/index",
-			"style": {
-				"navigationBarTitleText": "修改头像"
-			}
-		}, {
-			"path": "pages/mine/info/index",
-			"style": {
-				"navigationBarTitleText": "个人信息"
-			}
-		},
-		// #ifdef H5
-		{
-			"path": "pages/mine/info/edit",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-
-			}
-		}, // #endif 	
-		// #ifdef MP-WEIXIN
-		{
-			"path": "pages/mine/info/edit",
-			"style": {
-				"navigationBarTitleText": "编辑资料"
-			}
-		}, // #endif 	
-		{
-			"path": "pages/mine/pwd/index",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		}, {
-			"path": "pages/mine/setting/index",
-			"style": {
-				"navigationBarTitleText": "应用设置"
-			}
-		}, {
-			"path": "pages/mine/help/index",
-			"style": {
-				"navigationBarTitleText": "常见问题"
-			}
-		}, {
-			"path": "pages/mine/about/index",
-			"style": {
-				"navigationBarTitleText": "关于我们"
-			}
-		}, {
-			"path": "pages/s9Unit/check_active/index",
-			"style": {
-				// 主动检查
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"onReachBottomDistance": 100
-			}
-		}, {
-			"path": "pages/s9Unit/check_active/add_check/add_check",
-			"style": {
-				"navigationBarTitleText": "新增主动检查",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/personnel_permissions/index",
-			"style": {
-				"navigationBarTitleText": "人员权限管理"
-			}
-		}, {
-			"path": "pages/s9Unit/daily_inspection/index",
-			"style": {
-				"navigationBarTitleText": "每日巡检"
-			}
-		}, {
-			"path": "pages/s9Unit/historical_record/index",
-			"style": {
-				"navigationBarTitleText": "历史记录"
-			}
-		}, {
-			"path": "pages/s9Unit/task/index",
-			"style": {
-				"navigationBarTitleText": "任务管理",
-				"onReachBottomDistance": 100
-			}
-		}, {
-			"path": "pages/s9Unit/personnel_permissions/AddPersonnel/AddPersonnel",
-			"style": {
-				"navigationBarTitleText": "人员权限添加"
-			}
-		}, {
-			"path": "pages/s9Unit/personnel_permissions/Permission_setting/Permission_setting",
-			"style": {
-				"navigationBarTitleText": "人员菜单权限设置"
-				// "enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/task/task_details/task_details",
-			"style": {
-				"navigationBarTitleText": "任务管理详情"
-				// "enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/task/task_list/task_list",
-			"style": {
-				"navigationBarTitleText": "任务清单",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/historical_record/historical_details/historical_details",
-			"style": {
-				"navigationBarTitleText": "历史记录详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/daily_inspection/inspection_list/inspection_list",
-			"style": {
-				"navigationBarTitleText": "每日巡检列表",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/daily_inspection/inspection_details/inspection_details",
-			"style": {
-				"navigationBarTitleText": "每日巡检详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/check_active/check_list/check_list",
-			"style": {
-				"navigationBarTitleText": "检测项列表",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/s9Unit/check_active/check_details/check_details",
-			"style": {
-				"navigationBarTitleText": "检测详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/sign/sign",
-			"style": {
-				"navigationBarTitleText": "注册",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/bind/bind",
-			"style": {
-				"navigationBarTitleText": "绑定账号",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/getWxCode",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-		, {
-			"path": "pages/mine/instruct/instruct",
-			"style": {
-				"navigationBarTitleText": "操作说明",
-				"enablePullDownRefresh": false
-			}
-
-		}
-	],
-	"subPackages": [{
-		"root": "pagesA",
-		"pages": [{
-				"path": "fire/check_active/index",
-				"style": {
-					"navigationBarTitleText": "任务派遣"
-				}
-			}, {
-				"path": "fire/check_tasks/index",
-				"style": {
-					"navigationBarTitleText": "检查任务管理"
-				}
-			}, {
-				"path": "fire/data_statistics/index",
-				"style": {
-					"navigationBarTitleText": "数据统计"
-				}
-			}, {
-				"path": "fire/hidden_trouble/index",
-				"style": {
-					"navigationBarTitleText": "隐患管理"
-				}
-			}, {
-				"path": "fire/metting_regsiter/metting_sigin",
-				"style": {
-					"navigationBarTitleText": "会议报名"
-				},
-				"query": ["metId", "metName"]
-			},
-			{
-				"path": "fire/inspection_active/index",
-				"style": {
-					"navigationBarTitleText": "每日巡查"
-				}
-			}, {
-				"path": "fire/meeting_sign_in/index",
-				"style": {
-					"navigationBarTitleText": "会议记录"
-				}
-			}, {
-				"path": "fire/notice/index",
-				"style": {
-					"navigationBarTitleText": "通知公告查看"
-				}
-			}, {
-				"path": "fire/fire_station/index",
-				"style": {
-					"navigationBarTitleText": "微型消防站管理"
-				}
-			}, {
-				"path": "fire/personnel_permissions/index",
-				"style": {
-					"navigationBarTitleText": "人员权限管理"
-				}
-			}, {
-				"path": "fire/notice/notcice_details/notcice_details",
-				"style": {
-					"navigationBarTitleText": "",
-					// "enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "fire/notice/inform_details/inform_details",
-				"style": {
-					"navigationBarTitleText": "通知详情"
-					// "enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/meeting_sign_in/meeting_details/meeting_details",
-				"style": {
-					"navigationBarTitleText": "会议详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/inspection_active/inspection_list/inspection_list",
-				"style": {
-					"navigationBarTitleText": "每日巡查项",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/inspection_active/inspection_details/inspection_details",
-				"style": {
-					"navigationBarTitleText": "每日巡查详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_active/check_list/check_list",
-				"style": {
-					"navigationBarTitleText": "任务详情",
-					// "navigationStyle": "custom",	
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#f5f7f9"
-				}
-			}, {
-				"path": "fire/check_active/check_details/check_details",
-				"style": {
-					"navigationBarTitleText": "主动检查详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_active/add_check/add_check",
-				"style": {
-					"navigationBarTitleText": "添加/修改任务",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_tasks/tasks_details/tasks_details",
-				"style": {
-					"navigationBarTitleText": "检查任务详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/inspection_active/inspection_hislist/inspection_hislist",
-				"style": {
-					"navigationBarTitleText": "每日检查详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/hidden_trouble/trouble_details/trouble_details",
-				"style": {
-					// 隐患详情
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "fire/hidden_trouble/trouble_solve/trouble_solve",
-				"style": {
-					"navigationBarTitleText": "解决隐患",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_station/add_fireStation/add_fireStation",
-				"style": {
-					"navigationBarTitleText": "新增微型消防站",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_station/edit_fireStation/edit_fireStation",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_station/people_fireStation/people_fireStation",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				},
-				"query": ["addId"]
-			}, {
-				"path": "fire/fire_station/fireStation_details/fireStation_details",
-				"style": {
-					// 微型消防站详情
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "fire/check_active/check_implement/check_implement",
-				"style": {
-					"navigationBarTitleText": "完成任务",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_active/check_implement_detail/check_implement_detail",
-				"style": {
-					"navigationBarTitleText": "每日巡查详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/unit_info/index",
-				"style": {
-					"navigationBarTitleText": "单位信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/unit_info/unit_info_details/unit_info_details",
-				"style": {
-					"navigationBarTitleText": "单位信息详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/unit_info/edit_unit_info/edit_unit_info",
-				"style": {
-					"navigationBarTitleText": "编辑单位信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/unit_info/add_unit_info/add_unit_info",
-				"style": {
-					"navigationBarTitleText": "添加单位信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/architecture/index",
-				"style": {
-					"navigationBarTitleText": "单位建筑",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/architecture/architecture_details/architecture_details",
-				"style": {
-					"navigationBarTitleText": "查看单位建筑信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/architecture/add_architecture/add_architecture",
-				"style": {
-					"navigationBarTitleText": "新增单位建筑",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/architecture/edit_architecture/edit_architecture",
-				"style": {
-					"navigationBarTitleText": "编辑单位建筑信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_device/index",
-				"style": {
-					"navigationBarTitleText": "消防设施",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_device/edit_device/edit_device",
-				"style": {
-					"navigationBarTitleText": "编辑消防设施信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fire_device/add_device/add_device",
-				"style": {
-					"navigationBarTitleText": "添加消防设施",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/staff_info/add_staff/add_staff",
-				"style": {
-					"navigationBarTitleText": "添加人员信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/staff_info/edit_staff/edit_staff",
-				"style": {
-					"navigationBarTitleText": "编辑人员信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/staff_info/staff_details/staff_details",
-				"style": {
-					"navigationBarTitleText": "人员信息详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/staff_info/index",
-				"style": {
-					"navigationBarTitleText": "人员信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/drill/add_drill/add_drill",
-				"style": {
-					"navigationBarTitleText": "添加培训演练信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/drill/edit_drill/edit_drill",
-				"style": {
-					"navigationBarTitleText": "编辑培训演练信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/drill/drill_details/drill_details",
-				"style": {
-					"navigationBarTitleText": "培训演练信息详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/drill/index",
-				"style": {
-					"navigationBarTitleText": "单位培训演练",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/notice/instruct/instruct",
-				"style": {
-					"navigationBarTitleText": "指令查看",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/personnel_permissions/editUser/editUser",
-				"style": {
-					"navigationBarTitleText": "编辑用户信息",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/personnel_permissions/roleUser/roleUser",
-				"style": {
-					"navigationBarTitleText": "用户角色管理",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/personnel_permissions/editRole/editRole",
-				"style": {
-					"navigationBarTitleText": "编辑角色",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/personnel_permissions/menuRole/menuRole",
-				"style": {
-					"navigationBarTitleText": "分配角色菜单",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/hidden_trouble/troble_treatment/troble_treatment",
-				"style": {
-					"navigationBarTitleText": "隐患处理",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/nav",
-				"style": {
-					"navigationBarTitleText": "消防工作档案",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 1
-			{
-				"path": "fire/archive/index1",
-				"style": {
-					"navigationBarTitleText": "居民住宅区物业服务企业消防工作基本情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive1",
-				"style": {
-					"navigationBarTitleText": "添加居民住宅区物业服务企业消防工作",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive1",
-				"style": {
-					"navigationBarTitleText": "编辑居民住宅区物业服务企业消防工作",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details1",
-				"style": {
-					"navigationBarTitleText": "居民住宅区物业服务企业消防工作详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 2
-			{
-				"path": "fire/archive/index2",
-				"style": {
-					"navigationBarTitleText": "居（村）民委员会消防工作基本情况登记表",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive2",
-				"style": {
-					"navigationBarTitleText": "添加居民委员会消防工作基本情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive2",
-				"style": {
-					"navigationBarTitleText": "编辑居民委员会消防工作基本情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details2",
-				"style": {
-					"navigationBarTitleText": "居民委员会消防工作情况详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 3 勿删
-			{
-				"path": "fire/archive/index3",
-				"style": {
-					"navigationBarTitleText": "乡镇（街道）监督管理单位（场所）消防安全基本情况登记表",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive3",
-				"style": {
-					"navigationBarTitleText": "添加监督管理单位消防安全基本情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive3",
-				"style": {
-					"navigationBarTitleText": "编辑监督管理单位消防安全基本情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details3",
-				"style": {
-					"navigationBarTitleText": "监督管理单位消防安全情况详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 4
-			{
-				"path": "fire/archive/index4",
-				"style": {
-					"navigationBarTitleText": "乡镇（街道）火灾事故情况登记表",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive4",
-				"style": {
-					"navigationBarTitleText": "添加火灾事故情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive4",
-				"style": {
-					"navigationBarTitleText": "编辑火灾事故情况",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details4",
-				"style": {
-					"navigationBarTitleText": "火灾事故情况详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 5
-			{
-				"path": "fire/archive/index5",
-				"style": {
-					"navigationBarTitleText": "乡镇（街道）消防工作办公室消防安全检查台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive5",
-				"style": {
-					"navigationBarTitleText": "添加乡镇消防工作办公室消防安全检查台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive5",
-				"style": {
-					"navigationBarTitleText": "编辑乡镇消防工作办公室消防安全检查台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details5",
-				"style": {
-					"navigationBarTitleText": "消防工作办公室消防安全检查台账详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			// 6
-			{
-				"path": "fire/archive/index6",
-				"style": {
-					"navigationBarTitleText": "乡镇（街道）消防宣传教育台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/add_archive/add_archive6",
-				"style": {
-					"navigationBarTitleText": "添加乡镇消防宣传教育台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/edit_archive/edit_archive6",
-				"style": {
-					"navigationBarTitleText": "编辑乡镇消防宣传教育台账",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/archive/archive_details/archive_details6",
-				"style": {
-					"navigationBarTitleText": "消防乡镇宣传教育台账详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/hidden_trouble/trouble_xf_deetails/trouble_xf_deetails",
-				"style": {
-					// 隐患详情
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "fire/auditRecord/auditRecord",
-				"style": {
-					"navigationBarTitleText": "检查记录",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/check_inspection/check_inspection",
-				"style": {
-					"navigationBarTitleText": "主动检查",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/check_inspection/inspect_detail/inspect_detail",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/add_fireRun/fireRun",
-				"style": {
-					"navigationBarTitleText": "微型消防站运行",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/add_fireRun/add_fireEvent/add_fireEvent",
-				"style": {
-					"navigationBarTitleText": "微型消防站事件",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/unit_info/org_report/org_report",
-				"style": {
-					"navigationBarTitleText": "维保报告列表",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/zlgztzs/zlgztzs",
-				"style": {
-					"navigationBarTitleText": "责令改正通知书",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/zlgztzs/see_zlgztzs/see_zlgztzs",
-				"style": {
-					"navigationBarTitleText": "责令改正通知书详情",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/fire_inspetItem",
-				"style": {
-					"navigationBarTitleText": "消防检查项目",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetCzfpczl",
-				"style": {
-					"navigationBarTitleText": "出租房排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetDpccdtfpczl",
-				"style": {
-					"navigationBarTitleText": "电瓶车充电停放排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetDypczl",
-				"style": {
-					"navigationBarTitleText": "电源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetHypczl",
-				"style": {
-					"navigationBarTitleText": "火源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetQypczl",
-				"style": {
-					"navigationBarTitleText": "气源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetTsrqbf",
-				"style": {
-					"navigationBarTitleText": "特殊人群帮扶",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetXfsssbpczl",
-				"style": {
-					"navigationBarTitleText": "消防设施设备排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetXftdpczl",
-				"style": {
-					"navigationBarTitleText": "消防通道排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/streetXfxcjypxyl",
-				"style": {
-					"navigationBarTitleText": "消防宣传教育培训演练",
-					"enablePullDownRefresh": false
-				}
-
-			},
-			//新增编辑街道
-			{
-				"path": "fire/fire_inspetItem/add-street/streetCzfpczl",
-				"style": {
-					"navigationBarTitleText": "出租房排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetDpccdtfpczl",
-				"style": {
-					"navigationBarTitleText": "电瓶车充电停放排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetDypczl",
-				"style": {
-					"navigationBarTitleText": "电源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetHypczl",
-				"style": {
-					"navigationBarTitleText": "火源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetQypczl",
-				"style": {
-					"navigationBarTitleText": "气源排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetTsrqbf",
-				"style": {
-					"navigationBarTitleText": "特殊人群帮扶",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetXfsssbpczl",
-				"style": {
-					"navigationBarTitleText": "消防设施设备排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetXftdpczl",
-				"style": {
-					"navigationBarTitleText": "消防通道排查治理",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "fire/fire_inspetItem/add-street/streetXfxcjypxyl",
-				"style": {
-					"navigationBarTitleText": "消防宣传教育培训演练",
-					"enablePullDownRefresh": false
-				}
-
-			},
-			//消防设施维护和检测
-			{
-				"path": "fire/fpd_detection/fpd_detection",
-				"style": {
-					"navigationBarTitleText": "消防设施维护和检测",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "fire/fpd_detection/add_detection/add_detection",
-				"style": {
-					"navigationBarTitleText": "新增消防设施维护和检测",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "fire/fpd_detection/detection_details/detection_details",
-				"style": {
-					"navigationBarTitleText": "消防设施维护和检测详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "fire/fpd_detection/edit_detection/edit_detection",
-				"style": {
-					"navigationBarTitleText": "修改消防设施维护和检测",
-					"enablePullDownRefresh": false
-				}
-			}
-
-		]
-
-
-	}, {
-		"root": "pagesB",
-		"pages": [{
-				"path": "fire/fireSpecial/index",
-				"style": {
-					"navigationBarTitleText": "特种作业人员"
-				}
-			}, {
-				"path": "fire/fireWork/index",
-				"style": {
-					"navigationBarTitleText": "动火审批",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/fireSpecial/addSpecial/index",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_record/personnel_record/personnel_record",
-				"style": {
-					"navigationBarTitleText": "人员记录查看",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "fire/check_record/picture/picture",
-				"style": {
-					"navigationBarTitleText": "历史记录详情",
-					"enablePullDownRefresh": false
-					// "navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "fire/check_record/index",
-				"style": {
-					"navigationBarTitleText": "历史记录"
-				}
-			}, {
-				"path": "fire/fireWork/addWork/index",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			}
-		]
-	}],
-	
-	"tabBar": {
-		"color": "#000000",
-		"selectedColor": "#000000",
-		"borderStyle": "white",
-		"backgroundColor": "#ffffff",
-		"list": [{
-			"pagePath": "pages/index",
-			"iconPath": "static/images/tabbar/home.png",
-			"selectedIconPath": "static/images/tabbar/home_.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/work/index",
-			"iconPath": "static/images/tabbar/work.png",
-			"selectedIconPath": "static/images/tabbar/work_.png",
-			"text": "工作台"
-		}, {
-			"pagePath": "pages/mine/index",
-			"iconPath": "static/images/tabbar/mine.png",
-			"selectedIconPath": "static/images/tabbar/mine_.png",
-			"text": "我的"
-		}]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "RuoYi",
-		"navigationBarBackgroundColor": "#FFFFFF"
-	}
+{
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#66c0c4"
+			}
+		}, {
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#4cb2b6"
+				// "navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/work/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+				// "navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/mine/index",
+			"style": {
+				// 个人中心
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/mine/avatar/index",
+			"style": {
+				"navigationBarTitleText": "修改头像"
+			}
+		}, {
+			"path": "pages/mine/info/index",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		},
+		// #ifdef H5
+		{
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+
+			}
+		}, // #endif 	
+		// #ifdef MP-WEIXIN
+		{
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "编辑资料"
+			}
+		}, // #endif 	
+		{
+			"path": "pages/mine/pwd/index",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		}, {
+			"path": "pages/mine/setting/index",
+			"style": {
+				"navigationBarTitleText": "应用设置"
+			}
+		}, {
+			"path": "pages/mine/help/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		}, {
+			"path": "pages/mine/about/index",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		}, {
+			"path": "pages/s9Unit/check_active/index",
+			"style": {
+				// 主动检查
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 100
+			}
+		}, {
+			"path": "pages/s9Unit/check_active/add_check/add_check",
+			"style": {
+				"navigationBarTitleText": "新增主动检查",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/personnel_permissions/index",
+			"style": {
+				"navigationBarTitleText": "人员权限管理"
+			}
+		}, {
+			"path": "pages/s9Unit/daily_inspection/index",
+			"style": {
+				"navigationBarTitleText": "每日巡检"
+			}
+		}, {
+			"path": "pages/s9Unit/historical_record/index",
+			"style": {
+				"navigationBarTitleText": "历史记录"
+			}
+		}, {
+			"path": "pages/s9Unit/task/index",
+			"style": {
+				"navigationBarTitleText": "任务管理",
+				"onReachBottomDistance": 100
+			}
+		}, {
+			"path": "pages/s9Unit/personnel_permissions/AddPersonnel/AddPersonnel",
+			"style": {
+				"navigationBarTitleText": "人员权限添加"
+			}
+		}, {
+			"path": "pages/s9Unit/personnel_permissions/Permission_setting/Permission_setting",
+			"style": {
+				"navigationBarTitleText": "人员菜单权限设置"
+				// "enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/task/task_details/task_details",
+			"style": {
+				"navigationBarTitleText": "任务管理详情"
+				// "enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/task/task_list/task_list",
+			"style": {
+				"navigationBarTitleText": "任务清单",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/historical_record/historical_details/historical_details",
+			"style": {
+				"navigationBarTitleText": "历史记录详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/daily_inspection/inspection_list/inspection_list",
+			"style": {
+				"navigationBarTitleText": "每日巡检列表",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/daily_inspection/inspection_details/inspection_details",
+			"style": {
+				"navigationBarTitleText": "每日巡检详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/check_active/check_list/check_list",
+			"style": {
+				"navigationBarTitleText": "检测项列表",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/s9Unit/check_active/check_details/check_details",
+			"style": {
+				"navigationBarTitleText": "检测详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/sign/sign",
+			"style": {
+				"navigationBarTitleText": "注册",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/bind/bind",
+			"style": {
+				"navigationBarTitleText": "绑定账号",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/getWxCode",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
+
+		, {
+			"path": "pages/mine/instruct/instruct",
+			"style": {
+				"navigationBarTitleText": "操作说明",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+	"subPackages": [{
+		"root": "pagesA",
+		"pages": [{
+				"path": "fire/check_active/index",
+				"style": {
+					"navigationBarTitleText": "任务派遣"
+				}
+			}, {
+				"path": "fire/check_tasks/index",
+				"style": {
+					"navigationBarTitleText": "检查任务管理"
+				}
+			}, {
+				"path": "fire/data_statistics/index",
+				"style": {
+					"navigationBarTitleText": "数据统计"
+				}
+			}, {
+				"path": "fire/hidden_trouble/index",
+				"style": {
+					"navigationBarTitleText": "隐患管理"
+				}
+			}, {
+				"path": "fire/metting_regsiter/metting_sigin",
+				"style": {
+					"navigationBarTitleText": "会议报名"
+				},
+				"query": ["metId", "metName"]
+			},
+			{
+				"path": "fire/inspection_active/index",
+				"style": {
+					"navigationBarTitleText": "每日巡查"
+				}
+			}, {
+				"path": "fire/meeting_sign_in/index",
+				"style": {
+					"navigationBarTitleText": "会议记录"
+				}
+			}, {
+				"path": "fire/notice/index",
+				"style": {
+					"navigationBarTitleText": "通知公告查看"
+				}
+			}, {
+				"path": "fire/fire_station/index",
+				"style": {
+					"navigationBarTitleText": "微型消防站管理"
+				}
+			}, {
+				"path": "fire/personnel_permissions/index",
+				"style": {
+					"navigationBarTitleText": "人员权限管理"
+				}
+			}, {
+				"path": "fire/notice/notcice_details/notcice_details",
+				"style": {
+					"navigationBarTitleText": "",
+					// "enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			}, {
+				"path": "fire/notice/inform_details/inform_details",
+				"style": {
+					"navigationBarTitleText": "通知详情"
+					// "enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/meeting_sign_in/meeting_details/meeting_details",
+				"style": {
+					"navigationBarTitleText": "会议详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/inspection_active/inspection_list/inspection_list",
+				"style": {
+					"navigationBarTitleText": "每日巡查项",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/inspection_active/inspection_details/inspection_details",
+				"style": {
+					"navigationBarTitleText": "每日巡查详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_active/check_list/check_list",
+				"style": {
+					"navigationBarTitleText": "任务详情",
+					// "navigationStyle": "custom",	
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#f5f7f9"
+				}
+			}, {
+				"path": "fire/check_active/check_details/check_details",
+				"style": {
+					"navigationBarTitleText": "主动检查详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_active/add_check/add_check",
+				"style": {
+					"navigationBarTitleText": "添加/修改任务",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_tasks/tasks_details/tasks_details",
+				"style": {
+					"navigationBarTitleText": "检查任务详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/inspection_active/inspection_hislist/inspection_hislist",
+				"style": {
+					"navigationBarTitleText": "每日检查详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/hidden_trouble/trouble_details/trouble_details",
+				"style": {
+					// 隐患详情
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			}, {
+				"path": "fire/hidden_trouble/trouble_solve/trouble_solve",
+				"style": {
+					"navigationBarTitleText": "解决隐患",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_station/add_fireStation/add_fireStation",
+				"style": {
+					"navigationBarTitleText": "新增微型消防站",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_station/edit_fireStation/edit_fireStation",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_station/people_fireStation/people_fireStation",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				},
+				"query": ["addId"]
+			}, {
+				"path": "fire/fire_station/fireStation_details/fireStation_details",
+				"style": {
+					// 微型消防站详情
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			}, {
+				"path": "fire/check_active/check_implement/check_implement",
+				"style": {
+					"navigationBarTitleText": "完成任务",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_active/check_implement_detail/check_implement_detail",
+				"style": {
+					"navigationBarTitleText": "每日巡查详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/unit_info/index",
+				"style": {
+					"navigationBarTitleText": "单位信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/unit_info/unit_info_details/unit_info_details",
+				"style": {
+					"navigationBarTitleText": "单位信息详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/unit_info/edit_unit_info/edit_unit_info",
+				"style": {
+					"navigationBarTitleText": "编辑单位信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/unit_info/add_unit_info/add_unit_info",
+				"style": {
+					"navigationBarTitleText": "添加单位信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/architecture/index",
+				"style": {
+					"navigationBarTitleText": "单位建筑",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/architecture/architecture_details/architecture_details",
+				"style": {
+					"navigationBarTitleText": "查看单位建筑信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/architecture/add_architecture/add_architecture",
+				"style": {
+					"navigationBarTitleText": "新增单位建筑",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/architecture/edit_architecture/edit_architecture",
+				"style": {
+					"navigationBarTitleText": "编辑单位建筑信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_device/index",
+				"style": {
+					"navigationBarTitleText": "消防设施",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_device/edit_device/edit_device",
+				"style": {
+					"navigationBarTitleText": "编辑消防设施信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fire_device/add_device/add_device",
+				"style": {
+					"navigationBarTitleText": "添加消防设施",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/staff_info/add_staff/add_staff",
+				"style": {
+					"navigationBarTitleText": "添加人员信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/staff_info/edit_staff/edit_staff",
+				"style": {
+					"navigationBarTitleText": "编辑人员信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/staff_info/staff_details/staff_details",
+				"style": {
+					"navigationBarTitleText": "人员信息详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/staff_info/index",
+				"style": {
+					"navigationBarTitleText": "人员信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/drill/add_drill/add_drill",
+				"style": {
+					"navigationBarTitleText": "添加培训演练信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/drill/edit_drill/edit_drill",
+				"style": {
+					"navigationBarTitleText": "编辑培训演练信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/drill/drill_details/drill_details",
+				"style": {
+					"navigationBarTitleText": "培训演练信息详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/drill/index",
+				"style": {
+					"navigationBarTitleText": "单位培训演练",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/notice/instruct/instruct",
+				"style": {
+					"navigationBarTitleText": "指令查看",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/personnel_permissions/editUser/editUser",
+				"style": {
+					"navigationBarTitleText": "编辑用户信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/personnel_permissions/roleUser/roleUser",
+				"style": {
+					"navigationBarTitleText": "用户角色管理",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/personnel_permissions/editRole/editRole",
+				"style": {
+					"navigationBarTitleText": "编辑角色",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/personnel_permissions/menuRole/menuRole",
+				"style": {
+					"navigationBarTitleText": "分配角色菜单",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/hidden_trouble/troble_treatment/troble_treatment",
+				"style": {
+					"navigationBarTitleText": "隐患处理",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/nav",
+				"style": {
+					"navigationBarTitleText": "消防工作档案",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 1
+			{
+				"path": "fire/archive/index1",
+				"style": {
+					"navigationBarTitleText": "居民住宅区物业服务企业消防工作基本情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive1",
+				"style": {
+					"navigationBarTitleText": "添加居民住宅区物业服务企业消防工作",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive1",
+				"style": {
+					"navigationBarTitleText": "编辑居民住宅区物业服务企业消防工作",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details1",
+				"style": {
+					"navigationBarTitleText": "居民住宅区物业服务企业消防工作详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 2
+			{
+				"path": "fire/archive/index2",
+				"style": {
+					"navigationBarTitleText": "居（村）民委员会消防工作基本情况登记表",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive2",
+				"style": {
+					"navigationBarTitleText": "添加居民委员会消防工作基本情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive2",
+				"style": {
+					"navigationBarTitleText": "编辑居民委员会消防工作基本情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details2",
+				"style": {
+					"navigationBarTitleText": "居民委员会消防工作情况详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 3 勿删
+			{
+				"path": "fire/archive/index3",
+				"style": {
+					"navigationBarTitleText": "乡镇（街道）监督管理单位（场所）消防安全基本情况登记表",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive3",
+				"style": {
+					"navigationBarTitleText": "添加监督管理单位消防安全基本情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive3",
+				"style": {
+					"navigationBarTitleText": "编辑监督管理单位消防安全基本情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details3",
+				"style": {
+					"navigationBarTitleText": "监督管理单位消防安全情况详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 4
+			{
+				"path": "fire/archive/index4",
+				"style": {
+					"navigationBarTitleText": "乡镇（街道）火灾事故情况登记表",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive4",
+				"style": {
+					"navigationBarTitleText": "添加火灾事故情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive4",
+				"style": {
+					"navigationBarTitleText": "编辑火灾事故情况",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details4",
+				"style": {
+					"navigationBarTitleText": "火灾事故情况详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 5
+			{
+				"path": "fire/archive/index5",
+				"style": {
+					"navigationBarTitleText": "乡镇（街道）消防工作办公室消防安全检查台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive5",
+				"style": {
+					"navigationBarTitleText": "添加乡镇消防工作办公室消防安全检查台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive5",
+				"style": {
+					"navigationBarTitleText": "编辑乡镇消防工作办公室消防安全检查台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details5",
+				"style": {
+					"navigationBarTitleText": "消防工作办公室消防安全检查台账详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			// 6
+			{
+				"path": "fire/archive/index6",
+				"style": {
+					"navigationBarTitleText": "乡镇（街道）消防宣传教育台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/add_archive/add_archive6",
+				"style": {
+					"navigationBarTitleText": "添加乡镇消防宣传教育台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/edit_archive/edit_archive6",
+				"style": {
+					"navigationBarTitleText": "编辑乡镇消防宣传教育台账",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/archive/archive_details/archive_details6",
+				"style": {
+					"navigationBarTitleText": "消防乡镇宣传教育台账详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/hidden_trouble/trouble_xf_deetails/trouble_xf_deetails",
+				"style": {
+					// 隐患详情
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			}, {
+				"path": "fire/auditRecord/auditRecord",
+				"style": {
+					"navigationBarTitleText": "检查记录",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/check_inspection/check_inspection",
+				"style": {
+					"navigationBarTitleText": "主动检查",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/check_inspection/inspect_detail/inspect_detail",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/add_fireRun/fireRun",
+				"style": {
+					"navigationBarTitleText": "微型消防站运行",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/add_fireRun/add_fireEvent/add_fireEvent",
+				"style": {
+					"navigationBarTitleText": "微型消防站事件",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/unit_info/org_report/org_report",
+				"style": {
+					"navigationBarTitleText": "维保报告列表",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/zlgztzs/zlgztzs",
+				"style": {
+					"navigationBarTitleText": "责令改正通知书",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/zlgztzs/see_zlgztzs/see_zlgztzs",
+				"style": {
+					"navigationBarTitleText": "责令改正通知书详情",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/fire_inspetItem",
+				"style": {
+					"navigationBarTitleText": "消防检查项目",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetCzfpczl",
+				"style": {
+					"navigationBarTitleText": "出租房排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetDpccdtfpczl",
+				"style": {
+					"navigationBarTitleText": "电瓶车充电停放排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetDypczl",
+				"style": {
+					"navigationBarTitleText": "电源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetHypczl",
+				"style": {
+					"navigationBarTitleText": "火源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetQypczl",
+				"style": {
+					"navigationBarTitleText": "气源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetTsrqbf",
+				"style": {
+					"navigationBarTitleText": "特殊人群帮扶",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetXfsssbpczl",
+				"style": {
+					"navigationBarTitleText": "消防设施设备排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetXftdpczl",
+				"style": {
+					"navigationBarTitleText": "消防通道排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/streetXfxcjypxyl",
+				"style": {
+					"navigationBarTitleText": "消防宣传教育培训演练",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			//新增编辑街道
+			{
+				"path": "fire/fire_inspetItem/add-street/streetCzfpczl",
+				"style": {
+					"navigationBarTitleText": "出租房排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetDpccdtfpczl",
+				"style": {
+					"navigationBarTitleText": "电瓶车充电停放排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetDypczl",
+				"style": {
+					"navigationBarTitleText": "电源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetHypczl",
+				"style": {
+					"navigationBarTitleText": "火源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetQypczl",
+				"style": {
+					"navigationBarTitleText": "气源排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetTsrqbf",
+				"style": {
+					"navigationBarTitleText": "特殊人群帮扶",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetXfsssbpczl",
+				"style": {
+					"navigationBarTitleText": "消防设施设备排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetXftdpczl",
+				"style": {
+					"navigationBarTitleText": "消防通道排查治理",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "fire/fire_inspetItem/add-street/streetXfxcjypxyl",
+				"style": {
+					"navigationBarTitleText": "消防宣传教育培训演练",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			//消防设施维护和检测
+			{
+				"path": "fire/fpd_detection/fpd_detection",
+				"style": {
+					"navigationBarTitleText": "消防设施维护和检测",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "fire/fpd_detection/add_detection/add_detection",
+				"style": {
+					"navigationBarTitleText": "新增消防设施维护和检测",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "fire/fpd_detection/detection_details/detection_details",
+				"style": {
+					"navigationBarTitleText": "消防设施维护和检测详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "fire/fpd_detection/edit_detection/edit_detection",
+				"style": {
+					"navigationBarTitleText": "修改消防设施维护和检测",
+					"enablePullDownRefresh": false
+				}
+			}
+
+		]
+
+
+	}, {
+		"root": "pagesB",
+		"pages": [{
+				"path": "fire/fireSpecial/index",
+				"style": {
+					"navigationBarTitleText": "特种作业人员"
+				}
+			}, {
+				"path": "fire/fireWork/index",
+				"style": {
+					"navigationBarTitleText": "动火审批",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fireSpecial/addSpecial/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_record/personnel_record/personnel_record",
+				"style": {
+					"navigationBarTitleText": "人员记录查看",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_record/picture/picture",
+				"style": {
+					"navigationBarTitleText": "历史记录详情",
+					"enablePullDownRefresh": false
+					// "navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "fire/check_record/index",
+				"style": {
+					"navigationBarTitleText": "历史记录"
+				}
+			}, {
+				"path": "fire/fireWork/addWork/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			}
+		]
+	}],
+	
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index",
+			"iconPath": "static/images/tabbar/home.png",
+			"selectedIconPath": "static/images/tabbar/home_.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/work/index",
+			"iconPath": "static/images/tabbar/work.png",
+			"selectedIconPath": "static/images/tabbar/work_.png",
+			"text": "工作台"
+		}, {
+			"pagePath": "pages/mine/index",
+			"iconPath": "static/images/tabbar/mine.png",
+			"selectedIconPath": "static/images/tabbar/mine_.png",
+			"text": "我的"
+		}]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "RuoYi",
+		"navigationBarBackgroundColor": "#FFFFFF"
+	}
 }

uni_modules/uview-ui/libs/util/route.js

@@ -99,7 +99,7 @@ class Router {
             })
         }
         if (config.type == 'redirectTo' || config.type == 'redirect') {
-            uni.navigateTo({
+            uni.redirectTo({
                 url
             })
         }