From 01597f0386907e4bd7f9355cb92404f148de1711 Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Sun, 7 Apr 2024 15:52:22 +0800 Subject: [PATCH] =?UTF-8?q?4.7=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/apis.js | 8 ++++++++ apis/http.js | 5 +++-- pages/index/index.vue | 9 +++++++++ pages/user/user.vue | 3 ++- pages/workSpace/workSpace.vue | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/apis/apis.js b/apis/apis.js index 759b71b..cef07b4 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -79,6 +79,14 @@ const index = { data, header ) + }, + async fetchCompanyName (data = {} , header = {}){ + return await Http.get( + HttpConfig.systemPath, + HttpConfig.serviceUrl.index.fetchCompanyName, + data, + header + ) } } diff --git a/apis/http.js b/apis/http.js index 15ffb69..82ad053 100644 --- a/apis/http.js +++ b/apis/http.js @@ -8,7 +8,7 @@ class HttpConfig { // baseUrl = "http://112.29.103.165:21626" // baseUrl = "http://172.20.10.3:8080" // baseUrl = "http://10.40.92.13:8080" - // baseUrl = "http://10.40.92.74:8080" + // baseUrl = "http://10.40.92.94:8080" baseUrl = "http://10.40.92.8:8080" // baseUrl = "https://z.csgmall.com.cn/gl" // #endif @@ -36,7 +36,8 @@ class HttpConfig { singleNotice: '/sysNotice/getById', // 查看单个公告 waitDo: '/app/getToDoList', // 获取待办事项 keyData: '/app/getCriticalData', // 获取关键数据 - getUserInfo: '/system/user/getInfo', // 获取用户信息 + getUserInfo: '/user/getInfo', // 获取用户信息 + fetchCompanyName: '/dept/getCompanyByAncestors', // 获取公司名称 }, fetchMaterial: { fetchMaterialList: '/type/selectMaTypeListByLevelIndex', // 获取设备列表 diff --git a/pages/index/index.vue b/pages/index/index.vue index 55b8057..41c1adf 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -256,6 +256,15 @@ import { authPath, basePath, publicPath, systemPath } from '../../public'; }).catch(err => { console.log(err); }) + // 获取公司名称 + that.$api.index.fetchCompanyName({ + ancestors: uni.getStorageSync('userInfo').sysUser.dept.ancestors + }).then(res => { + console.log(res); + if (res.data.code == 200) uni.setStorageSync('companyName', res.data.msg) + }).catch(err => { + console.log(err); + }) }, onNavigationBarButtonTap(e) { console.log(e); diff --git a/pages/user/user.vue b/pages/user/user.vue index eacfae4..dbbc2b0 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -11,7 +11,7 @@ -

宁夏送变电工程有限公司

+

{{ companyName }}

已认证 @@ -48,6 +48,7 @@ import { authPath } from '../../public' export default { data() { return { + companyName: uni.getStorageSync('companyName'), username: uni.getStorageSync('userInfo').username, phone: uni.getStorageSync('userInfo').sysUser.phonenumber } diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue index fa1679d..6d6cec2 100644 --- a/pages/workSpace/workSpace.vue +++ b/pages/workSpace/workSpace.vue @@ -1,7 +1,7 @@