|
|
@@ -50,7 +50,7 @@
|
|
|
<el-option
|
|
|
v-for="item in OrgOptions"
|
|
|
:key="item.Uorg"
|
|
|
- :label="item.name || item.schoolName"
|
|
|
+ :label="item.name ? item.name + '-' + item.schoolName : item.schoolName"
|
|
|
:value="item.Uorg"
|
|
|
>
|
|
|
</el-option>
|
|
|
@@ -141,6 +141,7 @@ import axios from "axios";
|
|
|
import qs from "qs";
|
|
|
import { API_CONFIG } from "@/common/apiConfig";
|
|
|
import "@/common/wxLogin";
|
|
|
+import { getUser } from "@/api/user";
|
|
|
|
|
|
export default {
|
|
|
name: "loginPage",
|
|
|
@@ -247,6 +248,8 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error("登录失败");
|
|
|
}
|
|
|
+ let userjson = await getUser({userid: _data.userid})
|
|
|
+ console.log('userjson', userjson);
|
|
|
this.loading = false;
|
|
|
})
|
|
|
.catch((e) => {
|
|
|
@@ -297,6 +300,8 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error("绑定失败");
|
|
|
}
|
|
|
+ let userjson = await getUser({userid: _data.userid})
|
|
|
+ console.log('userjson', userjson);
|
|
|
this.loading = false;
|
|
|
})
|
|
|
.catch((e) => {
|
|
|
@@ -425,6 +430,7 @@ export default {
|
|
|
}
|
|
|
window.sessionStorage.setItem('org2',this.org2)
|
|
|
}
|
|
|
+
|
|
|
if (_data.active === 1) {
|
|
|
window.localStorage["identity"] = JSON.stringify(_data.identity);
|
|
|
this.$message.success("登录成功");
|
|
|
@@ -433,6 +439,9 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error("登录失败");
|
|
|
}
|
|
|
+ let userjson = await getUser({userid: _data.userid})
|
|
|
+ console.log('userjson', userjson);
|
|
|
+
|
|
|
this.loading = false;
|
|
|
})
|
|
|
.catch((err) => {
|
