diff --git a/src/api/publicApi.js b/src/api/publicApi.js index c2ab14b..fc9676a 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -63,9 +63,9 @@ } // 搜索APP菜单列表 -export function listMenu(query) { +export function appMenuGetRouters(query) { return request({ - url: '/system/appMenu/list', + url: '/system/appMenu/getRouters', method: 'get', params: query, }); @@ -79,3 +79,28 @@ data, }); } + +// 用户密码重置 +export function updateUserPwd(data) { + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data, + }); +} +// 获取当前蒲公英APP版本 +export function appVersion(query) { + return request({ + url: '/system/version/pgyerVersion', + method: 'get', + params: query, + }); +} +// 检测APP是否有更新 +export function appVersionCheck(query) { + return request({ + url: '/system/version/pgyerVersionCheck', + method: 'get', + params: query, + }); +} diff --git a/src/api/publicApi.js b/src/api/publicApi.js index c2ab14b..fc9676a 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -63,9 +63,9 @@ } // 搜索APP菜单列表 -export function listMenu(query) { +export function appMenuGetRouters(query) { return request({ - url: '/system/appMenu/list', + url: '/system/appMenu/getRouters', method: 'get', params: query, }); @@ -79,3 +79,28 @@ data, }); } + +// 用户密码重置 +export function updateUserPwd(data) { + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data, + }); +} +// 获取当前蒲公英APP版本 +export function appVersion(query) { + return request({ + url: '/system/version/pgyerVersion', + method: 'get', + params: query, + }); +} +// 检测APP是否有更新 +export function appVersionCheck(query) { + return request({ + url: '/system/version/pgyerVersionCheck', + method: 'get', + params: query, + }); +} diff --git a/src/views/home/codeQR.vue b/src/views/home/codeQR.vue index 6e0ec46..71ebe3f 100644 --- a/src/views/home/codeQR.vue +++ b/src/views/home/codeQR.vue @@ -13,30 +13,30 @@ diff --git a/src/api/publicApi.js b/src/api/publicApi.js index c2ab14b..fc9676a 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -63,9 +63,9 @@ } // 搜索APP菜单列表 -export function listMenu(query) { +export function appMenuGetRouters(query) { return request({ - url: '/system/appMenu/list', + url: '/system/appMenu/getRouters', method: 'get', params: query, }); @@ -79,3 +79,28 @@ data, }); } + +// 用户密码重置 +export function updateUserPwd(data) { + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data, + }); +} +// 获取当前蒲公英APP版本 +export function appVersion(query) { + return request({ + url: '/system/version/pgyerVersion', + method: 'get', + params: query, + }); +} +// 检测APP是否有更新 +export function appVersionCheck(query) { + return request({ + url: '/system/version/pgyerVersionCheck', + method: 'get', + params: query, + }); +} diff --git a/src/views/home/codeQR.vue b/src/views/home/codeQR.vue index 6e0ec46..71ebe3f 100644 --- a/src/views/home/codeQR.vue +++ b/src/views/home/codeQR.vue @@ -13,30 +13,30 @@ diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue index ab63955..73b9c59 100644 --- a/src/views/home/home_homePage.vue +++ b/src/views/home/home_homePage.vue @@ -74,7 +74,7 @@ import axios from 'axios'; import bj_icon from '@/assets/images/bj_icon.png'; import { getImageUrl, getCurrentPositon } from '@/utils/common.js'; -import { listMenu } from '@/api/publicApi.js'; +import { appMenuGetRouters } from '@/api/publicApi.js'; import { getCurrentInstance } from 'vue'; import { useStore } from '@/pinia/store.js'; @@ -106,16 +106,6 @@ loading: false, finished: false, refreshing: false, - // 接口数据 - search: { - current: 0, - size: 10, - receiver: localStorage.getItem('userNo'), //接收人 - refId: '', //关联编号 - refType: '', //关联类型 - status: '', //状态(未读 unread / 已读 read) - type: '', //类型(运维工单 ops_work_order) - }, }); // 获取天气信息 @@ -161,21 +151,7 @@ b: '07-02 12:20', }, ]; - // if (AllData.refreshing) { - // AllData.list = []; - // AllData.search.current = 1; - // AllData.refreshing = false; - // } else { - // AllData.search.current++; - // } - // let res = await messagePage(AllData.search); - // if (res && res.data.code == 1) { - // AllData.list = AllData.list.concat(res.data.data.list); - // AllData.loading = false; - // if (AllData.list.length >= res.data.data.total) { - // AllData.finished = true; - // } - // } + AllData.loading = false; }; @@ -185,7 +161,7 @@ const getMenu = () => { pinias.showLoading(); // 渲染全部菜单 - listMenu({ userId: pinias.userNo }).then((res) => { + appMenuGetRouters().then((res) => { if (res && res.code == 200) { AllData.typeListData = res.data; } diff --git a/src/api/publicApi.js b/src/api/publicApi.js index c2ab14b..fc9676a 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -63,9 +63,9 @@ } // 搜索APP菜单列表 -export function listMenu(query) { +export function appMenuGetRouters(query) { return request({ - url: '/system/appMenu/list', + url: '/system/appMenu/getRouters', method: 'get', params: query, }); @@ -79,3 +79,28 @@ data, }); } + +// 用户密码重置 +export function updateUserPwd(data) { + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data, + }); +} +// 获取当前蒲公英APP版本 +export function appVersion(query) { + return request({ + url: '/system/version/pgyerVersion', + method: 'get', + params: query, + }); +} +// 检测APP是否有更新 +export function appVersionCheck(query) { + return request({ + url: '/system/version/pgyerVersionCheck', + method: 'get', + params: query, + }); +} diff --git a/src/views/home/codeQR.vue b/src/views/home/codeQR.vue index 6e0ec46..71ebe3f 100644 --- a/src/views/home/codeQR.vue +++ b/src/views/home/codeQR.vue @@ -13,30 +13,30 @@ diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue index ab63955..73b9c59 100644 --- a/src/views/home/home_homePage.vue +++ b/src/views/home/home_homePage.vue @@ -74,7 +74,7 @@ import axios from 'axios'; import bj_icon from '@/assets/images/bj_icon.png'; import { getImageUrl, getCurrentPositon } from '@/utils/common.js'; -import { listMenu } from '@/api/publicApi.js'; +import { appMenuGetRouters } from '@/api/publicApi.js'; import { getCurrentInstance } from 'vue'; import { useStore } from '@/pinia/store.js'; @@ -106,16 +106,6 @@ loading: false, finished: false, refreshing: false, - // 接口数据 - search: { - current: 0, - size: 10, - receiver: localStorage.getItem('userNo'), //接收人 - refId: '', //关联编号 - refType: '', //关联类型 - status: '', //状态(未读 unread / 已读 read) - type: '', //类型(运维工单 ops_work_order) - }, }); // 获取天气信息 @@ -161,21 +151,7 @@ b: '07-02 12:20', }, ]; - // if (AllData.refreshing) { - // AllData.list = []; - // AllData.search.current = 1; - // AllData.refreshing = false; - // } else { - // AllData.search.current++; - // } - // let res = await messagePage(AllData.search); - // if (res && res.data.code == 1) { - // AllData.list = AllData.list.concat(res.data.data.list); - // AllData.loading = false; - // if (AllData.list.length >= res.data.data.total) { - // AllData.finished = true; - // } - // } + AllData.loading = false; }; @@ -185,7 +161,7 @@ const getMenu = () => { pinias.showLoading(); // 渲染全部菜单 - listMenu({ userId: pinias.userNo }).then((res) => { + appMenuGetRouters().then((res) => { if (res && res.code == 200) { AllData.typeListData = res.data; } diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue index 6dfce22..2cb7d2e 100644 --- a/src/views/home/home_my.vue +++ b/src/views/home/home_my.vue @@ -57,12 +57,6 @@ const router = useRouter(); const pinias = useStore(); console.log(pinias, 'pinias'); -const AllData = reactive({ - userPhoto: typeImg1, - userNo: localStorage.getItem('userNo'), - realName: localStorage.getItem('realName'), - mobile: localStorage.getItem('mobile'), -}); // 退出登录 function logOut() {