diff --git a/src/main.ts b/src/main.ts index c472cf2..02539e2 100644 --- a/src/main.ts +++ b/src/main.ts @@ -136,7 +136,7 @@ router.beforeEach(async (to, from, next) => { } } else { // If no token, handle redirect to login or allow access to login or 404 - if (['login', '404','educate'].includes(to.name as string)) { + if (['login', '404','educate', 'aboutUs'].includes(to.name as string)) { return next() // Allow access to login or 404 } goToLogin(to, next) // Redirect to login if no token @@ -153,7 +153,7 @@ router.beforeEach(async (to, from, next) => { return next() // Proceed to the intended route } else { // If no token, ensure proper redirection to login or 404 - if (['login', '404','educate'].includes(to.name as string)) { + if (['login', '404','educate', 'aboutUs'].includes(to.name as string)) { return next() // Allow access to login or 404 } return next({ name: 'login' }) @@ -164,7 +164,7 @@ router.beforeEach(async (to, from, next) => { if (getToken() && !hasFingerPrint) { next() } else { - if (['login', '404','educate'].includes(to.name as string)) { + if (['login', '404','educate', 'aboutUs'].includes(to.name as string)) { if (to.name === 'login'){ goToLogin(to, next) return diff --git a/src/router/index.ts b/src/router/index.ts index 7e9d043..2294a17 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -116,6 +116,11 @@ const router = createRouter({ }, ] }, + { + path: '/aboutUs', + name: 'aboutUs', + component: () => import('@/views/base/aboutUs/index.vue') + }, { path: '/:pathMatch(.*)*', name: 'notFound', diff --git a/src/views/base/aboutUs/index.vue b/src/views/base/aboutUs/index.vue new file mode 100644 index 0000000..6253846 --- /dev/null +++ b/src/views/base/aboutUs/index.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/views/base/wallet/index.vue b/src/views/base/wallet/index.vue index f973670..271a9ca 100644 --- a/src/views/base/wallet/index.vue +++ b/src/views/base/wallet/index.vue @@ -339,7 +339,7 @@
مشتری گرامی
-
واریز مبلغ مورد نظر نهایتاً ظرف مدت ۲۴ ساعت آینده انجام می‌پذیرد.
+
واریز مبلغ مورد نظر، نهایتاً ظرف مدت ۲۴ ساعت آینده انجام می‌پذیرد.
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index 1ba5868..8f59d18 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -132,6 +132,17 @@
آموزش کار با نرم افزار
+ +
+
درباره ما
+
+
اگر حساب کاربری ندارید
از این قسمت
ثبت نام کنید. @@ -375,6 +386,10 @@ const goToEducate = () => { router.push({ name: "educate" }) } +async function goToAboutUs(){ + await router.push('/aboutUs') +} + const showPWAInstallGuide = ref(false) async function installWebApp() { showPWAInstallGuide.value = true diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue index fee8580..2060d71 100644 --- a/src/views/login/components/Register.vue +++ b/src/views/login/components/Register.vue @@ -1,6 +1,6 @@