feat(): 正常接入支付

src/api/user.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function login(data) {
   return request({
-    url: '/vehicle/user/login',
+    url: '/system/auth/login',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function login(data) {
 
 export function getInfo(token) {
   return request({
-    url: '/vehicle/user/info',
+    url: '/system/auth/info',
     method: 'get',
     params: { token }
   })
@@ -18,7 +18,7 @@ export function getInfo(token) {
 
 export function logout() {
   return request({
-    url: '/vehicle/user/logout',
+    url: '/system/auth/logout',
     method: 'post'
   })
 }

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
+import {getInfo, login} from '@/api/user'
 
 const getDefaultState = () => {
   return {
@@ -29,49 +30,37 @@ const mutations = {
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    // const { username, password } = userInfo
+    const { userName, password } = userInfo
     return new Promise((resolve, reject) => {
-      commit('SET_TOKEN', 'token')
+      login({ userName: userName.trim(), password: password }).then(response => {
-      setToken('token')
-      resolve()
-      /* login({ username: username.trim(), password: password }).then(response => {
         const { data } = response
-        commit('SET_TOKEN', data.token)
+        commit('SET_TOKEN', data)
-        setToken(data.token)
+        setToken(data)
         resolve()
       }).catch(error => {
         reject(error)
-      }) */
+      })
     })
   },
 
   // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
-      const data = {
+      getInfo(state.token).then(response => {
-        'name': '今天你努力了吗',
-        'avatar': 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif'
-      }
-      const { name, avatar } = data
-
-      commit('SET_NAME', name)
-      commit('SET_AVATAR', avatar)
-      resolve(data)
-      /* getInfo(state.token).then(response => {
         const { data } = response
 
         if (!data) {
-          return reject('Verification failed, please Login again.')
+          return reject('验证失败，请再次登录。')
         }
 
-        const { name, avatar } = data
+        const { userName } = data
 
-        commit('SET_NAME', name)
+        commit('SET_NAME', userName)
-        commit('SET_AVATAR', avatar)
+        commit('SET_AVATAR', "'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif'")
         resolve(data)
       }).catch(error => {
         reject(error)
-      }) */
+      })
     })
   },
 

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['Authorization'] = getToken()
     }
     return config
   },

src/views/login/index.vue

@@ -6,19 +6,18 @@
         <h3 class="title">车辆模拟</h3>
       </div>
 
-      <el-form-item prop="username">
+      <el-form-item prop="userName">
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
         <el-input
-          ref="username"
+          ref="userName"
-          v-model="loginForm.username"
+          v-model="loginForm.userName"
-          placeholder="Username"
+          placeholder="userName"
-          name="username"
+          name="userName"
           type="text"
           tabindex="1"
           auto-complete="on"
-          readonly
         />
       </el-form-item>
 
@@ -29,7 +28,7 @@
         <el-input
           ref="password"
           v-model="loginForm.password"
-          type="text"
+          type="password"
           placeholder="Password"
           name="password"
           tabindex="2"
@@ -51,11 +50,11 @@ export default {
   data() {
     return {
       loginForm: {
-        username: '你永远是最棒的',
+        userName: '',
-        password: '加油，一切都是值得的'
+        password: ''
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur' }],
+        userName: [{ required: true, trigger: 'blur' }],
         password: [{ required: true, trigger: 'blur' }]
       },
       loading: false,