Skip to content

N
newShopFront
Commit 38e0a9cc authored by 邓学云's avatar 邓学云
Browse files
Options

Merge branch 'dengxueyun' into development

parents d49c110f 10e08070
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 104 deletions
src/api/login.js
View file @ 38e0a9cc
import api from './index'
import { axios } from '@/utils/request'
import loginToken from './token'
import homeUrl from './homeURL'
/**
* login func
......@@ -14,7 +16,7 @@ import { axios } from '@/utils/request'
*/
export function login (parameter) {
return axios({
url: '/auth/login',
url: homeUrl+'rbacuser/rbac-users/login',
method: 'post',
data: parameter
})
......
src/api/store.js
View file @ 38e0a9cc
......@@ -24,9 +24,6 @@ export function getEvaluateList (parameter) {
return axios({
url: homeUrl+'branch/branch-scores/branch-score-list',
method: 'get',
headers: {
"Authorization": loginToken
},
params: parameter
})
}
......@@ -34,10 +31,7 @@ export function getEvaluateList (parameter) {
export function getEvaluateDetails (id) {
return axios({
url: homeUrl+'branch/branch-scores/score-info?id='+id,
method: 'get',
headers: {
"Authorization": loginToken
}
method: 'get'
})
}
// 更新门店详情
......@@ -46,9 +40,6 @@ export function modifyEvaluateDetails (parameter) {
return axios({
url: homeUrl+'branch/branch-scores/score-info-update',
method: 'put',
headers: {
"Authorization": loginToken
},
data: parameter
})
}
......@@ -58,10 +49,7 @@ export function addEvaluate (parameter) {
return axios({
url: homeUrl+'branch/branch-scores/add-branch-score',
method: 'post',
data: parameter,
headers: {
"Authorization": loginToken
}
data: parameter
})
}
// 删除门店评价
......@@ -69,10 +57,7 @@ export function deleteEvaluate (id) {
console.log(id)
return axios({
url: homeUrl+'branch/branch-scores/score-info-del?guid='+id,
method: 'delete',
headers: {
"Authorization": loginToken
}
method: 'delete'
})
}
// 门店管理
......@@ -81,9 +66,6 @@ export function getStoreList (parameter) {
return axios({
url: homeUrl+'branch/branches/branch-list',
method: 'get',
headers: {
"Authorization": loginToken
},
params: parameter
})
}
......@@ -93,10 +75,7 @@ export function loadAddress (parameter) {
return axios({
url: homeUrl+'common/shop-transport-areas/area',
method: 'get',
params: parameter,
headers: {
"Authorization": loginToken
}
params: parameter
})
}
......
src/api/token.js
View file @ 38e0a9cc
const loginToken = "Bearer OflP6WaCRGeFe5byEqXDWMCh_1aYJmHS";
const loginToken = "Bearer p3j7YjxIDP2MpWgtDUl5hkalsbrFl6KV";
export default loginToken
\ No newline at end of file
src/api/userstaff.js
View file @ 38e0a9cc
......@@ -24,9 +24,6 @@ export function getUserGroup (parameter) {
return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-list',
method: 'get',
headers: {
"Authorization": loginToken
},
params: parameter
})
}
......@@ -35,20 +32,14 @@ export function addUserGroup (parameter) {
return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-add',
method: 'post',
data: parameter,
headers: {
"Authorization": loginToken
}
data: parameter
})
}
// 获取用户组详情
export function getUserGroupDetails (id) {
return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-detail?guid='+id,
method: 'get',
headers: {
"Authorization": loginToken
}
method: 'get'
})
}
// 修改用户组详情
......@@ -57,9 +48,6 @@ export function getUserGroupDetails (id) {
return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-revise',
method: 'put',
headers: {
"Authorization": loginToken
},
data: parameter
})
}
......@@ -68,9 +56,6 @@ export function getUserGroupDetails (id) {
return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-delete',
method: 'delete',
headers: {
"Authorization": loginToken
},
data: {'GUID':id}
})
}
......@@ -84,9 +69,6 @@ export function getUserGroupDetails (id) {
return axios({
url: homeUrl+'shopuser/shop-user-lists/user-list',
method: 'get',
headers: {
"Authorization": loginToken
},
params: parameter
})
}
......@@ -104,10 +86,7 @@ export function getUListUserGroup () {
export function getUListDetails (id) {
return axios({
url: homeUrl+'shopuser/shop-user-lists/user-detail?GUID='+id,
method: 'get',
headers: {
"Authorization": loginToken
}
method: 'get'
})
}
// 修改用户列表
......@@ -118,20 +97,14 @@ export function UListModify (parameter) {
return axios({
url: homeUrl+'shopuser/shop-user-lists/user-update',
method: 'post',
data: parameter,
headers: {
"Authorization": loginToken
}
data: parameter
})
}
// 获取用户组列表
export function getUGroupList () {
return axios({
url: homeUrl+'shopuser/shop-user-lists/get-member-grade-list',
method: 'get',
headers: {
"Authorization": loginToken
}
method: 'get'
})
}
......
src/layouts/BasicLayout.vue
View file @ 38e0a9cc
......@@ -70,6 +70,7 @@ import SideMenu from '@/components/Menu/SideMenu'
import GlobalHeader from '@/components/GlobalHeader'
import GlobalFooter from '@/components/GlobalFooter'
import SettingDrawer from '@/components/SettingDrawer'
import { asyncRouterMap } from '@/config/router.config.js'
export default {
name: 'BasicLayout',
......@@ -109,8 +110,10 @@ export default {
}
},
created () {
this.menus = this.mainMenu.find(item => item.path === '/').children
this.collapsed = !this.sidebarOpened
// this.menus = this.mainMenu.find(item => item.path === '/').children
// this.collapsed = !this.sidebarOpened
this.menus=asyncRouterMap.find((item) => item.path === '/').children
this.collapsed=!this.sidebarOpened
},
mounted () {
const userAgent = navigator.userAgent
......
src/permission.js
View file @ 38e0a9cc
......@@ -17,42 +17,46 @@ router.beforeEach((to, from, next) => {
NProgress.start() // start progress bar
to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
if (Vue.ls.get(ACCESS_TOKEN)) {
console.log(Vue.ls.get(ACCESS_TOKEN))
/* has token */
if (to.path === '/user/login') {
next({ path: defaultRoutePath })
NProgress.done()
} else {
if (store.getters.roles.length === 0) {
store
.dispatch('GetInfo')
.then(res => {
const roles = res.result && res.result.role
store.dispatch('GenerateRoutes', { roles }).then(() => {
// 根据roles权限生成可访问的路由表
// 动态添加可访问路由表
router.addRoutes(store.getters.addRouters)
const redirect = decodeURIComponent(from.query.redirect || to.path)
if (to.path === redirect) {
// hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
next({ ...to, replace: true })
} else {
// 跳转到目的路由
next({ path: redirect })
}
})
})
.catch(() => {
notification.error({
message: '错误',
description: '请求用户信息失败，请重试'
})
store.dispatch('Logout').then(() => {
next({ path: '/user/login', query: { redirect: to.fullPath } })
})
})
} else {
console.log(to.path)
next()
}
// if (store.getters.roles.length === 0) {
// store
// .dispatch('GetInfo')
// .then(res => {
// const roles = res.result && res.result.role
// store.dispatch('GenerateRoutes', { roles }).then(() => {
// // 根据roles权限生成可访问的路由表
// // 动态添加可访问路由表
// router.addRoutes(store.getters.addRouters)
// const redirect = decodeURIComponent(from.query.redirect || to.path)
// if (to.path === redirect) {
// // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
// next({ ...to, replace: true })
// } else {
// // 跳转到目的路由
// next({ path: redirect })
// }
// })
// })
// .catch(() => {
// notification.error({
// message: '错误',
// description: '请求用户信息失败，请重试'
// })
// store.dispatch('Logout').then(() => {
// next({ path: '/user/login', query: { redirect: to.fullPath } })
// })
// })
// } else {
// next()
// }
}
} else {
if (whiteList.includes(to.name)) {
......
src/router/index.js
View file @ 38e0a9cc
import Vue from 'vue'
import Router from 'vue-router'
import { constantRouterMap } from '@/config/router.config'
import { constantRouterMap,asyncRouterMap } from '@/config/router.config'
// hack router push callback
const originalPush = Router.prototype.push
Router.prototype.push = function push (location, onResolve, onReject) {
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
return originalPush.call(this, location).catch(err => err)
}
// const originalPush = Router.prototype.push
// Router.prototype.push = function push (location, onResolve, onReject) {
// if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
// return originalPush.call(this, location).catch(err => err)
// }
Vue.use(Router)
......@@ -15,5 +15,5 @@ export default new Router({
mode: 'history',
base: process.env.BASE_URL,
scrollBehavior: () => ({ y: 0 }),
routes: constantRouterMap
routes: constantRouterMap.concat(asyncRouterMap)
})
src/store/modules/user.js
View file @ 38e0a9cc
......@@ -37,9 +37,10 @@ const user = {
Login ({ commit }, userInfo) {
return new Promise((resolve, reject) => {
login(userInfo).then(response => {
const result = response.result
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token)
console.log(response.access_token)
const result = response
Vue.ls.set(ACCESS_TOKEN, result.access_token, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.access_token)
resolve()
}).catch(error => {
reject(error)
......@@ -88,7 +89,7 @@ const user = {
resolve()
}).finally(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
// commit('SET_ROLES', [])
Vue.ls.remove(ACCESS_TOKEN)
})
})
......
src/utils/request.js
View file @ 38e0a9cc
......@@ -43,6 +43,7 @@ service.interceptors.request.use(config => {
const token = Vue.ls.get(ACCESS_TOKEN)
if (token) {
config.headers['Access-Token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
config.headers['Authorization'] = 'Bearer '+token
}
return config
}, err)
......
src/views/user/Login.vue
View file @ 38e0a9cc
......@@ -191,7 +191,12 @@ export default {
const loginParams = { ...values }
delete loginParams.username
loginParams[!state.loginType ? 'email' : 'username'] = values.username
loginParams.password = md5(values.password)
// loginParams.password = md5(values.password)
loginParams.CODE = values.username
loginParams.PASSWORD = values.password
delete loginParams.password
delete loginParams.username
console.log(loginParams)
Login(loginParams)
.then((res) => this.loginSuccess(res))
.catch(err => this.requestFailed(err))
......@@ -272,6 +277,7 @@ export default {
this.isLoginError = false
},
requestFailed (err) {
console.log('错误')
this.isLoginError = true
this.$notification['error']({
message: '错误',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment