From 0e5fdf03b17845f97e695ead8f39a52ba720a6da Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Tue, 16 Apr 2024 21:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E8=80=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 1 + src/api/cart.js | 9 ++ src/api/user.js | 17 +++- src/router/index.js | 47 ++++++++++ src/store/modules/user.js | 4 +- src/utils/request.js | 14 +-- src/views/cart/index.vue | 77 +++++++++++++++++ src/views/goods/index.vue | 138 ++++++++++++++++++++++++++++++ src/views/login/index.vue | 174 ++++++++++++++++++++++++++------------ vue.config.js | 11 ++- 10 files changed, 426 insertions(+), 66 deletions(-) create mode 100644 src/api/cart.js create mode 100644 src/views/cart/index.vue create mode 100644 src/views/goods/index.vue diff --git a/.eslintignore b/.eslintignore index e6529fc..36d5749 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ build/*.js src/assets public dist +* diff --git a/src/api/cart.js b/src/api/cart.js new file mode 100644 index 0000000..f407468 --- /dev/null +++ b/src/api/cart.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; + +export function list() { + return request({ + url: '/goods/list', + method: 'get', + + }) +} diff --git a/src/api/user.js b/src/api/user.js index 8ff4389..9e716a2 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,15 +2,28 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/vue-admin-template/user/login', + url: '/auth/login', method: 'post', data }) } +export function enroll(data) { + return request({ + url: '/auth/enroll', + method: 'post', + data + }) +} +export function sendCode(phone) { + return request({ + url: '/auth/sendCode/'+phone, + method: 'post', + }) +} export function getInfo(token) { return request({ - url: '/vue-admin-template/user/info', + url: '/auth/getInfo', method: 'get', params: { token } }) diff --git a/src/router/index.js b/src/router/index.js index 13459e9..2c6b6e2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -89,6 +89,53 @@ export const constantRoutes = [ } ] }, +{ + path: '/shop', + component: Layout, + children: [ + { + path: 'index', + name: 'shop', + component: () => import('@/views/shop/index'), + meta: { title: 'shop', icon: 'form' } + } + ] + }, +{ + path: '/death', + component: Layout, + children: [ + { + path: 'index', + name: 'death', + component: () => import('@/views/death/index'), + meta: { title: 'death', icon: 'form' } + } + ] + }, +{ + path: '/goods', + component: Layout, + children: [ + { + path: 'index', + name: 'goods', + component: () => import('@/views/goods/index'), + meta: { title: 'goods', icon: 'form' } + } + ] + },{ + path: '/cart', + component: Layout, + children: [ + { + path: 'index', + name: 'cart', + component: () => import('@/views/cart/index'), + meta: { title: 'cart', icon: 'form' } + } + ] + }, { path: '/nested', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2f6423f..9697a25 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 { phone, password } = userInfo return new Promise((resolve, reject) => { - login({ username: username.trim(), password: password }).then(response => { + login({ phone: phone.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..b505065 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth' const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 5000 // request timeout + timeout: 50000 // request timeout }) // request interceptor @@ -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,15 +46,15 @@ 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 }) // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; - if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + if (res.code === 508 || res.code === 512 || res.code === 514) { // to re-login MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { confirmButtonText: 'Re-Login', @@ -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/cart/index.vue b/src/views/cart/index.vue new file mode 100644 index 0000000..be77dbd --- /dev/null +++ b/src/views/cart/index.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue new file mode 100644 index 0000000..e5d95ae --- /dev/null +++ b/src/views/goods/index.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1db2464..fa958c8 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,85 +1,134 @@