diff --git a/admin/src/App.vue b/admin/src/App.vue index 4906884..f2e9407 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -233,7 +233,14 @@ } }, mounted() { - { + //微信禁止下拉 + this.wxStopPull(); + //初始化 + this.init(); + }, + methods: { + //微信禁止下拉 + wxStopPull() { var startY = 0; document.addEventListener('touchstart', function (e) { startY = Number(e.touches[0].pageY); @@ -254,11 +261,7 @@ } } }; - } - //初始化 - this.init(); - }, - methods: { + }, //开始拖拽 touchStart(e) { //下拉刷新逻辑 @@ -306,11 +309,9 @@ { if (this.moveDistance > 70) { this.$EventBus.$emit(glob.eventNames.globRefreshEventName); - this.moveDistance = 0; - this.moveState = 0; - } else { - this.moveDistance = 0; } + this.moveDistance = 0; + this.moveState = 0; } }, //初始化 diff --git a/udf-api/udf-api-server/src/main/resources/templates/common.html b/udf-api/udf-api-server/src/main/resources/templates/common.html index d912bec..21da780 100644 --- a/udf-api/udf-api-server/src/main/resources/templates/common.html +++ b/udf-api/udf-api-server/src/main/resources/templates/common.html @@ -309,6 +309,12 @@ .pre-scrollable { overflow-y: auto; } + + .loadDiv { + position: absolute; + width: 100%; + z-index: 2000; + } [(${title})] @@ -377,8 +383,6 @@ integrity="sha256-WqU1JavFxSAMcLP2WIOI+GB2zWmShMI82mTpLDcqFUg=" crossorigin="anonymous"> - \ No newline at end of file diff --git a/udf-api/udf-api-server/src/main/resources/templates/login.html b/udf-api/udf-api-server/src/main/resources/templates/login.html index 01a7c73..655df80 100644 --- a/udf-api/udf-api-server/src/main/resources/templates/login.html +++ b/udf-api/udf-api-server/src/main/resources/templates/login.html @@ -36,6 +36,11 @@