Commit d0ad7970 authored by anxixi's avatar anxixi

Merge remote-tracking branch 'origin/master'

parents a963c765 cb0b41a0
NODE_ENV="production" NODE_ENV="production"
VUE_APP_URL="production" VUE_APP_URL="production"
API_ROOT="/" API_ROOT="/"
VUE_APP_UPDATED="12.0.01" VUE_APP_UPDATED="13.0.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture" VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile" VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo" VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
......
NODE_ENV="development" NODE_ENV="development"
VUE_APP_URL="development" VUE_APP_URL="development"
API_ROOT="/" API_ROOT="/"
VUE_APP_UPDATED="12.0.01" VUE_APP_UPDATED="13.0.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture" VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile" VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo" VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
......
NODE_ENV="production" NODE_ENV="production"
VUE_APP_URL="production" VUE_APP_URL="production"
API_ROOT="/" API_ROOT="/"
VUE_APP_UPDATED="12.0.01" VUE_APP_UPDATED="13.0.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture" VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile" VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo" VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
......
{ {
"version":"12.0.01" "version":"13.0.01"
} }
\ No newline at end of file
...@@ -165,7 +165,7 @@ var getCookie = (function () { ...@@ -165,7 +165,7 @@ var getCookie = (function () {
import {Loading, MessageBox} from 'element-ui'; import {Loading, MessageBox} from 'element-ui';
import {Toast} from 'mint-ui'; import {Toast} from 'mint-ui';
var vvv = "12.0.01" var vvv = "13.0.01"
window.localStorage.setItem("_version_", vvv); window.localStorage.setItem("_version_", vvv);
if (vvv != process.env.VUE_APP_UPDATED) { if (vvv != process.env.VUE_APP_UPDATED) {
location.reload(); location.reload();
......
...@@ -1934,6 +1934,7 @@ ...@@ -1934,6 +1934,7 @@
width: 100%; width: 100%;
position: fixed; position: fixed;
top: 1.9rem; top: 1.9rem;
height: calc(100vh - 2.8rem);
} }
.timeWrapRelative { .timeWrapRelative {
......
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