Commit e48e1285 authored by zhengke's avatar zhengke

no message

parent eb223c00
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return {}; return {};
}, },
...@@ -13,18 +13,18 @@ export default { ...@@ -13,18 +13,18 @@ export default {
}, },
mounted() { mounted() {
let getData let getData
if(this.$route.query){ if (this.$route.query) {
getData = JSON.stringify(this.$route.query) getData = JSON.stringify(this.$route.query)
getData = JSON.parse(getData) getData = JSON.parse(getData)
if(getData.erpOrderObj){ if (getData.erpOrderObj) {
getData = JSON.parse(getData.erpOrderObj) getData = JSON.parse(getData.erpOrderObj)
} }
} }
if (!this.getLocalStorage()&&!getData) { if (!this.getLocalStorage() && !getData) {
this.$router.push({ this.$router.push({
path: "/login", path: "/login",
}); });
} else if(getData&&getData.path) { // erp自动登陆传过来的参数 } else if (getData && getData.path) { // erp自动登陆传过来的参数
let parameter = getData let parameter = getData
this.$router.push({ this.$router.push({
path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`, path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`,
...@@ -34,29 +34,21 @@ export default { ...@@ -34,29 +34,21 @@ export default {
name: "Home", name: "Home",
}); });
} }
// this.getUserInfo() setTimeout(() => {
this.getUserInfo()
}, 100)
}, },
methods: { methods: {
// 获取用户权限信息 // 获取用户权限信息
getUserInfo(){ getUserInfo() {
this.apipost("/api/AutoLogin/GetCRMLoginMenu", {}, (res) => { this.apipost("/api/AutoLogin/GetCRMLoginMenu", {}, (res) => {
var jsonData = res.data; var jsonData = res.data;
if (jsonData.resultCode == 1) { if (jsonData.resultCode == 1) {
//登录成功 var userData = jsonData.data
let autoLogin = this.isAutoLogin ? var userJson = userData;
{ var userInfo = JSON.parse(localStorage.userInfo)
acc: this.account, userInfo.UserMenu = userJson
pwd: this.pwd, localStorage.userInfo = JSON.stringify(userInfo)
} :
null;
localStorage.autoLogin = JSON.stringify(autoLogin);
var userData = jsonData.data;
var userJson = JSON.stringify(userData);
localStorage.userInfo = userJson;
this.loginState = 0;
this.$router.push({
path: "/Home"
});
} else { } else {
this.$message({ this.$message({
message: res.data.message, message: res.data.message,
...@@ -65,57 +57,63 @@ export default { ...@@ -65,57 +57,63 @@ export default {
this.loginState = 0; this.loginState = 0;
} }
}); });
}
}, },
}; },
};
</script> </script>
<style> <style>
@import "./assets/css/tablevoerride.css"; @import "./assets/css/tablevoerride.css";
@import "./assets/global/font.css"; @import "./assets/global/font.css";
@import "//at.alicdn.com/t/font_1627123_xio004ni8y.css"; @import "//at.alicdn.com/t/font_1627123_xio004ni8y.css";
@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css"); @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
/* @import './assets/css/common.css'; */ /* @import './assets/css/common.css'; */
@import "./assets/css/init.css";
body, @import "./assets/css/init.css";
html { body,
html {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR"; font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR";
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
height: 100%; height: 100%;
} }
#app {
#app {
height: 100%; height: 100%;
} }
.el-scrollbar {
.el-scrollbar {
height: 100%; height: 100%;
} }
.el-scrollbar__wrap {
.el-scrollbar__wrap {
overflow: auto !important; overflow: auto !important;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.el-scrollbar__view {
.el-scrollbar__view {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.page-component-up {
.page-component-up {
position: fixed; position: fixed;
right: calc(8.3% - 60px); right: calc(8.3% - 60px);
bottom: 150px; bottom: 150px;
width: 40px; width: 40px;
height: 90px; height: 90px;
z-index: 2000; z-index: 2000;
} }
.page-component-up img {
.page-component-up img {
width: 38px; width: 38px;
height: 38px; height: 38px;
} }
.page-component-up i {
background-color: #fff;
.page-component-up i {
background-color: #fff;
cursor: pointer; cursor: pointer;
transition: 0.3s; transition: 0.3s;
/* box-shadow: 0 0 6px rgba(0,0,0,.12); */ /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
...@@ -125,23 +123,28 @@ html { ...@@ -125,23 +123,28 @@ html {
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
} }
.page-component-up i {
.page-component-up i {
font-size: 36px; font-size: 36px;
color: #bbb; color: #bbb;
} }
.page-component-up i:hover {
.page-component-up i:hover {
background-color: #ef4455; background-color: #ef4455;
border: 1px solid #ec3346; border: 1px solid #ec3346;
} }
.page-component-up:hover i {
.page-component-up:hover i {
color: #f1f1f1; color: #f1f1f1;
} }
.el-form-item .el-form-item__label {
.el-form-item .el-form-item__label {
color: #3d3b4f !important; color: #3d3b4f !important;
} }
.el-button [class*="el-icon-"] + span {
.el-button [class*="el-icon-"]+span {
margin-left: 5px; margin-left: 5px;
font-family: "perfectFont"; font-family: "perfectFont";
} }
</style> </style>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -6,19 +6,19 @@ export default { ...@@ -6,19 +6,19 @@ export default {
apiurl: '' apiurl: ''
}, },
install(Vue, options) { install(Vue, options) {
Vue.prototype.isOnline = function () { Vue.prototype.isOnline = function() {
return process.env.NODE_ENV !== 'development'; return process.env.NODE_ENV !== 'development';
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function() {
//CRM API //CRM API
let domainUrl = ""; let domainUrl = "";
domainUrl = "http://192.168.10.2:8098"; domainUrl = "http://192.168.10.36:8098";
//domainUrl = "http://localhost:5003"; //domainUrl = "http://localhost:5003";
let locationName = window.location.hostname; let locationName = window.location.hostname;
//旅游ERPApi //旅游ERPApi
let domainPostUrl = "" let domainPostUrl = ""
domainPostUrl = "http://192.168.10.2:8083"; domainPostUrl = "http://192.168.10.36:8083";
//domainPostUrl = "http://192.168.10.46"; //domainPostUrl = "http://192.168.10.46";
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) { if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) {
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
}, },
//消息成功提示 //消息成功提示
Vue.prototype.Success = function (msg) { Vue.prototype.Success = function(msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
}); });
}, },
//错误提示 //错误提示
Vue.prototype.Error = function (msg) { Vue.prototype.Error = function(msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
}, },
//一般提示 //一般提示
Vue.prototype.Info = function (msg) { Vue.prototype.Info = function(msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
}); });
}, },
//警告提示 //警告提示
Vue.prototype.Warning = function (msg) { Vue.prototype.Warning = function(msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}); });
}, },
//Confirm //Confirm
Vue.prototype.Confirm = function (msg, callback) { Vue.prototype.Confirm = function(msg, callback) {
this.$confirm(msg, "提示", { this.$confirm(msg, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
//type : m_filt 填充 m_w 宽度固定 高度不固定 m_h 高度固定 宽度不固定 //type : m_filt 填充 m_w 宽度固定 高度不固定 m_h 高度固定 宽度不固定
// w : 宽 // w : 宽
// h : 高 // h : 高
Vue.prototype.compressImg = function (path, type, w, h) { Vue.prototype.compressImg = function(path, type, w, h) {
let url = this.domainManager().UploadUrl; let url = this.domainManager().UploadUrl;
let poise = 'width='; let poise = 'width=';
w = w ? w : '' w = w ? w : ''
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
//旅游ERP接口 //旅游ERP接口
Vue.prototype.apipost2 = function (cmd, msg, successCall, faildCall, isOnline) { Vue.prototype.apipost2 = function(cmd, msg, successCall, faildCall, isOnline) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
} }
//CRM接口 //CRM接口
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
}, },
// 自动登录HTTP提交数据 // 自动登录HTTP提交数据
Vue.prototype.apipostLogin = function (cmd, msg, successCall, faildCall) { Vue.prototype.apipostLogin = function(cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -250,7 +250,7 @@ export default { ...@@ -250,7 +250,7 @@ export default {
}, },
//Java接口 //Java接口
Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -302,7 +302,7 @@ export default { ...@@ -302,7 +302,7 @@ export default {
}, },
//下载文件 //下载文件
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, callBack) { Vue.prototype.GetLocalFile = function(cmd, msg, fileName, callBack) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
}; };
callBack(result); callBack(result);
} }
}).catch(function (res) { }).catch(function(res) {
console.log("GetLocalFile", res); console.log("GetLocalFile", res);
}); });
} }
......
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