admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加完善邮箱标识判断(登录时)

Browse Source
This commit is contained in:
kun 2024-06-25 18:10:33 +08:00
parent 27f553fd77
commit 1a8d01b208
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/js/http.js
View File

@ -188,6 +188,7 @@ if (process.env.NODE_ENV == "development") {
axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {

2
src/components/header.vue
View File

@ -145,7 +145,7 @@
<p
v-show="
$route.path.indexOf('projectIndex') != -1 &&
$store.state.userInfo.projectKanban == 0 && company != 'agjt'
$store.state.userInfo.projectKanban == 0
"
class="header-btn"
@click="toOverview2()"

16
src/store/index.js
View File

@ -58,17 +58,17 @@ export default new Vuex.Store({
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl ?
// baseUrl :
// window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
BASEURL: baseUrl ?
baseUrl :
window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl

13
src/views/home/login_v2.vue
View File

@ -1066,7 +1066,7 @@ export default {
this.$http.defaults.headers.common["operateId"] = data.userId;
this.$store.commit("setUserInfo", data);
localStorage.setItem("jumpToken", data.token); //储存token到本地
let isHaveUserCenterMenu = false; // 判断是否有用户中心模块
var moduleList = data.menuAuthority.moduleList
? data.menuAuthority.moduleList
: [];
@ -1088,6 +1088,9 @@ export default {
if (element.moduleType == 5) {
projectModule.push(element);
}
if (element.modulePath == "/userCenter/userConfig") {
isHaveUserCenterMenu = true;
}
});
var menu2 = [
{
@ -1121,7 +1124,6 @@ export default {
// path: '/brand'
// }
];
console.log(data.accountType, "777888");
switch (data.accountType) {
case 1:
this.$store.commit("setMenuList", menu2);
@ -1178,7 +1180,8 @@ export default {
if (!arr2.length) {
if (this.loginType == 1) {
// this.$router.push("/projectIndex");
if (!this.$store.state.userInfo.personMail && this.company == 'agjt') {
console.log(123456,isHaveUserCenterMenu)
if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
this.checkInfoComplete();
}
this.$router.push("/workSpace");
@ -1190,13 +1193,15 @@ export default {
}
} else {
// styleType == 3 衢州版
console.log(data,111222333);
if (
(data.styleType != 2 && data.styleType != 3) ||
!data.styleType
) {
if (this.loginType == 1) {
// this.$router.push("/projectIndex");
if (!this.$store.state.userInfo.personMail && this.company == 'agjt') {
console.log(123456,isHaveUserCenterMenu)
if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
this.checkInfoComplete();
}
this.$router.push("/workSpace");