提交登陆

王富生
1 parent 89d744de
Showing 6 changed files with 55 additions and 35 deletions
.env.development
src/api/user.js
src/main.js
src/store/modules/user.js
src/utils/request.js
src/views/login/index.vue
@@ -2,7 +2,7 @@
 ENV = 'development'
 # base api '/dev-api'
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8099'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
@@ -2,23 +2,36 @@ import request from &#39;@/utils/request&#39;
 export function login(data) {
   return request({
-    url: '/user/login',
+    url: '/personPc/login',
     method: 'post',
-    data
+    params: { userPhone:data.userPhone,validatorCode:data.validatorCode }
   })
 }
 export function getInfo(token) {
+  debugger
   return request({
-    url: '/user/info',
-    method: 'get',
+    url: '/personPc/getUserInfo',
+    method: 'post',
     params: { token }
   })
 }
+/**
+ * userPhone
+ * @param userPhone
+ */
+export function sendValidatorCode(userPhone) {
+  return request({
+    url: '/personPc/sendValidatorCode',
+    method: 'post',
+    params: { userPhone }
+  })
+}
+
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: '/personPc/logout',
     method: 'post'
   })
 }
@@ -23,10 +23,10 @@ import &#39;@/permission&#39; // permission control
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
  */
-import { mockXHR } from '../mock'
-if (process.env.NODE_ENV === 'production') {
-  mockXHR()
-}
+// import { mockXHR } from '../mock'
+// if (process.env.NODE_ENV === 'production') {
+//   mockXHR()
+// }
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })
@@ -5,7 +5,8 @@ import { resetRouter } from &#39;@/router&#39;
 const state = {
   token: getToken(),
   name: '',
-  avatar: ''
+  avatar: '',
+  userInfo:''
 }
 const mutations = {
@@ -17,16 +18,21 @@ const mutations = {
   },
   SET_AVATAR: (state, avatar) => {
     state.avatar = avatar
+  },
+  SET_USERINFO: (state, userInfo) => {
+    state.userInfo = userInfo
   }
 }
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    debugger
+    const { phone, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
+      login({ userPhone: phone.trim(), validatorCode: password }).then(response => {
         const { data } = response
+        debugger;
         commit('SET_TOKEN', data.token)
         setToken(data.token)
         resolve()
@@ -39,6 +45,7 @@ const actions = {
   // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
+      debugger
       getInfo(state.token).then(response => {
         const { data } = response
@@ -46,11 +53,13 @@ const actions = {
           reject('Verification failed, please Login again.')
         }
-        const { name, avatar } = data
+        const { custName, headPicUrl } = data
+
+        commit('SET_NAME', custName)
+        commit('SET_AVATAR', headPicUrl)
+        commit('SET_USERINFO', data)
-        commit('SET_NAME', name)
-        commit('SET_AVATAR', avatar)
-        resolve(data)
+        resolve({roles:[]})
       }).catch(error => {
         reject(error)
       })
@@ -7,7 +7,7 @@ import { getToken } from &#39;@/utils/auth&#39;
 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['X-Auth-Token'] = getToken()
     }
     return config
   },
@@ -44,34 +44,21 @@ service.interceptors.response.use(
    */
   response => {
     const res = response.data
-
     // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
+    if (res.code !='8888') {
       Message({
         message: res.message || '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) {
-        // 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',
-          cancelButtonText: 'Cancel',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
       return res
     }
   },
   error => {
+    debugger
     console.log('err' + error) // for debug
     Message({
       message: error.message,
@@ -51,6 +51,7 @@
 <script>
 import {validUsername} from '@/utils/validate'
+import {sendValidatorCode} from '@/api/user.js'
 export default {
   name: 'Login',
@@ -99,6 +100,7 @@ export default {
   },
   methods: {
     getVerifyCode(){
+      let phone = this.loginForm.phone;
       if (!this.loginForm.phone) {
         new Error('请输入手机号!');
       } else if(!/^1[345678]\d{9}$/.test(this.loginForm.phone)) {
@@ -106,7 +108,15 @@ export default {
       }
       //获取验证码
       else {
-        this.validateBtn()
+        sendValidatorCode(phone).then(response =>{
+            if(response.code=='8888'){
+              this.$message({
+                type: 'success',
+                message: '验证码发送成功！'
+              });
+            }
+        });
+        this.validateBtn();
       }
     },
     validateBtn(){
@@ -126,6 +136,7 @@ export default {
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
+        debugger
         if (valid) {
           this.loading = true
           this.$store.dispatch('user/login', this.loginForm).then(() => {