From 23883114864e34a37bf2569c64a7abcb2a02528f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com> Date: Tue, 9 Aug 2022 19:19:59 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vue-element-admin/api/admin_menus.js | 30 ++++++++----- .../vue-element-admin/store/modules/user.js | 9 ++-- .../views/admin_menus/index.vue | 43 ++++++++++++++++--- .../views/admin_roles/index.vue | 2 +- .../vue-element-admin/views/admins/index.vue | 11 +---- 5 files changed, 64 insertions(+), 31 deletions(-) diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js index 05c2fd5..80cb663 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js +++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js @@ -7,41 +7,51 @@ export function getMenusSelect() { }) } -export function getList(params) { +export function getList(params, get_url = false) { + var url = '/admin_menus'; + if (get_url) return url; return request({ - url: 'admin_menus', + url: url, method: 'get', params }) } -export function create(data) { +export function create(data, get_url = false) { + var url = `/admin_menus/create`; + if (get_url) return url; return request({ - url: '/admin_menus/create', + url: url, method: 'post', data }) } -export function update(data) { +export function update(data, get_url = false) { + var url = `/admin_menus/update`; + if (get_url) return url; return request({ - url: `/admin_menus/update`, + url: url, method: 'put', data }) } -export function setDel(data) { +export function setDel(data, get_url = false) { + var url = `/admin_menus/delete`; + if (get_url) return url; return request({ - url: `/admin_menus/delete`, + url: url, method: 'delete', data }) } -export function changeFiledStatus(data) { +export function changeFiledStatus(data, get_url = false) { + var url = `/admin_menus/changeFiledStatus`; + if (get_url) return url; return request({ - url: `/admin_menus/changeFiledStatus`, + url: url, method: 'put', data }) diff --git a/app/Modules/Admin/Resources/vue-element-admin/store/modules/user.js b/app/Modules/Admin/Resources/vue-element-admin/store/modules/user.js index b08cc83..7df2b53 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/store/modules/user.js +++ b/app/Modules/Admin/Resources/vue-element-admin/store/modules/user.js @@ -1,7 +1,7 @@ import { login, logout, - getInfo, + getInfo as getLoginUserApi, getMenus } from '@/api/login'; @@ -65,7 +65,7 @@ const actions = { commit('SET_TOKEN', data.access_token); setToken(data.access_token); - console.log('登录完成 - login - end'); + // console.log('登录完成 - login - end'); resolve(); }).catch(error => { reject(error) @@ -75,10 +75,9 @@ const actions = { // get user info getInfo({commit, state}) { - - console.log('获取基本信息 - getInfo'); + // console.log('获取基本信息 - getInfo'); return new Promise((resolve, reject) => { - getInfo(state.token).then(response => { + getLoginUserApi().then(response => { const {data} = response if (!data) { diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue index 20292dd..bf794d8 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue +++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue @@ -2,6 +2,7 @@