|
@@ -4,7 +4,7 @@ import { UserState } from './state'
|
|
|
import { Mutations } from './mutations'
|
|
|
import { UserMutationTypes } from './mutation-types'
|
|
|
import { UserActionTypes } from './action-types'
|
|
|
-import { getCookieMac, removeToken, setSessionUserInfo, setToken } from '@/utils/cookies'
|
|
|
+import { getCookieMac, getCookieMacNew, removeToken, setSessionUserInfo, setToken } from '@/utils/cookies'
|
|
|
import { PermissionActionType } from '../permission/action-types'
|
|
|
import router, { resetRouter } from '@/router'
|
|
|
import { useRoute, useRouter } from 'vue-router'
|
|
@@ -76,11 +76,11 @@ export const actions: ActionTree<UserState, RootState> & Actions = {
|
|
|
// let nowProjectId: any = 'Pj1101080259'
|
|
|
const userInfo: any = {
|
|
|
// userName: '陈珍',
|
|
|
- userName: 'admin',
|
|
|
+ userName: getCookieMacNew() ? getCookieMacNew() : 'admin',
|
|
|
// userPhone: 15321277745,
|
|
|
userPhone: 11111111111,
|
|
|
// userId: '602ef709beb64a1f9a4b6af2196d0af7',
|
|
|
- userId:'admin'
|
|
|
+ userId: getCookieMac() ? getCookieMac() : 'admin',
|
|
|
// userId: '9a1ecfbacb6b4f249bf2dd3ec7793ead'
|
|
|
// userId: '1302990695845462811'
|
|
|
}
|