Browse Source

修改路由

old
jiangyy 4 years ago
parent
commit
a3f9414748
  1. 5
      .env.development
  2. 6
      src/router/index.js
  3. 22
      src/store/modules/user.js
  4. 9
      src/views/account/login.vue
  5. 6
      src/views/account/login/index.vue
  6. 3
      vue.config.js

5
.env.development

@ -1,9 +1,10 @@
# 页面标题
VUE_APP_TITLE = 问卷调查测试环境
# 接口请求地址,会设置到 axios 的 baseURL 参数上
VUE_APP_API_ROOT = /tduck-api
# VUE_APP_API_ROOT = /tduck-api
VUE_APP_API_ROOT = http://192.168.1.140/api
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VUE_APP_DEBUG_TOOL =
VUE_APP_DEBUG_TOOL =
# 高德地图key
VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d
# 微信功能开关 开启设置 ON,关闭设置 OFF

6
src/router/index.js

@ -50,6 +50,12 @@ router.beforeEach((to, from, next) => {
if (store.getters['user/isLogin']) {
next()
NProgress.done()
} else if (to.query.token) {
console.log('ro.query', to.query)
store.dispatch('user/getUserInfo', to.query.token)
store.dispatch('user/setTokens', to.query.token)
next()
NProgress.done()
} else {
next({
path: '/login',

22
src/store/modules/user.js

@ -1,4 +1,4 @@
// import api from '@/api'
import api from '@/api'
const state = {
token: localStorage.token,
@ -37,6 +37,23 @@ const actions = {
},
logout(context) {
context.commit('delData')
},
getUserInfo(context, token) {
const url = '/epmetuser/operuser/queryOperUserDto'
api.get(url, {}).then(res => {
context.commit('setData', {
token: token,
userInfo: {
...res.data
}
})
console.log('useronfo', res.data)
})
},
setTokens(context, token) {
console.log('setToekns', token)
context.commit('setToken', token)
}
}
@ -52,6 +69,9 @@ const mutations = {
state.userInfo = null
localStorage.removeItem('token')
localStorage.removeItem('userInfo')
},
setToken(state, token) {
state.token = token
}
}

9
src/views/account/login.vue

@ -281,6 +281,8 @@ export default {
]
},
accountForm: {
app: 'gov',
client: 'web',
email: '',
phoneNumber: '',
password: ''
@ -393,7 +395,7 @@ export default {
phoneRegHandle() {
this.$refs['phoneRegForm'].validate(valid => {
if (valid) {
this.$api.post('/register/phone', this.accountForm).then(() => {
this.$api.post('/tduck-api/register/phone', this.accountForm).then(() => {
this.registerSuccessHandle()
})
} else {
@ -404,7 +406,7 @@ export default {
emailRegHandle() {
this.$refs['emailRegForm'].validate(valid => {
if (valid) {
this.$api.post('/register/email', this.accountForm).then(() => {
this.$api.post('/tduck-api/register/email', this.accountForm).then(() => {
this.registerSuccessHandle()
})
} else {
@ -440,8 +442,9 @@ export default {
})
},
loginHandle() {
this.$api.request({
url: '/login/account',
url: '/tduck-api/login/account',
method: 'post',
data: this.accountForm
}).then(res => {

6
src/views/account/login/index.vue

@ -112,6 +112,8 @@ export default {
]
},
accountForm: {
app: 'gov',
client: 'web',
email: '',
phoneNumber: '',
password: ''
@ -206,7 +208,9 @@ export default {
this.$refs['accountLoginForm'].validate(valid => {
if (valid) {
this.$api.request({
url: '/login/account',
url: 'http://192.168.1.140/api/tduck-api/login/account',
// url: '/login/account',
method: 'post',
data: this.accountForm
}).then(res => {

3
vue.config.js

@ -19,7 +19,8 @@ module.exports = {
'/tduck-api': {
//target: 'http://localhost:8080/api/',
//target: 'http://localhost:8116',
target: 'http://192.168.1.142:8116',
// target: 'http://192.168.1.142:8116',
target: 'http://192.168.1.140/api',
//target: 'http://epmet-dev.elinkservice.cn:40002',
changeOrigin: true
}

Loading…
Cancel
Save