From ac5f02ed863b00eec264461a3d6ad285999c521c Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 23 Jul 2024 14:13:12 +0700 Subject: [PATCH] updated mixin error message function --- src/stores/mixin.ts | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts index babac88e..f901fa5f 100644 --- a/src/stores/mixin.ts +++ b/src/stores/mixin.ts @@ -345,7 +345,7 @@ export const useCounterMixin = defineStore("mixin", () => { } } - const messageError = (q: any, e: any = "") => { + const messageError = (q: any, e: any = "", msg: string = "") => { // q.dialog.hide(); if (e.response !== undefined) { if (e.response.data.status !== undefined) { @@ -388,17 +388,30 @@ export const useCounterMixin = defineStore("mixin", () => { } } else { if (e.response.status == 401) { - //invalid_token - q.dialog({ - component: CustomComponent, - componentProps: { - title: `พบข้อผิดพลาด`, - message: `ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง`, - icon: "warning", - color: "red", - onlycancel: true, - }, - }); + if (msg !== "") { + q.dialog({ + component: CustomComponent, + componentProps: { + title: `พบข้อผิดพลาด`, + message: msg, + icon: "warning", + color: "red", + onlycancel: true, + }, + }); + } else { + //invalid_token + q.dialog({ + component: CustomComponent, + componentProps: { + title: `พบข้อผิดพลาด`, + message: `ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง`, + icon: "warning", + color: "red", + onlycancel: true, + }, + }); + } } else if (e.response.data.successful === false) { q.dialog({ component: CustomComponent,