Commit 60657eca authored by 周远喜's avatar 周远喜

多租户修改

parent 2c56ca27
...@@ -89,6 +89,7 @@ export default { ...@@ -89,6 +89,7 @@ export default {
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl; res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
} }
let info = res.result; let info = res.result;
info.tenantCode=
info.auth = ["admin"]; info.auth = ["admin"];
info.avatar = info.avatarUrl; info.avatar = info.avatarUrl;
info.userId = info.id; info.userId = info.id;
......
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<script> <script>
import Api from "./api"; import Api from "./api";
import util from '@/libs/util';
const valideTel = (rule, value, callback) => { const valideTel = (rule, value, callback) => {
var re = /^1[3-9]{1}[0-9]{9}/; var re = /^1[3-9]{1}[0-9]{9}/;
if (value === "" || value === null) { if (value === "" || value === null) {
...@@ -183,7 +184,8 @@ export default { ...@@ -183,7 +184,8 @@ export default {
userId: r.result.id, userId: r.result.id,
loginName: this.entity.phone, //用户电话 loginName: this.entity.phone, //用户电话
status: this.entity.status, //状态 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 name: this.entity.userName
}; };
Api.authAccount(parms).then(res => { Api.authAccount(parms).then(res => {
......
...@@ -41,7 +41,7 @@ export const actions = { ...@@ -41,7 +41,7 @@ export const actions = {
if (res.result) { if (res.result) {
util.cookies.set('uuid', res.result.userId); 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); util.cookies.set('token', res.result.accessToken);
sessionStorage.setItem('token', res.result.accessToken) sessionStorage.setItem('token', res.result.accessToken)
// // 设置 vuex 用户信息 // // 设置 vuex 用户信息
...@@ -83,7 +83,7 @@ export const actions = { ...@@ -83,7 +83,7 @@ export const actions = {
}); });
sessionStorage.clear(); sessionStorage.clear();
localStorage.clear(); localStorage.clear();
$nuxt.$router.push("/account/login"); $nuxt.$router.push("/account/login?tenant="+util.cookies.get('tenantCode'));
} }
if (confirm) { if (confirm) {
......
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