From c588892b12e6319e6a1582e668f83b66597579e8 Mon Sep 17 00:00:00 2001 From: liyingang <1345836061@qq.com> Date: Tue, 27 Aug 2024 09:50:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=8B=A5=E5=B9=B2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/global.scss | 28 +- common/globalJs/globalJs.js | 4 +- components/tabbar.vue | 33 +- pages/create/create.vue | 33 +- pages/create/map-navigation.vue | 91 +++++ pages/index/detail.vue | 27 +- pages/index/index-pers.vue | 650 ++++++++++++++++++++++++++++++++ pages/index/index.vue | 255 +++++-------- pages/investigation/index.vue | 344 +++++++---------- pages/logIn/logIn.vue | 32 +- pages/map/index.vue | 11 +- pages/mine/index.vue | 13 +- static/index/pc.png | Bin 0 -> 27901 bytes static/index/sp.png | Bin 0 -> 18854 bytes static/index/zl.png | Bin 0 -> 12492 bytes static/map/daohang.png | Bin 0 -> 2710 bytes 16 files changed, 1116 insertions(+), 405 deletions(-) create mode 100644 pages/create/map-navigation.vue create mode 100644 pages/index/index-pers.vue create mode 100644 static/index/pc.png create mode 100644 static/index/sp.png create mode 100644 static/index/zl.png create mode 100644 static/map/daohang.png diff --git a/common/css/global.scss b/common/css/global.scss index c70b8f0..fba57ce 100644 --- a/common/css/global.scss +++ b/common/css/global.scss @@ -62,4 +62,30 @@ background-color: rgba(255, 255, 255, 0.2); /* 半透明背景 */ backdrop-filter: blur(10px); /* 背景模糊 */ -webkit-backdrop-filter: blur(10px); /* 兼容老版本 Safari */ -} \ No newline at end of file +} + + +.font-family-SR { + font-family: 'SOURCEHANSANSCN-REGULAR'; +} + +.font-family-ASB { + font-family: 'Alimama_ShuHeiTi_Bold'; +} + +.font-family-TMB { + font-family: 'Tensentype-MeiHeiJ-Bold'; +} + +.font-family-SM { + font-family: 'SOURCEHANSANSCN-MEDIUM'; +} + +.font-family-SB { + font-family: 'SOURCEHANSANSCN-BOLD'; +} + +.font-family-MNR { + font-family: 'MFLiHei_Noncommercial-Regular'; +} + diff --git a/common/globalJs/globalJs.js b/common/globalJs/globalJs.js index 53afbf5..7d7038c 100644 --- a/common/globalJs/globalJs.js +++ b/common/globalJs/globalJs.js @@ -2,8 +2,8 @@ // #ifdef APP-PLUS || MP // const baseUrl = "http://116.62.210.143:9002"; // const baseUrl = "http://118.89.79.160:8800/HiatmpPro"; -const baseUrl = "http://49.235.207.167:8800/HiatmpPro"; -// const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro"; +// const baseUrl = "http://49.235.207.167:8800/HiatmpPro"; +const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro"; const chatUrl = "http://219.147.31.25:30001/hitap"; // #endif // #ifdef H5 diff --git a/components/tabbar.vue b/components/tabbar.vue index 5205d56..f56cf97 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -37,42 +37,51 @@ // 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px "selectedIconPath": "/static/nav/index_active.png", // 选中时的图片路径 - "text": "首页" + "text": "首页", // tab 上按钮文字 + role: ['领导', '排查人员', '治理人员'] }, approve: { "pagePath": "/pages/approve/index", "iconPath": "/static/nav/jobfind.png", "selectedIconPath": "/static/nav/jobfind_active.png", - "text": "审批" + "text": "审批", + role: ['领导'] }, investigation: { "pagePath": "/pages/investigation/index", "iconPath": "/static/nav/job.png", "selectedIconPath": "/static/nav/job_active.png", - "text": "排查" + "text": "排查", + role: ['领导', '排查人员'] }, governance: { "pagePath": "/pages/governance/index", "iconPath": "/static/nav/lean.png", "selectedIconPath": "/static/nav/lean_active.png", - "text": "治理" + "text": "治理", + role: ['领导', '治理人员'] }, mine: { "pagePath": "/pages/mine/index", "iconPath": "/static/nav/mine.png", "selectedIconPath": "/static/nav/mine_active.png", - "text": "我的" + "text": "我的", + role: ['领导', '排查人员', '治理人员'] }, - "list": [ - - ], value: 0 } }, + computed: { + list() { + const routerArr = [this.home, this.approve, this.investigation, this.governance, this.mine] + const myRoles = this.$.getData('userInfo').role || [] + return routerArr.filter(item => item.role.some(role => myRoles.includes(role))) + } + }, created() { - this.initTab() + // this.initTab() }, methods: { to(item, index) { @@ -107,7 +116,7 @@ } if (role.includes('排查人员') && !role.includes('领导')) { this.list.push(this.home) - // this.list.push(this.approve) + this.list.push(this.approve) this.list.push(this.investigation) this.list.push(this.governance) this.list.push(this.mine) @@ -115,8 +124,8 @@ if (!role.includes('排查人员') && !role.includes('领导')) { this.list.push(this.home) - // this.list.push(this.approve) - // this.list.push(this.investigation) + this.list.push(this.approve) + this.list.push(this.investigation) this.list.push(this.governance) this.list.push(this.mine) } diff --git a/pages/create/create.vue b/pages/create/create.vue index 0efae49..7931b11 100644 --- a/pages/create/create.vue +++ b/pages/create/create.vue @@ -1,6 +1,11 @@