Commit f33ec241 authored by anxixi's avatar anxixi

Merge remote-tracking branch 'origin/master'

parents 66b5ceb1 ab361a89
NODE_ENV="production"
VUE_APP_URL="prod"
API_ROOT="/"
VUE_APP_UPDATED="9.0.11"
VUE_APP_UPDATED="9.0.12"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
NODE_ENV="production"
VUE_APP_URL="dev"
API_ROOT="/"
VUE_APP_UPDATED="9.0.11"
VUE_APP_UPDATED="9.0.12"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
{
"version":"9.0.11"
"version":"9.0.12"
}
\ No newline at end of file
......@@ -162,7 +162,7 @@ var getCookie = (function(){
})();
import { Loading,MessageBox } from 'element-ui';
import {Toast} from 'mint-ui';
var vvv ="9.0.11"
var vvv ="9.0.12"
window.localStorage.setItem("_version_",vvv);
if(vvv!=process.env.VUE_APP_UPDATED){
location.reload();
......
......@@ -875,11 +875,13 @@
};
api.selectByEmpId(params).then(res => {
if (res.code == 0) {
if (this.$route.query.empId) this.getStatusFunc();
this.empuser = res.result;
if (this.$route.query.empId) {
var email = this.userInfo.empAccount.indexOf("@") > -1 ? this.userInfo.empAccount : this.userInfo.empAccount + "@techcode.com";
sessionStorage.setItem("liveEmail", email);
sessionStorage.setItem("liveName", res.result.empOtherName);
this.getStatusFunc();
}
this.mineList.push({
id: 5,
name: "comment",
......
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