Commit c67f19ad authored by youjie's avatar youjie

no message

parent 4945fa1a
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
"commonPassengerInfo": "常用旅客信息", "commonPassengerInfo": "常用旅客信息",
"distributionCenter": "分销中心", "distributionCenter": "分销中心",
"resetPassword": "重置密码", "resetPassword": "重置密码",
"editEmail": "绑定/修改邮箱" "editEmail": "绑定/修改邮箱",
"basicInfor": "基础资料",
"account": "账户信息",
"passengerList": "常用旅客",
"mailingAddressList": "邮寄地址"
} }
} }
\ No newline at end of file
...@@ -332,7 +332,7 @@ const rules = computed(() => ({ ...@@ -332,7 +332,7 @@ const rules = computed(() => ({
const loginPage = ref(null) const loginPage = ref(null)
const currentStep = ref(1) const currentStep = ref(2)
const loading = ref(true) const loading = ref(true)
const isFromOta = ref(false) // 是否从 OTA 授权进入 const isFromOta = ref(false) // 是否从 OTA 授权进入
...@@ -671,7 +671,7 @@ const init = async () => { ...@@ -671,7 +671,7 @@ const init = async () => {
} }
} }
init() // init()
getSimples() getSimples()
......
...@@ -240,7 +240,7 @@ const loginWithLine = () => { ...@@ -240,7 +240,7 @@ const loginWithLine = () => {
const useLineBind = async(code:string) => { const useLineBind = async(code:string) => {
loading.value = true loading.value = true
try { try {
const response = await userStore.setUserWechatBindAsync(systemConfig.tenantId?.toString() || '', code, systemConfig.distributorId,null,'') const response = await userStore.setUserLineBindAsync(systemConfig.tenantId?.toString() || '', code, systemConfig.distributorId,null,'')
if (response.status == 'SUCCESS') { if (response.status == 'SUCCESS') {
Message.success(t('personal.bindWechatSuccess')) Message.success(t('personal.bindWechatSuccess'))
getPersonalInfor() getPersonalInfor()
......
...@@ -9,9 +9,17 @@ ...@@ -9,9 +9,17 @@
<div class="flex items-center"> <div class="flex items-center">
<div> <div>
<div class="w-[100px] h-[100px] rounded-full bg-[#FFFFFF] border-[2px] border-[#E3E6DA]"> <div class="w-[100px] h-[100px] rounded-full bg-[#FFFFFF] border-[2px] border-[#E3E6DA]">
<img :src="formData?.photo <a-avatar :size="96"
||systemConfigStore?.config?.logo ||'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp'" class="w-full h-full rounded-full" alt="avatar" >
class="w-full h-full rounded-full object-cover" alt="avatar"> <img v-if="formData?.photo"
alt="avatar"
:src="formData.photo"
/>
<img v-else class="w-full h-full cursor-pointer"
alt="avatar"
src="../../../assets/images/personal/avatar.png"
/>
</a-avatar>
</div> </div>
</div> </div>
<div class="ml-[37px]"> <div class="ml-[37px]">
......
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
<div class="flex flex flex-col w-[198px]"> <div class="flex flex flex-col w-[198px]">
<div class="h-full bg-[#F9F9F7] rounded-[14px]"> <div class="h-full bg-[#F9F9F7] rounded-[14px]">
<div class="mt-[37px] flex justify-center items-center"> <div class="mt-[37px] flex justify-center items-center">
<a-avatar class="LeftViewImg cursor-pointer flex-shrink-0 !w-[80px] !h-[80px]"> <a-avatar class="LeftViewImg cursor-pointer flex-shrink-0 !w-[80px] !h-[80px]"
<img class="w-full h-full cursor-pointer" :size="80">
<img v-if="userInfo?.photo"
alt="avatar" alt="avatar"
:src="userInfo?.photo || systemConfigStore?.config?.logo || 'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp'" :src="userInfo.photo"
/>
<img v-else
alt="avatar"
src="../../../assets/images/personal/avatar.png"
/> />
</a-avatar> </a-avatar>
</div> </div>
......
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