Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周远喜
mes-ui
Commits
60657eca
Commit
60657eca
authored
Aug 31, 2020
by
周远喜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多租户修改
parent
2c56ca27
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
index.vue
pages/account/login/index.vue
+1
-0
add.vue
pages/basicData/user/add.vue
+3
-1
account.js
store/admin/account.js
+2
-2
No files found.
pages/account/login/index.vue
View file @
60657eca
...
...
@@ -89,6 +89,7 @@ export default {
res
.
result
.
avatarUrl
=
fileUrlDown
+
res
.
result
.
avatarUrl
;
}
let
info
=
res
.
result
;
info
.
tenantCode
=
info
.
auth
=
[
"admin"
];
info
.
avatar
=
info
.
avatarUrl
;
info
.
userId
=
info
.
id
;
...
...
pages/basicData/user/add.vue
View file @
60657eca
...
...
@@ -90,6 +90,7 @@
<
script
>
import
Api
from
"./api"
;
import
util
from
'@/libs/util'
;
const
valideTel
=
(
rule
,
value
,
callback
)
=>
{
var
re
=
/^1
[
3-9
]{1}[
0-9
]{9}
/
;
if
(
value
===
""
||
value
===
null
)
{
...
...
@@ -183,7 +184,8 @@ export default {
userId
:
r
.
result
.
id
,
loginName
:
this
.
entity
.
phone
,
//用户电话
status
:
this
.
entity
.
status
,
//状态
tenantCode
:
this
.
$store
.
state
.
userInfo
.
tenantCode
,
//商户号
// tenantCode: this.$store.state.userInfo.tenantCode, //商户号
tenantCode
:
util
.
cookies
.
get
(
'tenantCode'
),
//商户号
name
:
this
.
entity
.
userName
};
Api
.
authAccount
(
parms
).
then
(
res
=>
{
...
...
store/admin/account.js
View file @
60657eca
...
...
@@ -41,7 +41,7 @@ export const actions = {
if
(
res
.
result
)
{
util
.
cookies
.
set
(
'uuid'
,
res
.
result
.
userId
);
util
.
cookies
.
set
(
'tenantCode'
,
res
.
result
.
tenantCode
);
util
.
cookies
.
set
(
'tenantCode'
,
res
.
result
.
tenantCode
||
res
.
result
.
tanantCode
);
util
.
cookies
.
set
(
'token'
,
res
.
result
.
accessToken
);
sessionStorage
.
setItem
(
'token'
,
res
.
result
.
accessToken
)
// // 设置 vuex 用户信息
...
...
@@ -83,7 +83,7 @@ export const actions = {
});
sessionStorage
.
clear
();
localStorage
.
clear
();
$nuxt
.
$router
.
push
(
"/account/login
"
);
$nuxt
.
$router
.
push
(
"/account/login
?tenant="
+
util
.
cookies
.
get
(
'tenantCode'
)
);
}
if
(
confirm
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment