From fb98814aec0d2592ef5a8272a8a9b4d28c54c121 Mon Sep 17 00:00:00 2001 From: yaoxin <1752800946@qq.com> Date: Wed, 6 Mar 2024 12:44:42 +0800 Subject: [PATCH] week_02 --- src/api/house.js | 38 +++++ src/api/user.js | 9 +- src/main.js | 2 +- src/router/index.js | 204 +++++++++++++------------- src/store/modules/user.js | 4 +- src/utils/request.js | 10 +- src/views/house/index.vue | 293 ++++++++++++++++++++++++++++++++++++++ src/views/login/index.vue | 33 ++--- vue.config.js | 10 +- 9 files changed, 469 insertions(+), 134 deletions(-) create mode 100644 src/api/house.js create mode 100644 src/views/house/index.vue diff --git a/src/api/house.js b/src/api/house.js new file mode 100644 index 0000000..8c2bb59 --- /dev/null +++ b/src/api/house.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +export function houseList(data) { + return request({ + url: '/house/house/HouseList', + method: 'post', + data + }) +} + +export function typeList() { + return request({ + url: '/house/house/TypeList', + method: 'get' + }) +} + +export function addRent(data) { + return request({ + url: '/house/house/AddRent', + method: 'post', + data + }) +} + +export function rentList() { + return request({ + url: '/house/house/RentList', + method: 'get' + }) +} + +export function removeRent(rid) { + return request({ + url: '/house/house/RemoveRent?rid=' + rid, + method: 'get' + }) +} diff --git a/src/api/user.js b/src/api/user.js index 8ff4389..e9ee15e 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/vue-admin-template/user/login', + url: '/auth/auth/Login', method: 'post', data }) @@ -10,15 +10,14 @@ export function login(data) { export function getInfo(token) { return request({ - url: '/vue-admin-template/user/info', - method: 'get', - params: { token } + url: '/auth/auth/info', + method: 'get' }) } export function logout() { return request({ - url: '/vue-admin-template/user/logout', + url: '/auth/auth/logout', method: 'post' }) } diff --git a/src/main.js b/src/main.js index 01cba2f..c5d6f13 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' -import locale from 'element-ui/lib/locale/lang/en' // lang i18n +import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import '@/styles/index.scss' // global css diff --git a/src/router/index.js b/src/router/index.js index 13459e9..c988ee9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,111 +54,123 @@ export const constantRoutes = [ meta: { title: 'Dashboard', icon: 'dashboard' } }] }, - { - path: '/example', - component: Layout, - redirect: '/example/table', - name: 'Example', - meta: { title: 'Example', icon: 'el-icon-s-help' }, - children: [ - { - path: 'table', - name: 'Table', - component: () => import('@/views/table/index'), - meta: { title: 'Table', icon: 'table' } - }, - { - path: 'tree', - name: 'Tree', - component: () => import('@/views/tree/index'), - meta: { title: 'Tree', icon: 'tree' } - } - ] - }, - - { - path: '/form', + path: '/house', component: Layout, children: [ { path: 'index', - name: 'Form', - component: () => import('@/views/form/index'), - meta: { title: 'Form', icon: 'form' } + name: 'House', + component: () => import('@/views/house/index'), + meta: { title: '房屋管理', icon: 'form' } } ] }, - { - path: '/nested', - component: Layout, - redirect: '/nested/menu1', - name: 'Nested', - meta: { - title: 'Nested', - icon: 'nested' - }, - children: [ - { - path: 'menu1', - component: () => import('@/views/nested/menu1/index'), // Parent router-view - name: 'Menu1', - meta: { title: 'Menu1' }, - children: [ - { - path: 'menu1-1', - component: () => import('@/views/nested/menu1/menu1-1'), - name: 'Menu1-1', - meta: { title: 'Menu1-1' } - }, - { - path: 'menu1-2', - component: () => import('@/views/nested/menu1/menu1-2'), - name: 'Menu1-2', - meta: { title: 'Menu1-2' }, - children: [ - { - path: 'menu1-2-1', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), - name: 'Menu1-2-1', - meta: { title: 'Menu1-2-1' } - }, - { - path: 'menu1-2-2', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), - name: 'Menu1-2-2', - meta: { title: 'Menu1-2-2' } - } - ] - }, - { - path: 'menu1-3', - component: () => import('@/views/nested/menu1/menu1-3'), - name: 'Menu1-3', - meta: { title: 'Menu1-3' } - } - ] - }, - { - path: 'menu2', - component: () => import('@/views/nested/menu2/index'), - name: 'Menu2', - meta: { title: 'menu2' } - } - ] - }, - - { - path: 'external-link', - component: Layout, - children: [ - { - path: 'https://panjiachen.github.io/vue-element-admin-site/#/', - meta: { title: 'External Link', icon: 'link' } - } - ] - }, + // { + // path: '/example', + // component: Layout, + // redirect: '/example/table', + // name: 'Example', + // meta: { title: 'Example', icon: 'el-icon-s-help' }, + // children: [ + // { + // path: 'table', + // name: 'Table', + // component: () => import('@/views/table/index'), + // meta: { title: 'Table', icon: 'table' } + // }, + // { + // path: 'tree', + // name: 'Tree', + // component: () => import('@/views/tree/index'), + // meta: { title: 'Tree', icon: 'tree' } + // } + // ] + // }, + // + // { + // path: '/form', + // component: Layout, + // children: [ + // { + // path: 'index', + // name: 'Form', + // component: () => import('@/views/form/index'), + // meta: { title: 'Form', icon: 'form' } + // } + // ] + // }, + // + // { + // path: '/nested', + // component: Layout, + // redirect: '/nested/menu1', + // name: 'Nested', + // meta: { + // title: 'Nested', + // icon: 'nested' + // }, + // children: [ + // { + // path: 'menu1', + // component: () => import('@/views/nested/menu1/index'), // Parent router-view + // name: 'Menu1', + // meta: { title: 'Menu1' }, + // children: [ + // { + // path: 'menu1-1', + // component: () => import('@/views/nested/menu1/menu1-1'), + // name: 'Menu1-1', + // meta: { title: 'Menu1-1' } + // }, + // { + // path: 'menu1-2', + // component: () => import('@/views/nested/menu1/menu1-2'), + // name: 'Menu1-2', + // meta: { title: 'Menu1-2' }, + // children: [ + // { + // path: 'menu1-2-1', + // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), + // name: 'Menu1-2-1', + // meta: { title: 'Menu1-2-1' } + // }, + // { + // path: 'menu1-2-2', + // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), + // name: 'Menu1-2-2', + // meta: { title: 'Menu1-2-2' } + // } + // ] + // }, + // { + // path: 'menu1-3', + // component: () => import('@/views/nested/menu1/menu1-3'), + // name: 'Menu1-3', + // meta: { title: 'Menu1-3' } + // } + // ] + // }, + // { + // path: 'menu2', + // component: () => import('@/views/nested/menu2/index'), + // name: 'Menu2', + // meta: { title: 'menu2' } + // } + // ] + // }, + // + // { + // path: 'external-link', + // component: Layout, + // children: [ + // { + // path: 'https://panjiachen.github.io/vue-element-admin-site/#/', + // meta: { title: 'External Link', icon: 'link' } + // } + // ] + // }, // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2f6423f..ba9381b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -30,9 +30,9 @@ const mutations = { const actions = { // user login login({ commit }, userInfo) { - const { username, password } = userInfo + const { tel, password } = userInfo return new Promise((resolve, reject) => { - login({ username: username.trim(), password: password }).then(response => { + login({ tel: tel.trim(), password: password }).then(response => { const { data } = response commit('SET_TOKEN', data.token) setToken(data.token) diff --git a/src/utils/request.js b/src/utils/request.js index 2fb95ac..582b5e1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ service.interceptors.request.use( // let each request carry token // ['X-Token'] is a custom headers key // please modify it according to the actual situation - config.headers['X-Token'] = getToken() + config.headers['token'] = getToken() } return config }, @@ -46,9 +46,9 @@ service.interceptors.response.use( const res = response.data // if the custom code is not 20000, it is judged as an error. - if (res.code !== 20000) { + if (res.code !== 200) { Message({ - message: res.message || 'Error', + message: res.msg || 'Error', type: 'error', duration: 5 * 1000 }) @@ -66,7 +66,7 @@ service.interceptors.response.use( }) }) } - return Promise.reject(new Error(res.message || 'Error')) + return Promise.reject(new Error(res.msg || 'Error')) } else { return res } @@ -74,7 +74,7 @@ service.interceptors.response.use( error => { console.log('err' + error) // for debug Message({ - message: error.message, + message: error.msg, type: 'error', duration: 5 * 1000 }) diff --git a/src/views/house/index.vue b/src/views/house/index.vue new file mode 100644 index 0000000..a74743a --- /dev/null +++ b/src/views/house/index.vue @@ -0,0 +1,293 @@ + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1db2464..7b79326 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -6,15 +6,15 @@

Login Form

- +