diff --git a/src/api/activity/drawPrize.js b/src/api/activity/drawPrize.js index 80e376f..8ef7cb1 100644 --- a/src/api/activity/drawPrize.js +++ b/src/api/activity/drawPrize.js @@ -1,10 +1,11 @@ import request from "@/utils/request"; -export function index(params) { +export function index(params,isLoading=true) { return request({ method: 'get', url: '/api/admin/draw-prize/index', - params + params, + isLoading }) } diff --git a/src/views/activity/drawPrize.vue b/src/views/activity/drawPrize.vue index 956a3e4..cd9eaa0 100644 --- a/src/views/activity/drawPrize.vue +++ b/src/views/activity/drawPrize.vue @@ -163,8 +163,8 @@ this.select.page = 1; this.load(); }, - async load() { - const res = await index(this.select) + async load(isLoading=true) { + const res = await index(this.select,isLoading) this.total = res.total this.list = res.data }, @@ -186,7 +186,7 @@ this.loadActivity() window.onfocus = () => { - this.load(); + this.load(false); } }, destroyed() { diff --git a/src/views/page/MidAutumnLotteryDraw.vue b/src/views/page/MidAutumnLotteryDraw.vue index ba5d06d..d51b223 100644 --- a/src/views/page/MidAutumnLotteryDraw.vue +++ b/src/views/page/MidAutumnLotteryDraw.vue @@ -203,6 +203,7 @@ export default { }, 150); } catch (err) { console.log(err); + this.isOver = true; } } else { this.flag = false;