Commit 1105bfda authored by youjie's avatar youjie

no message

parent ada55cf9
......@@ -13,7 +13,7 @@
</div>
</div>
<a-divider class="!m-[0]"/>
<main class="max-h-[735px] mt-[20px] overflow-auto">
<main class="max-h-[735px] mt-[20px] overflow-hidden">
<router-view />
</main>
</a-spin>
......
......@@ -177,7 +177,7 @@ const inData = () =>{
if(x.provider=='Google'){
GoogleInfor.value = x
}
if(x.provider=='Lnline'){
if(x.provider=='Line'){
LnlineInfor.value = x
}
});
......@@ -389,6 +389,7 @@ onMounted(async () => {
watch(() => userStore.personalInfor, (newVal, oldVal) => {
userInfor.value = newVal
console.log(newVal,'newVal----')
inData()
})
......@@ -424,4 +425,24 @@ inData()
:deep(.arco-scrollbar-track-direction-vertical){
display: none;
}
.editIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/pen_2.png')no-repeat;
background-size: 100% 100%;
}
.editIcon:hover{
background: url('../../../../assets/images/personal/pen.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/sc_2.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon:hover{
background: url('../../../../assets/images/personal/sc_1.png')no-repeat;
background-size: 100% 100%;
}
</style>
\ No newline at end of file
......@@ -2,7 +2,8 @@
<div class="w-full h-full overflow-auto">
<a-space direction="vertical" class="w-full">
<!-- horizonta -->
<a-form :model="formData" :rules="rules" layout="vertical" class="w-full">
<a-form :model="formData" :rules="rules" layout="vertical" class="w-full"
ref="formDataRef">
<a-row class="w-full">
<a-col :span="24">
<a-form-item field="" :label="t('personal.photo')">
......@@ -98,7 +99,7 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item field="wechatId" :label="t('login.bindingWechat')" required>
<a-form-item field="wechatId" :label="t('login.bindingWechat')" :required="!formData?.lineId">
<a-input class="formData-input !w-[289px] mr-[30px]"
v-model="formData.wechatId"
size="large"
......@@ -107,7 +108,7 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item field="lineId" label="Line" required>
<a-form-item field="lineId" label="Line" :required="!formData?.wechatId">
<a-input class="formData-input !w-[289px] mr-[30px]"
v-model="formData.lineId"
size="large"
......@@ -265,6 +266,8 @@ const maxSize = 2 // 2MB
const previewVisible = ref(false)
const previewUrl = ref('')
const formDataRef = ref<any>()
watch(() => userStore.personalInfor, (newVal, oldVal) => {
if(newVal!=oldVal){
userInfor.value = newVal
......@@ -383,6 +386,7 @@ const handleSubmit = async () => {
Message.warning(msg)
return
}
formDataRef.value.clearValidate()
loading.value = true
try {
const registerData = formData
......@@ -409,11 +413,11 @@ const getUserDetail = async () => {
formData.surName = response.surName || ''
formData.birthday = response.birthday || null
formData.lineId = response.lineId || null
formData.phone = response.phone || null
formData.phoneCode = response.phoneCode || null
formData.phone = response.phone || ''
formData.phoneCode = response.phoneCode || ''
formData.photo = response.photo || null
formData.residentialArea = response.residentialArea || null
formData.sex = response.sex || null
formData.sex = response.sex || 1
formData.wechatId = response.wechatId || null
}
} catch (error) {
......
......@@ -404,21 +404,21 @@ initData()
.editIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/pen_2.png')no-repeat;
background: url('../../../assets/images/personal/pen_2.png')no-repeat;
background-size: 100% 100%;
}
.editIcon:hover{
background: url('../../../../assets/images/personal/pen.png')no-repeat;
background: url('../../../assets/images/personal/pen.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/sc_2.png')no-repeat;
background: url('../../../assets/images/personal/sc_2.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon:hover{
background: url('../../../../assets/images/personal/sc_1.png')no-repeat;
background: url('../../../assets/images/personal/sc_1.png')no-repeat;
background-size: 100% 100%;
}
.addPassenger{
......@@ -447,4 +447,7 @@ initData()
.cancelbuttonBox:hover{
background-color: var(--customPrimary-7);
}
:deep(.arco-scrollbar-track-direction-vertical){
display: none;
}
</style>
\ No newline at end of file
<template>
<a-spin :loading="loading" class="w-full">
<div v-show="!showType">
<a-scrollbar class="max-h-[692px] overflow-auto"
<a-scrollbar class="max-h-[692px]"
@scroll="handleDivScroll"
ref="scrollContainer">
<div class="accountCenter rounded-[14px]
......@@ -209,7 +209,7 @@ const formData = reactive({
phone: null as any,//手机号
phoneCode: null as any,//手机号国家码
countryId: null as any,//国籍
sex: null as any,//性别 1男 2女
sex: 1 as any,//性别 1男 2女
idCard: null as any,//身份证号
email: null as any,//邮箱
})
......@@ -432,21 +432,21 @@ initData()
.editIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/pen_2.png')no-repeat;
background: url('../../../assets/images/personal/pen_2.png')no-repeat;
background-size: 100% 100%;
}
.editIcon:hover{
background: url('../../../../assets/images/personal/pen.png')no-repeat;
background: url('../../../assets/images/personal/pen.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon{
width: 16px;
height: 16px;
background: url('../../../../assets/images/personal/sc_2.png')no-repeat;
background: url('../../../assets/images/personal/sc_2.png')no-repeat;
background-size: 100% 100%;
}
.deleteIcon:hover{
background: url('../../../../assets/images/personal/sc_1.png')no-repeat;
background: url('../../../assets/images/personal/sc_1.png')no-repeat;
background-size: 100% 100%;
}
.addPassenger{
......@@ -475,4 +475,7 @@ initData()
.cancelbuttonBox:hover{
background-color: var(--customPrimary-7);
}
:deep(.arco-scrollbar-track-direction-vertical){
display: none;
}
</style>
\ No newline at end of file
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