From 905bd8dfdd770e560b9fd6685d5a5aa7d02d5c02 Mon Sep 17 00:00:00 2001
From: limingtao <@ming_tao_li>
Date: Mon, 29 Jul 2024 11:20:24 +0800
Subject: [PATCH] tabbar.js

---
 App.vue                       |  14 +-
 components/tabbar.vue         | 135 ++++++++
 libs/function/tabbar.js       |  44 +++
 main.js                       |   6 +-
 npminstall-debug.log          | 197 +++++++++++
 pages.json                    |  69 ++--
 pages/approve/index.vue       | 314 +++++++++++++++++
 pages/governance/index.vue    | 632 ++++++++++++++++++----------------
 pages/index/index.vue         |  30 +-
 pages/investigation/index.vue |  47 ++-
 pages/investigation/task.vue  |   1 +
 pages/logIn/logIn.vue         |  16 +-
 pages/mine/index.vue          |  25 +-
 13 files changed, 1163 insertions(+), 367 deletions(-)
 create mode 100644 components/tabbar.vue
 create mode 100644 libs/function/tabbar.js
 create mode 100644 npminstall-debug.log
 create mode 100644 pages/approve/index.vue

diff --git a/App.vue b/App.vue
index d904710..600eeb0 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,19 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			console.log('App Launch')
+			// 假设你想隐藏索引为1的tabBar页签
+			// uni.setTabBarItem({
+			//   index: 1,
+			//   visible:false,
+			//   success: function () {
+			//     console.log('TabBar item hidden successfully');
+			//   },
+			//   fail: function (err) {
+			//     console.error('Failed to hide TabBar item:', err);
+			//   }
+			// });
+			uni.hideTabBar()
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/components/tabbar.vue b/components/tabbar.vue
new file mode 100644
index 0000000..124ef44
--- /dev/null
+++ b/components/tabbar.vue
@@ -0,0 +1,135 @@
+<template>
+	<view>
+		<u-tabbar activeColor="#2294E6" :value="name" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false">
+			<u-tabbar-item :text="item.text" :name='item.text' @click="to(item)" v-for="(item,index) in list">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="item.selectedIconPath"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.iconPath"></image>
+			</u-tabbar-item>
+		</u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			name: {
+				default: '首页',
+				// type:'String'
+			}
+		},
+		watch: {
+			// path: {
+			// 	handler(newVal, oldVal) {
+			// 		// this.initVal()
+			// 	},
+			// 	// immediate 设为true，进入页面会立即执行handler函数。
+			// 	immediate: true
+			// }
+		},
+		data() {
+			return {
+				$: this.$,
+				home: {
+					// 最少2个、最多5个 tab
+					"pagePath": "/pages/index/index",
+					// 页面路径，必须在 pages 中先定义
+					"iconPath": "/static/nav/index.png",
+					// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
+					"selectedIconPath": "/static/nav/index_active.png",
+					// 选中时的图片路径
+					"text": "首页"
+					// tab 上按钮文字
+				},
+				approve: {
+					"pagePath": "/pages/approve/index",
+					"iconPath": "/static/nav/jobfind.png",
+					"selectedIconPath": "/static/nav/jobfind_active.png",
+					"text": "审批"
+				},
+				investigation: {
+					"pagePath": "/pages/investigation/index",
+					"iconPath": "/static/nav/job.png",
+					"selectedIconPath": "/static/nav/job_active.png",
+					"text": "排查"
+				},
+
+				governance: {
+					"pagePath": "/pages/governance/index",
+					"iconPath": "/static/nav/lean.png",
+					"selectedIconPath": "/static/nav/lean_active.png",
+					"text": "治理"
+				},
+				mine: {
+					"pagePath": "/pages/mine/index",
+					"iconPath": "/static/nav/mine.png",
+					"selectedIconPath": "/static/nav/mine_active.png",
+					"text": "我的"
+				},
+				"list": [
+
+				],
+				value: 0
+			}
+		},
+		created() {
+			this.initTab()
+		},
+		methods: {
+			to(item, index) {
+				this.value = index
+				uni.switchTab({
+					url: item.pagePath
+				})
+			},
+			initVal() {
+				for (let i in this.list) {
+					if ('/pages/' + this.path + '/index' == this.list[i].pagePath) {
+
+						this.value = i
+					}
+				}
+			},
+			initTab() {
+				let role = this.$.getData('userInfo').role || []
+
+				if (role.includes('领导')) {
+					this.list.push(this.home)
+					this.list.push(this.approve)
+					this.list.push(this.investigation)
+					this.list.push(this.governance)
+					this.list.push(this.mine)
+				}
+				if (role.includes('排查人员') && !role.includes('领导')) {
+					this.list.push(this.home)
+					// this.list.push(this.approve)
+					this.list.push(this.investigation)
+					this.list.push(this.governance)
+					this.list.push(this.mine)
+				}
+				if (!role.includes('排查人员') && !role.includes('领导')) {
+
+					this.list.push(this.home)
+					// this.list.push(this.approve)
+					// this.list.push(this.investigation)
+					this.list.push(this.governance)
+					this.list.push(this.mine)
+				}
+				for (let i in this.list) {
+					if ('/pages/' + this.path + '/index' == this.list[i].pagePath) {
+				// console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i)
+				// 		this.value = Number(i)
+					}
+				}
+				// 	console.log('/pages/'+this.path+'/index')
+					// console.log('/pages/' + this.path + '/index')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-page__item__slot-icon {
+		width: 46rpx;
+		height: 46rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/libs/function/tabbar.js b/libs/function/tabbar.js
new file mode 100644
index 0000000..7d5425a
--- /dev/null
+++ b/libs/function/tabbar.js
@@ -0,0 +1,44 @@
+import $ from '@/common/globalJs/globalJs.js'
+
+function tabbar() {
+	// let role = $.getData('userInfo').role || []
+	// console.log('拉拉')
+	// if (!role.includes('领导')) {
+	// 	uni.setTabBarItem({
+	// 		index: 1,
+	// 		visible: false,
+	// 		"pagePath": "pages/approve/index",
+	// 		"iconPath": "static/nav/jobfind.png",
+	// 		"selectedIconPath": "static/nav/jobfind_active.png",
+	// 		"text": "审批"
+	// 	});
+	// } 
+	// if (!role.includes('排查人员') && !role.includes('领导')) {
+	// 	uni.setTabBarItem({
+	// 		index: 2,
+	// 		visible: false,
+	// 		"pagePath": "pages/investigation/index",
+	// 		"iconPath": "static/nav/job.png",
+	// 		"selectedIconPath": "static/nav/job_active.png",
+	// 		"text": "排查"
+	// 	});
+	// }
+	// if (!role.includes('治理人员') && !role.includes('领导')) {
+
+	// 	uni.setTabBarItem({
+	// 		index: 3,
+	// 		visible: false,
+	// 		"pagePath": "pages/governance/index",
+	// 		"iconPath": "static/nav/lean.png",
+	// 		"selectedIconPath": "static/nav/lean_active.png",
+	// 		"text": "治理"
+	// 	});
+	// }
+
+
+	// console.log($.getData('userInfo'))
+	// return uni.getSystemInfoSync().platform;
+};
+export default {
+	tabbar
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index b3d2cc5..e759666 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,11 @@ import Vue from 'vue'
 Vue.config.productionTip = false
 // 全局方法
 import $ from './common/globalJs/globalJs.js'
-Vue.prototype.$ = $
+Vue.prototype.$ = $
+
+// Vue.prototype.$tabFun = tabFun
+// console.log(tabbar.tabbar)
+
 // // 拦截器
 import request from './common/globalJs/request.js'
 // // 全局配置
diff --git a/npminstall-debug.log b/npminstall-debug.log
new file mode 100644
index 0000000..4e35f86
--- /dev/null
+++ b/npminstall-debug.log
@@ -0,0 +1,197 @@
+{
+  root: 'D:\\项目\\自己\\曹\\hitap-chat',
+  registry: 'https://registry.npmmirror.com',
+  pkgs: [],
+  production: false,
+  cacheStrict: false,
+  cacheDir: 'C:\\Users\\sybil\\.npminstall_tarball',
+  env: {
+    npm_config_registry: 'https://registry.npmmirror.com',
+    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\sybil\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\sybil\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
+    npm_config_user_agent: 'npminstall/7.11.1 npm/? node/v18.16.1 win32 x64',
+    npm_config_cache: 'C:\\Users\\sybil\\.npminstall_tarball',
+    NODE: 'D:\\nodejs\\node.exe',
+    npm_node_execpath: 'D:\\nodejs\\node.exe',
+    npm_execpath: 'D:\\nvm\\nvm\\v18.16.1\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
+    npm_config_userconfig: 'C:\\Users\\sybil\\.cnpmrc',
+    npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
+    npm_config_r: 'https://registry.npmmirror.com',
+    COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+    EDGEDRIVER_CDNURL: 'https://npmmirror.com/mirrors/edgedriver',
+    NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+    NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+    PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+    CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+    OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+    CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+    ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+    ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+    SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+    SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+    NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+    PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+    PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+    PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+    SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+    SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+    RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+    RE2_DOWNLOAD_SKIP_PATH: 'true',
+    PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+    npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+    npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+    npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+    npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+    npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
+    npm_rootpath: 'D:\\项目\\自己\\曹\\hitap-chat',
+    INIT_CWD: 'D:\\项目\\自己\\曹\\hitap-chat'
+  },
+  binaryMirrors: {
+    ENVS: {
+      COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+      EDGEDRIVER_CDNURL: 'https://npmmirror.com/mirrors/edgedriver',
+      NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+      NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+      PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+      CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+      OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+      CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+      ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+      ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+      SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+      SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+      NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+      PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+      PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+      PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+      SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+      SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+      RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+      RE2_DOWNLOAD_SKIP_PATH: 'true',
+      PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+      npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+      npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+      npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+      npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+      npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs'
+    },
+    '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' },
+    sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] },
+    '@tensorflow/tfjs-node': {
+      replaceHostFiles: [Array],
+      replaceHostRegExpMap: [Object],
+      replaceHostMap: [Object]
+    },
+    cypress: {
+      host: 'https://cdn.npmmirror.com/binaries/cypress',
+      newPlatforms: [Object]
+    },
+    'utf-8-validate': {
+      host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}'
+    },
+    xprofiler: {
+      remote_path: './xprofiler/v{version}/',
+      host: 'https://cdn.npmmirror.com/binaries'
+    },
+    leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' },
+    couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' },
+    gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' },
+    sqlite3: {
+      host: 'https://cdn.npmmirror.com/binaries/sqlite3',
+      remote_path: 'v{version}'
+    },
+    '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' },
+    grpc: {
+      host: 'https://cdn.npmmirror.com/binaries',
+      remote_path: '{name}/v{version}'
+    },
+    'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' },
+    wrtc: {
+      host: 'https://cdn.npmmirror.com/binaries',
+      remote_path: '{name}/v{version}'
+    },
+    fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' },
+    nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' },
+    canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' },
+    'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' },
+    'flow-bin': {
+      replaceHost: 'https://github.com/facebook/flow/releases/download/v',
+      host: 'https://cdn.npmmirror.com/binaries/flow/v'
+    },
+    'jpegtran-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin'
+    },
+    'cwebp-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/cwebp-bin'
+    },
+    'zopflipng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin'
+    },
+    'optipng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/optipng-bin'
+    },
+    mozjpeg: {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin'
+    },
+    gifsicle: {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin'
+    },
+    'pngquant-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngquant-bin',
+      replaceHostMap: [Object]
+    },
+    'pngcrush-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin'
+    },
+    'jpeg-recompress-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin'
+    },
+    'advpng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/advpng-bin'
+    },
+    'pngout-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngout-bin'
+    },
+    'jpegoptim-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin'
+    },
+    argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' },
+    'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' },
+    'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' },
+    'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' },
+    'libpg-query': { host: 'https://cdn.npmmirror.com/binaries' }
+  },
+  forbiddenLicenses: null,
+  flatten: false,
+  proxy: undefined,
+  prune: false,
+  disableFallbackStore: false,
+  workspacesMap: Map(0) {},
+  enableWorkspace: false,
+  workspaceRoot: 'D:\\项目\\自己\\曹\\hitap-chat',
+  isWorkspaceRoot: true,
+  isWorkspacePackage: false,
+  offline: false,
+  strictSSL: false,
+  ignoreScripts: false,
+  foregroundScripts: false,
+  ignoreOptionalDependencies: false,
+  detail: false,
+  forceLinkLatest: false,
+  trace: false,
+  engineStrict: false,
+  registryOnly: false,
+  client: false,
+  autoFixVersion: [Function: autoFixVersion]
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1ab4f4c..b8a39df 100644
--- a/pages.json
+++ b/pages.json
@@ -23,7 +23,7 @@
         "navigationBarTitleText": "门户中心",
         "navigationStyle": "custom",
         "navigationBarBackgroundColor": "#FFFFFF",
-        "navigationBarTextStyle": "black"
+        "navigationBarTextStyle": "white"
       }
     },
     {
@@ -56,7 +56,18 @@
         "navigationBarBackgroundColor": "#FFFFFF",
         "navigationBarTextStyle": "white"
       }
-    },
+    },
+	{
+	  "path": "pages/approve/index",
+	  "style": {
+	    "navigationStyle": "custom",
+	    "navigationBarTitleText": "审批",
+	    // 开启下拉刷新
+	    "enablePullDownRefresh": true,
+	    "navigationBarBackgroundColor": "#FFFFFF",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
     {
       "path": "pages/investigation/task",
       "style": {
@@ -76,7 +87,7 @@
         // 开启下拉刷新
         "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#FFFFFF",
-        "navigationBarTextStyle": "black"
+        "navigationBarTextStyle": "white"
       }
     },
     {
@@ -149,7 +160,8 @@
       }
     }
   ],
-  "tabBar": {
+  "tabBar": {
+	   // "custom": true,  
     "color": "#7A7E83",
     // tab 上的文字默认颜色
     "selectedColor": "#2294E6",
@@ -161,32 +173,39 @@
     "list": [
       {
         // 最少2个、最多5个 tab
-        "pagePath": "pages/index/index",
-        // 页面路径，必须在 pages 中先定义
-        "iconPath": "static/nav/index.png",
-        // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
-        "selectedIconPath": "static/nav/index_active.png",
-        // 选中时的图片路径
-        "text": "首页"
+        "pagePath": "pages/index/index"
+        // // 页面路径，必须在 pages 中先定义
+        // "iconPath": "static/nav/index.png",
+        // // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
+        // "selectedIconPath": "static/nav/index_active.png",
+        // // 选中时的图片路径
+        // "text": "首页"
         // tab 上按钮文字
-      },
+      },
+	  {
+	    "pagePath": "pages/approve/index"
+	    // "iconPath": "static/nav/jobfind.png",
+	    // "selectedIconPath": "static/nav/jobfind_active.png",
+	    // "text": "审批"
+	  },
       {
-        "pagePath": "pages/investigation/index",
-        "iconPath": "static/nav/job.png",
-        "selectedIconPath": "static/nav/job_active.png",
-        "text": "排查"
-      },
+        "pagePath": "pages/investigation/index"
+        // "iconPath": "static/nav/job.png",
+        // "selectedIconPath": "static/nav/job_active.png",
+        // "text": "排查"
+      },
+	 
       {
-        "pagePath": "pages/governance/index",
-        "iconPath": "static/nav/lean.png",
-        "selectedIconPath": "static/nav/lean_active.png",
-        "text": "治理"
+        "pagePath": "pages/governance/index"
+        // "iconPath": "static/nav/lean.png",
+        // "selectedIconPath": "static/nav/lean_active.png",
+        // "text": "治理"
       },
       {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/nav/mine.png",
-        "selectedIconPath": "static/nav/mine_active.png",
-        "text": "我的"
+        "pagePath": "pages/mine/index"
+        // "iconPath": "static/nav/mine.png",
+        // "selectedIconPath": "static/nav/mine_active.png",
+        // "text": "我的"
       }
     ]
   },
diff --git a/pages/approve/index.vue b/pages/approve/index.vue
new file mode 100644
index 0000000..3a0c877
--- /dev/null
+++ b/pages/approve/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <view id="page">
+    <view class="Width100 Box BorderBox">
+      <view class="Content BorderBox Width100">
+        <top-title :is-show-left="false" :title="'审批'" :rightWidth='120' class="custom_bg">
+          <!-- <template slot="right">
+            <image :src="$.imgSrc + '/mine/search.png'" @click="$.open('/pages/mine/setting')" mode="aspectFit" class="InlineBlock imgIcon"></image>
+            <image :src="$.imgSrc + '/mine/plus.png'" mode="aspectFit" @click="$.open('/pages/mine/notice')" class="InlineBlock imgIcon"></image>
+          </template> -->
+        </top-title>
+      </view>
+      <view class="tab">
+        <view class="tab-item" :class="tab === 1 ? 'active' : ''" @click='tab = 1'>
+          <text>待办</text>
+          <text class="number">200</text>
+        </view>
+        <view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='tab = 2'>
+          <text>正在办理</text>
+          <text class="number">480</text>
+        </view>
+        <view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='tab = 3'>
+          <text>已完成</text>
+          <text class="number">182</text>
+        </view>
+      </view>
+      <view class="Content MarginAuto BorderBox">
+        <no-data v-if="isEmpty" />
+        <view v-else class="List Width100 BorderBox">
+          <view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF"
+                v-for="item in list" :key='item.id' @click='handleClick(item)'>
+            <image class="imgleft" :src="item.imgurl" mode="widthFix"></image>
+            <view class="right">
+              <view class="title">{{ item.title }}</view>
+              <view class="type">
+                <text>排查</text>
+                <text>超期2天</text>
+              </view>
+            </view>
+            <view class="trapezoidal">
+              超期
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+	<Tabbar name="审批" v-if="tabbarShow"></Tabbar>
+  </view>
+</template>
+
+<script>
+		import Tabbar from "../../components/tabbar.vue";
+import NoData from "../../components/no-data.vue";
+import TopTitle from "../../components/top-title";
+	import tabFun from '@/libs/function/tabbar.js'
+export default {
+  // 组件
+  components: {
+    NoData,TopTitle,Tabbar
+  },
+  data() {
+    return {
+      // 公用的js
+      bgUrl1: '', // 登录信息背景图
+      list: [
+        {
+          id: 1,
+          title: 'G228火炬路与S503岙东路路',
+          roadCode: 123,
+          roadName: 'G228火炬路与S503岙东路',
+          imgurl: '/static/logo.png',
+          createTime: '2024-10-05',
+          deptName: '支队级',
+          sessionId: 12121212
+        },
+        {
+          id: 2,
+          title: 'G228火炬路与S503岙东路路',
+          roadCode: 123,
+          roadName: 'G228火炬路与S503岙东路',
+          imgurl: '/static/logo.png',
+          createTime: '2024-10-05',
+          deptName: '支队级',
+          sessionId: 12121212
+        },
+        {
+          id: 3,
+          title: 'G228火炬路与S503岙东路路',
+          roadCode: 123,
+          roadName: 'G228火炬路与S503岙东路',
+          imgurl: '/static/logo.png',
+          createTime: '2024-10-05',
+          deptName: '支队级',
+          sessionId: 12121212
+        },
+        {
+          id: 4,
+          title: 'G228火炬路与S503岙东路路',
+          roadCode: 123,
+          roadName: 'G228火炬路与S503岙东路',
+          imgurl: '/static/logo.png',
+          createTime: '2024-10-05',
+          deptName: '支队级',
+          sessionId: 12121212
+        },
+        {
+          id: 5,
+          title: 'G228火炬路与S503岙东路路',
+          roadCode: 123,
+          roadName: 'G228火炬路与S503岙东路',
+          imgurl: '/static/logo.png',
+          createTime: '2024-10-05',
+          deptName: '支队级',
+          sessionId: 12121212
+        },
+      ],
+      isEmpty: false,
+      isMore: true,
+      page: 1,
+      tab: 1,
+	  tabbarShow:true
+    }
+  },
+  // 页面加载
+  onLoad(e) {
+    this.getList()
+  },
+  onShow(){
+	  uni.hideTabBar()//隐藏官方的tabBar
+	  // tabFun.tabbar()
+	  // this.tabbarShow=false
+	  // this.$nextTick(()=>{
+		 //  this.tabbarShow=true
+	  // })
+  },
+  // 计算属性
+  computed: {},
+  // 方法
+  methods: {
+    getList() {
+      let datas = {
+        limit: 10,
+        page: 1,
+      }
+      // this.$request.globalRequest('/xxxxxxxx', datas, 'GET').then(res => {
+      // 	if (res.code == 0) {
+      // 		if (res.data.total === 0) {
+      // 			this.isEmpty = true;
+      // 			return false
+      // 		}
+      // 		this.list.push(...res.data.list)
+      // 		if (this.list.length >= res.data.total) {
+      // 			this.isMore = false
+      // 		}
+      // 	} else {
+      // 		this.$.toast(res.msg)
+      // 	}
+      // })
+    },
+    handleClick(row) {
+      console.log(row)
+    },
+    // 跳转页面
+    skipPage(even) {
+      // this.$.open(even)
+    },
+  },
+  onReady() {},
+  // 页面卸载
+  onUnload() {
+
+  },
+  // 触发下拉刷新
+  onPullDownRefresh() {
+    // 延迟关闭刷新动画
+    setTimeout(() => {
+      uni.stopPullDownRefresh();
+    }, 1500);
+  },
+  // 页面上拉触底事件的处理函数
+  onReachBottom() {
+    if (this.isMore) {
+      this.page++
+      this.getList()
+    }
+  },
+}
+</script>
+
+<style>
+</style>
+<style lang="scss" scoped>
+page {
+  background: #F6F8FA;
+}
+.imgIcon {
+  width: 40rpx;
+  height: 100%;
+}
+.imgIcon:nth-of-type(2) {
+  margin-left: 40rpx;
+}
+.img {
+  width: 40rpx;
+  height: 40rpx;
+  margin-left: 30rpx;
+}
+.trapezoidal {
+  position: relative;
+  display: inline-block;
+  min-width: 2em;
+  text-align: center;
+  padding: 3rpx 20rpx 3rpx 18rpx;
+}
+
+.trapezoidal::before,
+.trapezoidal::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0%;
+  width: 100%;
+  height: 100%;
+  border-radius: 0rpx 0 0 0;
+  background: #FF1111;
+  z-index: -1;
+  transform-origin: bottom;
+  transform: skew(18deg);
+  border: 0rpx solid #333;
+  box-sizing: border-box;
+}
+
+.trapezoidal::after {
+  left: auto;
+  right: 0;
+  transform: skew(-0deg);
+  border-radius: 0 0rpx 0 0;
+  background-color: #FF1111;
+  border-left: 0 none;
+}
+
+.tab {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  font-size: 16px;
+  height: 44px;
+  background: #ffffff;
+  box-shadow: 3px 0px 10px #ccc;
+  color: #666666;
+  position: relative;
+  .tab-item {
+    position: relative;
+    height: 41px;
+    line-height: 41px;
+    padding: 0 30rpx 0 30rpx;
+    border-bottom: 3px solid #fff;
+    display: flex;
+    align-items: center;
+    &.active {
+      color: rgb(60, 109, 195);
+      border-color: rgb(60, 109, 195);
+    }
+    .number {
+      font-weight: bold;
+      font-size: 18px;
+      margin-left: 10rpx;
+    }
+  }
+}
+
+.Box {
+  padding-top:var(--status-bar-height);
+  .Content {
+    width: calc(100% - 48rpx);
+    padding-bottom: 88rpx;
+  }
+
+  .Unit {
+    padding: 24rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+    box-shadow: 1px 1px 3px #ccc;
+    .trapezoidal {
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      color: #ffffff;
+      font-size: 14px;
+      font-weight: normal;
+      z-index: 1;
+    }
+    image {
+      width: 140rpx;
+    }
+    .right {
+      flex: 1;
+      padding-left: 30rpx;
+      .title {
+        font-size: 16px;
+      }
+      .type {
+        font-size: 14px;
+        color: #666;
+        font-weight: normal;
+        text {
+          margin-right: 20rpx;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/governance/index.vue b/pages/governance/index.vue
index bc460df..e0c6468 100644
--- a/pages/governance/index.vue
+++ b/pages/governance/index.vue
@@ -1,302 +1,330 @@
-<template>
-  <view id="page">
-    <view class="Width100 Box BorderBox">
-      <view class="Content BorderBox Width100">
-        <top-title :is-show-left="false" :title="'治理'" :rightWidth='120' class="custom_bg">
-          <!-- <template slot="right">
-            <image :src="$.imgSrc + '/mine/search.png'" @click="$.open('/pages/mine/setting')" mode="aspectFit" class="InlineBlock imgIcon"></image>
-            <image :src="$.imgSrc + '/mine/plus.png'" mode="aspectFit" @click="$.open('/pages/mine/notice')" class="InlineBlock imgIcon"></image>
-          </template> -->
-        </top-title>
-      </view>
-      <view class="tab">
-        <view class="tab-item" :class="tab === 1 ? 'active' : ''" @click='tab = 1'>
-          <text>待办</text>
-          <text class="number">200</text>
-        </view>
-        <view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='tab = 2'>
-          <text>正在办理</text>
-          <text class="number">480</text>
-        </view>
-        <view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='tab = 3'>
-          <text>已完成</text>
-          <text class="number">182</text>
-        </view>
-      </view>
-      <view class="Content MarginAuto BorderBox">
-        <no-data v-if="isEmpty" />
-        <view v-else class="List Width100 BorderBox">
-          <view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF"
-                v-for="item in list" :key='item.id' @click='handleClick(item)'>
-            <image class="imgleft" :src="item.imgurl" mode="widthFix"></image>
-            <view class="right">
-              <view class="title">{{ item.title }}</view>
-              <view class="type">
-                <text>排查</text>
-                <text>超期2天</text>
-              </view>
-            </view>
-            <view class="trapezoidal">
-              超期
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import NoData from "../../components/no-data.vue";
-import TopTitle from "../../components/top-title";
-export default {
-  // 组件
-  components: {
-    NoData,TopTitle
-  },
-  data() {
-    return {
-      // 公用的js
-      bgUrl1: '', // 登录信息背景图
-      list: [
-        {
-          id: 1,
-          title: 'G228火炬路与S503岙东路路',
-          roadCode: 123,
-          roadName: 'G228火炬路与S503岙东路',
-          imgurl: '/static/logo.png',
-          createTime: '2024-10-05',
-          deptName: '支队级',
-          sessionId: 12121212
-        },
-        {
-          id: 2,
-          title: 'G228火炬路与S503岙东路路',
-          roadCode: 123,
-          roadName: 'G228火炬路与S503岙东路',
-          imgurl: '/static/logo.png',
-          createTime: '2024-10-05',
-          deptName: '支队级',
-          sessionId: 12121212
-        },
-        {
-          id: 3,
-          title: 'G228火炬路与S503岙东路路',
-          roadCode: 123,
-          roadName: 'G228火炬路与S503岙东路',
-          imgurl: '/static/logo.png',
-          createTime: '2024-10-05',
-          deptName: '支队级',
-          sessionId: 12121212
-        },
-        {
-          id: 4,
-          title: 'G228火炬路与S503岙东路路',
-          roadCode: 123,
-          roadName: 'G228火炬路与S503岙东路',
-          imgurl: '/static/logo.png',
-          createTime: '2024-10-05',
-          deptName: '支队级',
-          sessionId: 12121212
-        },
-        {
-          id: 5,
-          title: 'G228火炬路与S503岙东路路',
-          roadCode: 123,
-          roadName: 'G228火炬路与S503岙东路',
-          imgurl: '/static/logo.png',
-          createTime: '2024-10-05',
-          deptName: '支队级',
-          sessionId: 12121212
-        },
-      ],
-      isEmpty: false,
-      isMore: true,
-      page: 1,
-      tab: 1
-    }
-  },
-  // 页面加载
-  onLoad(e) {
-    this.getList()
-  },
-  // 计算属性
-  computed: {},
-  // 方法
-  methods: {
-    getList() {
-      let datas = {
-        limit: 10,
-        page: 1,
-      }
-      // this.$request.globalRequest('/xxxxxxxx', datas, 'GET').then(res => {
-      // 	if (res.code == 0) {
-      // 		if (res.data.total === 0) {
-      // 			this.isEmpty = true;
-      // 			return false
-      // 		}
-      // 		this.list.push(...res.data.list)
-      // 		if (this.list.length >= res.data.total) {
-      // 			this.isMore = false
-      // 		}
-      // 	} else {
-      // 		this.$.toast(res.msg)
-      // 	}
-      // })
-    },
-    handleClick(row) {
-      console.log(row)
-    },
-    // 跳转页面
-    skipPage(even) {
-      // this.$.open(even)
-    },
-  },
-  onReady() {},
-  // 页面卸载
-  onUnload() {
-
-  },
-  // 触发下拉刷新
-  onPullDownRefresh() {
-    // 延迟关闭刷新动画
-    setTimeout(() => {
-      uni.stopPullDownRefresh();
-    }, 1500);
-  },
-  // 页面上拉触底事件的处理函数
-  onReachBottom() {
-    if (this.isMore) {
-      this.page++
-      this.getList()
-    }
-  },
-}
-</script>
-
-<style>
-</style>
-<style lang="scss" scoped>
-page {
-  background: #F6F8FA;
-}
-.imgIcon {
-  width: 40rpx;
-  height: 100%;
-}
-.imgIcon:nth-of-type(2) {
-  margin-left: 40rpx;
-}
-.img {
-  width: 40rpx;
-  height: 40rpx;
-  margin-left: 30rpx;
-}
-.trapezoidal {
-  position: relative;
-  display: inline-block;
-  min-width: 2em;
-  text-align: center;
-  padding: 3rpx 20rpx 3rpx 18rpx;
-}
-
-.trapezoidal::before,
-.trapezoidal::after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0%;
-  width: 100%;
-  height: 100%;
-  border-radius: 0rpx 0 0 0;
-  background: #FF1111;
-  z-index: -1;
-  transform-origin: bottom;
-  transform: skew(18deg);
-  border: 0rpx solid #333;
-  box-sizing: border-box;
-}
-
-.trapezoidal::after {
-  left: auto;
-  right: 0;
-  transform: skew(-0deg);
-  border-radius: 0 0rpx 0 0;
-  background-color: #FF1111;
-  border-left: 0 none;
-}
-
-.tab {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  font-size: 16px;
-  height: 44px;
-  background: #ffffff;
-  box-shadow: 3px 0px 10px #ccc;
-  color: #666666;
-  position: relative;
-  .tab-item {
-    position: relative;
-    height: 41px;
-    line-height: 41px;
-    padding: 0 30rpx 0 30rpx;
-    border-bottom: 3px solid #fff;
-    display: flex;
-    align-items: center;
-    &.active {
-      color: rgb(60, 109, 195);
-      border-color: rgb(60, 109, 195);
-    }
-    .number {
-      font-weight: bold;
-      font-size: 18px;
-      margin-left: 10rpx;
-    }
-  }
-}
-
-.Box {
-  padding-top:var(--status-bar-height);
-  .Content {
-    width: calc(100% - 48rpx);
-    padding-bottom: 88rpx;
-  }
-
-  .Unit {
-    padding: 24rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    position: relative;
-    box-shadow: 1px 1px 3px #ccc;
-    .trapezoidal {
-      position: absolute;
-      top: 0px;
-      right: 0px;
-      color: #ffffff;
-      font-size: 14px;
-      font-weight: normal;
-      z-index: 1;
-    }
-    image {
-      width: 140rpx;
-    }
-    .right {
-      flex: 1;
-      padding-left: 30rpx;
-      .title {
-        font-size: 16px;
-      }
-      .type {
-        font-size: 14px;
-        color: #666;
-        font-weight: normal;
-        text {
-          margin-right: 20rpx;
-        }
-      }
-    }
-  }
-}
-</style>
+<template>
+	<view id="page">
+		<view class="Width100 Box BorderBox">
+			<view class="Content BorderBox Width100">
+				<top-title :is-show-left="false" :title="'治理'" :rightWidth='120' class="custom_bg">
+					<!-- <template slot="right">
+            <image :src="$.imgSrc + '/mine/search.png'" @click="$.open('/pages/mine/setting')" mode="aspectFit" class="InlineBlock imgIcon"></image>
+            <image :src="$.imgSrc + '/mine/plus.png'" mode="aspectFit" @click="$.open('/pages/mine/notice')" class="InlineBlock imgIcon"></image>
+          </template> -->
+				</top-title>
+			</view>
+			<view class="tab">
+				<view class="tab-item" :class="tab === 1 ? 'active' : ''" @click='tab = 1'>
+					<text>待办</text>
+					<text class="number">200</text>
+				</view>
+				<view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='tab = 2'>
+					<text>正在办理</text>
+					<text class="number">480</text>
+				</view>
+				<view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='tab = 3'>
+					<text>已完成</text>
+					<text class="number">182</text>
+				</view>
+			</view>
+			<view class="Content MarginAuto BorderBox">
+				<no-data v-if="isEmpty" />
+				<view v-else class="List Width100 BorderBox">
+					<view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF" v-for="item in list"
+						:key='item.id' @click='handleClick(item)'>
+						<image class="imgleft" :src="item.imgurl" mode="widthFix"></image>
+						<view class="right">
+							<view class="title">{{ item.title }}</view>
+							<view class="type">
+								<text>排查</text>
+								<text>超期2天</text>
+							</view>
+						</view>
+						<view class="trapezoidal">
+							超期
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<Tabbar name="治理" v-if="tabbarShow"></Tabbar>
+	</view>
+</template>
+
+<script>
+	import NoData from "../../components/no-data.vue";
+	import TopTitle from "../../components/top-title";
+	import tabFun from '@/libs/function/tabbar.js'
+	import Tabbar from "../../components/tabbar.vue";
+	export default {
+		// 组件
+		components: {
+			NoData,
+			TopTitle,
+			Tabbar
+		},
+		data() {
+			return {
+				// 公用的js
+				bgUrl1: '', // 登录信息背景图
+				list: [{
+						id: 1,
+						title: 'G228火炬路与S503岙东路路',
+						roadCode: 123,
+						roadName: 'G228火炬路与S503岙东路',
+						imgurl: '/static/logo.png',
+						createTime: '2024-10-05',
+						deptName: '支队级',
+						sessionId: 12121212
+					},
+					{
+						id: 2,
+						title: 'G228火炬路与S503岙东路路',
+						roadCode: 123,
+						roadName: 'G228火炬路与S503岙东路',
+						imgurl: '/static/logo.png',
+						createTime: '2024-10-05',
+						deptName: '支队级',
+						sessionId: 12121212
+					},
+					{
+						id: 3,
+						title: 'G228火炬路与S503岙东路路',
+						roadCode: 123,
+						roadName: 'G228火炬路与S503岙东路',
+						imgurl: '/static/logo.png',
+						createTime: '2024-10-05',
+						deptName: '支队级',
+						sessionId: 12121212
+					},
+					{
+						id: 4,
+						title: 'G228火炬路与S503岙东路路',
+						roadCode: 123,
+						roadName: 'G228火炬路与S503岙东路',
+						imgurl: '/static/logo.png',
+						createTime: '2024-10-05',
+						deptName: '支队级',
+						sessionId: 12121212
+					},
+					{
+						id: 5,
+						title: 'G228火炬路与S503岙东路路',
+						roadCode: 123,
+						roadName: 'G228火炬路与S503岙东路',
+						imgurl: '/static/logo.png',
+						createTime: '2024-10-05',
+						deptName: '支队级',
+						sessionId: 12121212
+					},
+				],
+				isEmpty: false,
+				isMore: true,
+				page: 1,
+				tab: 1,
+				tabbarShow: true
+			}
+		},
+		// 页面加载
+		onLoad(e) {
+			this.getList()
+
+		},
+		onShow() {
+			uni.hideTabBar()//隐藏官方的tabBar
+			// tabFun.tabbar()
+			// this.tabbarShow = false
+			// this.$nextTick(() => {
+			// 	this.tabbarShow = true
+			// })
+		},
+		// 计算属性
+		computed: {},
+		// 方法
+		methods: {
+			getList() {
+				let datas = {
+					limit: 10,
+					page: 1,
+				}
+				// this.$request.globalRequest('/xxxxxxxx', datas, 'GET').then(res => {
+				// 	if (res.code == 0) {
+				// 		if (res.data.total === 0) {
+				// 			this.isEmpty = true;
+				// 			return false
+				// 		}
+				// 		this.list.push(...res.data.list)
+				// 		if (this.list.length >= res.data.total) {
+				// 			this.isMore = false
+				// 		}
+				// 	} else {
+				// 		this.$.toast(res.msg)
+				// 	}
+				// })
+			},
+			handleClick(row) {
+				console.log(row)
+			},
+			// 跳转页面
+			skipPage(even) {
+				// this.$.open(even)
+			},
+		},
+		onReady() {},
+		// 页面卸载
+		onUnload() {
+
+		},
+		// 触发下拉刷新
+		onPullDownRefresh() {
+			// 延迟关闭刷新动画
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1500);
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom() {
+			if (this.isMore) {
+				this.page++
+				this.getList()
+			}
+		},
+	}
+</script>
+
+<style>
+</style>
+<style lang="scss" scoped>
+	page {
+		background: #F6F8FA;
+	}
+
+	.imgIcon {
+		width: 40rpx;
+		height: 100%;
+	}
+
+	.imgIcon:nth-of-type(2) {
+		margin-left: 40rpx;
+	}
+
+	.img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-left: 30rpx;
+	}
+
+	.trapezoidal {
+		position: relative;
+		display: inline-block;
+		min-width: 2em;
+		text-align: center;
+		padding: 3rpx 20rpx 3rpx 18rpx;
+	}
+
+	.trapezoidal::before,
+	.trapezoidal::after {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0%;
+		width: 100%;
+		height: 100%;
+		border-radius: 0rpx 0 0 0;
+		background: #FF1111;
+		z-index: -1;
+		transform-origin: bottom;
+		transform: skew(18deg);
+		border: 0rpx solid #333;
+		box-sizing: border-box;
+	}
+
+	.trapezoidal::after {
+		left: auto;
+		right: 0;
+		transform: skew(-0deg);
+		border-radius: 0 0rpx 0 0;
+		background-color: #FF1111;
+		border-left: 0 none;
+	}
+
+	.tab {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		font-size: 16px;
+		height: 44px;
+		background: #ffffff;
+		box-shadow: 3px 0px 10px #ccc;
+		color: #666666;
+		position: relative;
+
+		.tab-item {
+			position: relative;
+			height: 41px;
+			line-height: 41px;
+			padding: 0 30rpx 0 30rpx;
+			border-bottom: 3px solid #fff;
+			display: flex;
+			align-items: center;
+
+			&.active {
+				color: rgb(60, 109, 195);
+				border-color: rgb(60, 109, 195);
+			}
+
+			.number {
+				font-weight: bold;
+				font-size: 18px;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.Box {
+		padding-top: var(--status-bar-height);
+
+		.Content {
+			width: calc(100% - 48rpx);
+			padding-bottom: 88rpx;
+		}
+
+		.Unit {
+			padding: 24rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			position: relative;
+			box-shadow: 1px 1px 3px #ccc;
+
+			.trapezoidal {
+				position: absolute;
+				top: 0px;
+				right: 0px;
+				color: #ffffff;
+				font-size: 14px;
+				font-weight: normal;
+				z-index: 1;
+			}
+
+			image {
+				width: 140rpx;
+			}
+
+			.right {
+				flex: 1;
+				padding-left: 30rpx;
+
+				.title {
+					font-size: 16px;
+				}
+
+				.type {
+					font-size: 14px;
+					color: #666;
+					font-weight: normal;
+
+					text {
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 36a88b6..793e837 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -79,15 +79,19 @@
 				<u-loadmore :status="loadmorestatus" v-show="!isEmpty" />
 			</view>
 		</view>
+		<Tabbar name="首页" v-if="tabbarShow"></Tabbar>
 	</view>
 </template>
 
 <script>
+	import tabFun from '@/libs/function/tabbar.js'
 	import NoData from "../../components/no-data.vue";
+	import Tabbar from "../../components/tabbar.vue";
 	export default {
 		// 组件
 		components: {
-			NoData
+			NoData,
+			Tabbar
 		},
 		data() {
 			return {
@@ -108,6 +112,7 @@
 					Delay: 0,
 				},
 				loadmorestatus: 'loading',
+				tabbarShow: true
 			}
 		},
 		// 页面加载
@@ -116,11 +121,17 @@
 			// this.getList()
 		},
 		onShow(e) {
+			uni.hideTabBar() //隐藏官方的tabBar
 			this.getData()
 			this.isMore = true
 			this.list = []
 			this.page = 1
 			this.getList()
+			// tabFun.tabbar()
+			// this.tabbarShow = false
+			// this.$nextTick(() => {
+			// 	this.tabbarShow = true
+			// })
 		},
 		// 计算属性
 		computed: {},
@@ -147,7 +158,7 @@
 				}
 				this.loadmorestatus = 'loading'
 				this.$request.globalRequest(
-					`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
+						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
 					.then(res => {
 						this.loadmorestatus = 'loadmore'
 						if (res.code === 200) {
@@ -168,10 +179,12 @@
 					})
 			},
 			handleClick(row) {
-				if(row.pcType == 2) {
+				if (row.pcType == 2) {
 					this.$.open("/pages/investigation/task" + "?id=" + row.businessId);
 				} else {
-					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId='+ row.sectionCode + '&operator=' + row.operator +'&deptId=' + row.handleDept + '&taskName=' + row.name + '&pcType' + row.pcType)
+					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
+						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
+						'&pcType' + row.pcType)
 				}
 			},
 			konw() {
@@ -192,7 +205,12 @@
 				this.$.openTab('/pages/investigation/index')
 			}
 		},
-		onReady() { },
+		onReady() {
+			// this.$tabFun.tabbar()
+		},
+		mounted() {
+
+		},
 		// 页面卸载
 		onUnload() {
 
@@ -376,7 +394,7 @@
 		/* top: 418px; */
 		top: calc(var(--status-bar-height) + 798rpx);
 		z-index: 99;
-		padding-bottom:30rpx;
+		padding-bottom: 30rpx;
 	}
 
 	.Box {
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 96b4987..13d8b77 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -59,18 +59,22 @@
 				<u-loadmore :status="loadmorestatus" v-show="!isEmpty" />
 			</view>
 		</view>
+		<Tabbar name="排查" v-if="tabbarShow"></Tabbar>
 	</view>
 </template>
 
 <script>
+	import Tabbar from "../../components/tabbar.vue";
 	import NoData from "../../components/no-data.vue";
 	import TopTitle from "../../components/top-title";
 	import $ from "../../common/globalJs/globalJs";
+	import tabFun from '@/libs/function/tabbar.js'
 	export default {
 		// 组件
 		components: {
 			NoData,
-			TopTitle
+			TopTitle,
+			Tabbar
 		},
 		data() {
 			return {
@@ -90,7 +94,8 @@
 					Unconfirmed: 0,
 				},
 				status: '10',
-				search: ''
+				search: '',
+				tabbarShow: true
 
 			}
 		},
@@ -100,6 +105,7 @@
 		},
 
 		onShow() {
+			// tabFun.tabbar()
 			this.getData()
 			let pageStatus = this.$.getData('pageStatus')
 			if (pageStatus == 1) {
@@ -111,6 +117,11 @@
 			} else {
 				this.handleTabClick(1)
 			}
+			uni.hideTabBar() //隐藏官方的tabBar
+			// this.tabbarShow = false
+			// this.$nextTick(() => {
+			// 	this.tabbarShow = true
+			// })
 		},
 		// 计算属性
 		computed: {
@@ -129,9 +140,9 @@
 					case 1:
 						this.status = '10';
 						break;
-					// case 2:
-					// 	this.status = '20';
-					// 	break;
+						// case 2:
+						// 	this.status = '20';
+						// 	break;
 					case 3:
 						this.status = '20';
 						break;
@@ -166,7 +177,8 @@
 				}
 				this.loadmorestatus = 'loading'
 				this.$request.globalRequest(
-					`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}&search=${this.search}`, datas, 'POST')
+						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}&search=${this.search}`,
+						datas, 'POST')
 					.then(res => {
 						this.loadmorestatus = 'loadmore'
 						uni.stopPullDownRefresh();
@@ -192,28 +204,29 @@
 			handleClick(row) {
 				console.log(row)
 				if (this.tab === 1) {
-					if(row.pcType == 2) {
+					if (row.pcType == 2) {
 						this.$.open("/pages/investigation/task" + "?id=" + row.businessId);
 					} else {
-						this.$.open('/pages/map/index?businessId=' + row.businessId + 
-							'&operator=' + row.operator + 
-							'&deptId=' + row.handleDept + 
-							'&pcType=' + row.pcType + 
+						this.$.open('/pages/map/index?businessId=' + row.businessId +
+							'&operator=' + row.operator +
+							'&deptId=' + row.handleDept +
+							'&pcType=' + row.pcType +
 							'&type=' + (this.tab == 1 ? 'edit' : 'view'))
-							// this.$.open('/pages/map/index?businessId=' + row.businessId)
+						// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}
-				
-				}else{
-					this.$.open('/pages/investigation/task?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
+
+				} else {
+					this.$.open('/pages/investigation/task?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' :
+						'view'))
 				}
-				
+
 			},
 			// 跳转页面
 			skipPage(even) {
 				// this.$.open(even)
 			},
 		},
-		onReady() { },
+		onReady() {},
 		// 页面卸载
 		onUnload() {
 
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 0d7d0fa..561ed93 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -1323,6 +1323,7 @@
 						//     "hdPic": "",
 						//     "hdInfo": ""
 						// }],
+						lastModeUser:this.$.getData('userInfo').username
 					},
 						"POST"
 					)
diff --git a/pages/logIn/logIn.vue b/pages/logIn/logIn.vue
index 9e1fb13..9d6dd5d 100644
--- a/pages/logIn/logIn.vue
+++ b/pages/logIn/logIn.vue
@@ -42,7 +42,7 @@
             <view class="ClearB"></view>
           </view>
         </view>
-        <view class="Agree Width100 MarginT_60rpx" @click="chooseAgree">
+       <!-- <view class="Agree Width100 MarginT_60rpx" @click="chooseAgree">
           <view class="Point FloatL" v-if="isAgree">
             <image :src="$.imgSrc + '/scimg/choose_y1.png'" mode="aspectFit" class="Block Width100 Height100"></image>
           </view>
@@ -52,7 +52,7 @@
           <text class="Block FloatL Color_605F72 FontS_26rpx">与</text>
           <text class="Block FloatL Color_0064FF FontS_26rpx" @click.stop="checkAgree(3)">《隐私协议》</text>
           <view class="ClearB"></view>
-        </view>
+        </view> -->
         <button type="button" :disabled="isDisabled" class="Btn Block Width100 Color_FFFFFF FontS_36rpx FontBold" @click="confirmSub">{{ currNav == 1 ? '注册':'登录' }}</button>
         <text @click="findPsw" class="Block MarginT_40rpx TextCenter FontS_26rpx Color_0064FF" v-if="currNav == 2">找回密码？</text>
       </view>
@@ -154,10 +154,10 @@ export default {
         this.$.toast('请填写密码')
         return
       }
-      if(!this.isAgree){
-        this.$.toast('请勾选用户协议和隐私协议')
-        return
-      }
+      // if(!this.isAgree){
+      //   this.$.toast('请勾选用户协议和隐私协议')
+      //   return
+      // }
       let datas = {
         nuserid: this.logInData.phone,
         cuserpwd: this.logInData.password,
@@ -168,8 +168,8 @@ export default {
       this.$request.globalRequest(url, datas, 'POST').then(res => {
         if(res.code === 200){
           this.$.toast('登录成功')
-          this.$.setData('token',res.result)
-          this.$.setData('userInfo', { username: res.result })
+          this.$.setData('token',res.result.nuserid)
+          this.$.setData('userInfo', { username: res.result.nuserid,role:res.result.role })
           setTimeout(() => {
             this.$.hideLoading('登录中...')
             this.isDisabled = false
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 2e2a79e..2d61da3 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -53,17 +53,21 @@
 		<view class="logout" @click="showModal">退出登录</view>
 		<u-modal :show="show" @confirm="confirm" ref="uModal" :asyncClose="true" title="是否要继续退出登录？"
 			:showCancelButton="true" @cancel="show=false"></u-modal>
+		<Tabbar name='我的' v-if="tabbarShow"></Tabbar>
 	</view>
 </template>
 
 <script>
+	import tabFun from '@/libs/function/tabbar.js'
 	const base64Avatar =
 		"data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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";
 
 	import TopTitle from "../../components/top-title";
+	import Tabbar from "../../components/tabbar.vue";
 	export default {
 		components: {
-			TopTitle
+			TopTitle,
+			Tabbar
 		},
 		data() {
 			return {
@@ -74,7 +78,8 @@
 				userInfo: {},
 				timer: null,
 				num: 0,
-				dataInfo:{},
+				dataInfo: {},
+				tabbarShow: true
 				// funcList: [
 				//  { id:1,name:'个人信息',url:'/pages/logIn/userInfo',icon:'/mine/userinfo.png' },
 				//  { id:2,name:'劳务保险',url:'/pages/mine/insurance',icon:'/mine/insurance.png' },
@@ -97,6 +102,7 @@
 
 		},
 		onShow() {
+			// tabFun.tabbar()
 			let token = this.$.getData('token')
 			const userInfo = this.$.getData('userInfo')
 			if (userInfo) {
@@ -115,20 +121,24 @@
 			// 		this.getReviewNum()
 			// 	},10 * 1000)
 			// }
+			uni.hideTabBar() //隐藏官方的tabBar
+			// this.tabbarShow = false
+			// this.$nextTick(() => {
+			// 	this.tabbarShow = true
+			// })
 		},
 		onHide() {
 			// this.timer && clearInterval(this.timer)
 		},
-		onLoad() { 
-			
+		onLoad() {
+
 		},
 		methods: {
 			//获取个人信息
 			getInfo() {
 				this.$request
 					.globalRequest(
-						"/hiddenDanger/auth/getOperatorInformation",
-						{
+						"/hiddenDanger/auth/getOperatorInformation", {
 							nuserid: this.userInfo.username,
 						},
 						"GET"
@@ -136,7 +146,7 @@
 					.then((res) => {
 						if (res.code === 200) {
 							this.dataInfo = res.result;
-						}else {
+						} else {
 							this.$.toast(res.message)
 						}
 					});
@@ -191,6 +201,7 @@
 		height: 100%;
 		background-image: url('../../static/mine/background.png');
 		background-size: 100% 100%;
+
 		.info-box {
 			padding-top: calc(var(--status-bar-height) + 80rpx);
 			width: 750rpx;