diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue
index b91b73410..fd17cd118 100644
--- a/resources/assets/js/components/RightBottom.vue
+++ b/resources/assets/js/components/RightBottom.vue
@@ -99,7 +99,15 @@ export default {
},
methods: {
+ isNotServer() {
+ let apiHome = $A.getDomain(window.systemInfo.apiUrl)
+ return this.isSoftware && (apiHome == "" || apiHome == "public")
+ },
+
checkVersion() {
+ if (this.isNotServer()) {
+ return;
+ }
axios.get($A.apiUrl('../version')).then(({status, data}) => {
if (status === 200) {
this.apiVersion = data.version || ''
diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index cae8875c5..f7d177846 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -9,6 +9,7 @@
{{$L('昵称')}}: {{user.nickname}}
{{$L('职位/职称')}}: {{user.profession || '-'}}
+{{$L('离职时间')}}: {{user.disable_at}}
diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue index 40dbd861b..b79d439df 100644 --- a/resources/assets/js/pages/index.vue +++ b/resources/assets/js/pages/index.vue @@ -206,15 +206,17 @@ export default { }, mounted() { - if (this.$router.mode === "hash") { - if ($A.stringLength(window.location.pathname) > 2) { - window.location.href = `${window.location.origin}/#${window.location.pathname}${window.location.search}` - return - } - } else if (this.$router.mode === "history") { - if ($A.strExists(window.location.href, "/#/")) { - window.location.href = window.location.href.replace("/#/", "/") - return + if (/^https*:/i.test(window.location.protocol)) { + if (this.$router.mode === "hash") { + if ($A.stringLength(window.location.pathname) > 2) { + window.location.href = `${window.location.origin}/#${window.location.pathname}${window.location.search}` + return + } + } else if (this.$router.mode === "history") { + if ($A.strExists(window.location.href, "/#/")) { + window.location.href = window.location.href.replace("/#/", "/") + return + } } } this.getNeedStartHome(); diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index c773ba5e6..042680cf1 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -73,6 +73,7 @@