소스 검색

初始化init

yun-mo 1 년 전
부모
커밋
d5f1c45874
9개의 변경된 파일38개의 추가작업 그리고 20개의 파일을 삭제
  1. 3 3
      src/api/institutionApi/login.js
  2. 7 0
      src/api/userApi/login.js
  3. 3 0
      src/components/OrderTypeList.vue
  4. 1 0
      src/permission.js
  5. 1 1
      src/store/institution.js
  6. 2 2
      src/store/user.js
  7. 3 9
      src/util/auth.js
  8. 1 1
      src/util/http.js
  9. 17 4
      vue.config.js

+ 3 - 3
src/api/institutionApi/login.js

@@ -1,13 +1,13 @@
 import http from '@/util/http'
 
 export const login = (data) => http({
-  url: '/',
+  url: '/login',
   method: 'POST',
   data
 })
 
-export const getUserInfo = (data) => http({
+export const getUserInfo = (params) => http({
   url: '/userinfo',
   method: 'GET',
-  data
+  params
 })

+ 7 - 0
src/api/userApi/login.js

@@ -0,0 +1,7 @@
+import http from '@/util/http'
+
+export const login = (data) => http({
+  url: '/login',
+  method: 'POST',
+  data
+})

+ 3 - 0
src/components/OrderTypeList.vue

@@ -38,6 +38,9 @@ export default {
   width: 91.4vw;
   margin-left: 4.3vw;
   overflow: hidden;
+  ::v-deep .van-cell  {
+    white-space: nowrap;
+  }
   ::v-deep .van-cell-group--inset{
     margin: 0;
     border-radius: 0;

+ 1 - 0
src/permission.js

@@ -32,6 +32,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单,直接进入
       next()
     } else {
+      Toast.fail('登入失败请检查')
       next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       NProgress.done()
     }

+ 1 - 1
src/store/institution.js

@@ -1,5 +1,5 @@
 // 机构 store
-import login from '@/api/institutionApi/login'
+import { login } from '@/api/institutionApi/login'
 import { setToken } from '@/util/auth'
 
 const state = () => ({

+ 2 - 2
src/store/user.js

@@ -1,5 +1,5 @@
 // 用户 store
-import login from '@/api/institutionApi/login'
+import { login } from '@/api/userApi/login'
 import { setToken } from '@/util/auth'
 
 const state = () => ({
@@ -14,7 +14,7 @@ const mutations = {
 }
 
 const actions = {
-  insLogin: ({ commit }, userInfo) => {
+  userLogin: ({ commit }, userInfo) => {
     return new Promise((resolve, reject) => {
       login(userInfo).then(res => {
         setToken(res.token)

+ 3 - 9
src/util/auth.js

@@ -2,14 +2,8 @@ import Cookies from 'js-cookie'
 
 const token = 'Dis-Token'
 
-const getToken = () => Cookies.get(token)
+export const getToken = () => Cookies.get(token)
 
-const setToken = (t) => Cookies.set(token, t)
+export const setToken = (t) => Cookies.set(token, t)
 
-const removeToken = () => Cookies.remove(token)
-
-export default {
-  getToken,
-  setToken,
-  removeToken
-}
+export const removeToken = () => Cookies.remove(token)

+ 1 - 1
src/util/http.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import Vue from 'vue'
-import { getToken, removeToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/util/auth'
 import { Toast } from 'vant'
 
 // 请求池-用于存储请求接口-防止重复提交

+ 17 - 4
vue.config.js

@@ -1,6 +1,19 @@
 module.exports = {
-  publicPath: './',
-  // outputDir: 'dist',
-  // assetsDir: 'static',
-  devServer: {}
+  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
+  outputDir: 'dist',
+  assetsDir: 'static',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  devServer: {
+    host: '0.0.0.0',
+    open: true,
+    proxy: {
+      [process.env.BASE_URL]: {
+        target: 'http://localhost:8080',
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.BASE_URL]: ''
+        }
+      }
+    }
+  }
 }