diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 6337b31d1..88b55fd35 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -205,7 +205,7 @@ export default { handler() { this.$store.dispatch("websocketConnection"); // - if (this.$isEEUiApp) { + if (this.$isEEUIApp) { this.umengAliasTimer && clearTimeout(this.umengAliasTimer) if (this.userId > 0) { // 给 APP 发送初始化消息 @@ -373,7 +373,7 @@ export default { }, onRouterViewMounted() { - document.documentElement.setAttribute("data-platform", $A.isElectron ? "desktop" : $A.isEEUiApp ? "app" : "web") + document.documentElement.setAttribute("data-platform", $A.isElectron ? "desktop" : $A.isEEUIApp ? "app" : "web") }, /** @@ -596,7 +596,7 @@ export default { }, eeuiEvents() { - if (!this.$isEEUiApp) { + if (!this.$isEEUIApp) { return; } // APP进入前台 diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index d354661d7..d6cc511af 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -1,6 +1,6 @@ const isElectron = !!(window && window.process && window.process.type && window.electron); -const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent); -const isSoftware = isElectron || isEEUiApp; +const isEEUIApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent); +const isSoftware = isElectron || isEEUIApp; import {languageName, switchLanguage as $L} from "./language"; @@ -184,7 +184,7 @@ Vue.prototype.copyText = function (obj) { error: "复制失败" } } - if ($A.isEEUiApp) { + if ($A.isEEUIApp) { $A.eeuiAppCopyText(obj.text) obj.success && $A.messageSuccess(obj.success) return @@ -203,7 +203,7 @@ $A.Electron = null; $A.Platform = "web"; $A.isMainElectron = false; $A.isSubElectron = false; -$A.isEEUiApp = isEEUiApp; +$A.isEEUIApp = isEEUIApp; $A.isElectron = isElectron; $A.isSoftware = isSoftware; $A.openLog = false; @@ -212,7 +212,7 @@ if (isElectron) { $A.Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win"; $A.isMainElectron = /\s+MainTaskWindow\//.test(window.navigator.userAgent); $A.isSubElectron = /\s+SubTaskWindow\//.test(window.navigator.userAgent); -} else if (isEEUiApp) { +} else if (isEEUIApp) { $A.Platform = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent) ? "ios" : "android"; } @@ -283,7 +283,7 @@ Vue.prototype.$Electron = $A.Electron; Vue.prototype.$Platform = $A.Platform; Vue.prototype.$isMainElectron = $A.isMainElectron; Vue.prototype.$isSubElectron = $A.isSubElectron; -Vue.prototype.$isEEUiApp = $A.isEEUiApp; +Vue.prototype.$isEEUIApp = $A.isEEUIApp; Vue.prototype.$isSoftware = $A.isSoftware; Vue.config.productionTip = false; @@ -317,7 +317,7 @@ const $init = async () => { } const $preload = async () => { - if ($A.isEEUiApp) { + if ($A.isEEUIApp) { const requireTime = new Date().getTime(); while (typeof requireModuleJs !== "function") { await new Promise(resolve => setTimeout(resolve, 200)); diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index 4bdf8c5e1..624b6ad7e 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -4,7 +4,7 @@ :placement="placement" :effect="tooltipTheme" :delay="delay" - :disabled="$isEEUiApp || windowTouch || !showTooltip || disabled" + :disabled="$isEEUIApp || windowTouch || !showTooltip || disabled" :max-width="tooltipMaxWidth" transfer> diff --git a/resources/assets/js/components/Loading.vue b/resources/assets/js/components/Loading.vue index 6ca115bb7..70703cb6a 100644 --- a/resources/assets/js/components/Loading.vue +++ b/resources/assets/js/components/Loading.vue @@ -1,5 +1,5 @@