Commit 700e459c authored by youjie's avatar youjie

no message

parent 2627d3e2
......@@ -197,6 +197,9 @@ export default {
unBindError: '解绑失败',
nextStepSetPassword: '下一步设置密码',
returnStep: '返回上一步',
basicInfo: '基础资料',
accountInfor: '账户信息',
commonPassenger: '常用旅客',
},
// HTTP 错误状态码
httpError: {
......
......@@ -36,7 +36,7 @@
:src="userStore.memberData.photo || systemConfigStore.config?.logo || 'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp'"
/>
</a-avatar>
<span class="ml-[9px] text-sm text-nowrap">{{ t('personal.profile') }}</span>
<span class="ml-[9px] text-sm text-nowrap">{{ userStore.personalInfor?.name|| userStore.userInfo?.nick }}</span>
</div>
<template #content>
<a-doption @click="goPage('/myOrder')">
......
......@@ -39,7 +39,7 @@ const router = createRouter({
component: () => import ('../views/personalCenter/myCoupon.vue')
},
{
path: '/accountCenter',//账号中心
path: '/accountCenter/:type?',//账号中心
meta: { title: "page.accountCenter" },
component: () => import ('../views/personalCenter/accountCenter.vue')
},
......
......@@ -2,24 +2,28 @@ import i18n from '@/i18n'
const ProviderTypeEnum = Object.freeze({
PASSWORD: {
value: 'Password',
num: 0,
desc: i18n.global.t('personal.accountPassword'),
icon: '',
color: ''
},
GOOGLE: {
value: 'Google',
num: 1,
desc: 'Google',
icon: '',
color: ''
},
WECHAT: {
value: 'WeChat',
num: 2,
desc: i18n.global.t('personal.wechat'),
icon: '',
color: ''
},
LINE: {
value: 'Line',
num: 3,
desc: 'Line',
icon: '',
color: ''
......
......@@ -142,6 +142,7 @@ import G from '@/assets/images/login/login_G.png'
import tel from '@/assets/images/login/login_tel.png'
import line from '@/assets/images/login/login_line.png'
import { query } from '@/utils/common'
import providerTypeEnum from '@/utils/providerTypeEnum'
......@@ -223,7 +224,7 @@ const getAppIdRedirectUri = async () => {
loading.value = true
try {
// 获取微信登录AppID 域名
const response = await userStore.getUserWechatAppIdAsync(loginMsg.tenantId?.toString() || '',loginMsg.reType || 2)
const response = await userStore.getUserWechatAppIdAsync(loginMsg.tenantId?.toString() || '',providerTypeEnum.WECHAT.value)
if (response.status == 'SUCCESS') {
openInfo.value = response.data[0]
const { appId, redirectUri } = openInfo.value;
......
This diff is collapsed.
......@@ -11,7 +11,7 @@
<a-form-item field="" label="" class="">
<div class="flex justify-center relative">
<div class="flex justify-center items-center absolute left-[-300px] top-[5px]"
@click="goPage('/accountCenter')">
@click="goPage('/accountCenter/2')">
<div class="flex items-center justify-center cursor-pointer">
<icon-left class="font-semibold" size="20" strokeLinejoin="miter" />
<span class="text-base ml-[9px]">{{ t('personal.return') }}</span>
......@@ -446,7 +446,7 @@ const handleSubmit = async () => {
if(params&&params.forward){
goPage(`/${params.forward}`)
}else{
goPage('/accountCenter')
goPage('/accountCenter/2')
}
}
} catch (error: any) {
......
......@@ -11,7 +11,7 @@
<a-form-item field="" label="" class="">
<div class="flex justify-center relative">
<div class="flex justify-center items-center absolute left-[-300px] top-[5px]"
@click="currentStep==1?goPage('/accountCenter'):handlePrevious()">
@click="currentStep==1?goPage('/accountCenter/2'):handlePrevious()">
<div class="flex items-center justify-center cursor-pointer">
<icon-left class="font-semibold" size="20" strokeLinejoin="miter" />
<span class="text-base ml-[9px]">{{ currentStep==1?t('personal.return'):t('personal.returnStep') }}</span>
......@@ -255,7 +255,7 @@ const goPage = (path:string) => {
router.push(path)
return
}
router.push('/accountCenter')
router.push('/accountCenter/2')
}
// 验证邮箱是否可用
......@@ -390,9 +390,9 @@ const handleSubmit = async () => {
console.log(response,'response')
Message.success(t('login.resetSuccess'))
currentStep.value ++
// 延迟跳转到登录页
// 延迟跳转
setTimeout(() => {
router.push('/accountCenter')
router.push('/accountCenter/2')
}, 2000)
} catch (error: any) {
Message.error(error.message || t('login.resetFailed'))
......
......@@ -12,7 +12,7 @@
<a-form-item field="" label="" class="">
<div class="flex justify-center relative">
<div class="flex justify-center items-center absolute left-[-300px] top-[5px]"
@click="goPage('/accountCenter')">
@click="goPage('/accountCenter/2')">
<div class="flex items-center justify-center cursor-pointer">
<icon-left class="font-semibold" size="20" strokeLinejoin="miter" />
<span class="text-base ml-[9px]">{{ t('personal.return') }}</span>
......@@ -372,7 +372,7 @@ const handleSubmit = async () => {
Message.success(t('login.resetSuccess'))
// 延迟跳转到登录页
setTimeout(() => {
goPage('/accountCenter')
goPage('/accountCenter/2')
}, 2000)
} catch (error: any) {
Message.error(error.message || t('login.resetFailed'))
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment