新增三个用户信息必传项

This commit is contained in:
X1627315083
2025-02-11 13:14:26 +08:00
parent 639993bcfb
commit 48ed49f164
5 changed files with 89 additions and 34 deletions

View File

@@ -1,7 +1,7 @@
<template>
<div class="accountEdit_page">
<div class="accountEdit_page_body">
<!-- <div class="accountEdit_page_body_item">
<div class="accountEdit_page_body_item">
<div class="accountEdit_page_body_item_name">{{$t('account.Name')}}:</div>
<div class="accountEdit_page_body_item_inut" style="display: flex;justify-content: space-between;">
<a-select
@@ -18,7 +18,7 @@
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" type="text" :placeholder="$t('account.plaseFirst')" v-model="surname">
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" type="text" :placeholder="$t('account.plaseLast')" v-model="givenName">
</div>
</div> -->
</div>
<div class="accountEdit_page_body_item">
<div class="accountEdit_page_body_item_name">{{$t('account.Country')}}:</div>
<div class="accountEdit_page_body_item_inut">
@@ -83,13 +83,40 @@ export default defineComponent({
let setSubmit = ()=>{
let data = {
country:accountHomeData.Country,
occupation:accountHomeData.CompanyName
occupation:accountHomeData.CompanyName,
title:accountHomeData.selectSex,
surname:accountHomeData.surname,
givenName:accountHomeData.givenName,
}
if (!data.occupation) {
message.info(t('account.jsContent7'));
return;
}
if (!data.country) {
message.info(t('account.jsContent8'));
return;
}
if (!data.title) {
message.info(t('account.jsContent9'));
return;
}
if (!data.surname) {
message.info(t('account.jsContent10'));
return;
}
if (!data.givenName) {
message.info(t('account.jsContent11'));
return;
}
accountHomeData.loadingShow = true
Https.axiosGet(Https.httpUrls.updateUserInfo,{params:data}).
Https.axiosPost(Https.httpUrls.updateUserInfo,data).
then((rv:any)=>{
let value = {
userName:accountHomeData.editUserName
country:accountHomeData.Country,
title:accountHomeData.selectSex,
userName:accountHomeData.editUserName,
surname:accountHomeData.surname,
givenName:accountHomeData.givenName,
}
store.commit('upUserDetail',value)
accountHomeData.loadingShow = false
@@ -101,14 +128,14 @@ export default defineComponent({
onMounted(()=>{
let country = userDetail.value.country
let CompanyName = userDetail.value.occupation
// let CompanyName = userDetail.value.occupation
// let CompanyName = userDetail.value.occupation
// let CompanyName = userDetail.value.occupation
let title = userDetail.value.title
let surname = userDetail.value.surname
let givenName = userDetail.value.givenName
accountHomeData.Country = country
accountHomeData.CompanyName = CompanyName
// accountHomeData.CompanyName = CompanyName
// accountHomeData.CompanyName = CompanyName
// accountHomeData.CompanyName = CompanyName
accountHomeData.selectSex = title
accountHomeData.surname = surname
accountHomeData.givenName = givenName
})
return{
...toRefs(accountHomeData),

View File

@@ -6,7 +6,7 @@
v-model:visible="registerModel"
:footer="null"
:width="pageWidth"
:height="bindType == 'Modify'?'60rem':'70rem'"
:height="bindType == 'Modify'?'60rem':'80rem'"
:maskClosable="false"
:centered="true"
:closable="false"
@@ -60,12 +60,12 @@
/>
<div v-if="bindType != 'Modify'">
<!-- <div class="login_form_title marign_top30">{{ $t('account.Name') }}<span class="must">*</span></div>
<div class="login_form_title marign_top30">{{ $t('account.Name') }}<span class="must">*</span></div>
<div style="display: flex;justify-content: space-between;">
<a-select
class="gallerySelect"
v-model:value="selectSex"
:disabled="!!userDetail.country"
:disabled="!!userDetail.title"
size="large"
optionFilterProp="label"
style="width: 30%;"
@@ -74,9 +74,9 @@
allowClear
show-search
></a-select>
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" :disabled="!!userDetail.occupation" type="text" :placeholder="$t('account.plaseFirst')" v-model="surname">
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" :disabled="!!userDetail.occupation" type="text" :placeholder="$t('account.plaseLast')" v-model="givenName">
</div> -->
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.surname}" :disabled="!!userDetail.surname" type="text" :placeholder="$t('account.plaseFirst')" v-model="surname">
<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.givenName}" :disabled="!!userDetail.givenName" type="text" :placeholder="$t('account.plaseLast')" v-model="givenName">
</div>
<div class="login_form_title marign_top30">{{$t('account.Country')}}:<span class="must">*</span></div>
<div class="login_form_select">
<a-select
@@ -190,13 +190,13 @@ export default defineComponent({
return store.state.UserHabit.userDetail.email
})
let userSex = computed(()=>{
return store.state.UserHabit.userDetail.email
return store.state.UserHabit.userDetail.title
})
let userSurname = computed(()=>{
return store.state.UserHabit.userDetail.email
return store.state.UserHabit.userDetail.surname
})
let userGivenName = computed(()=>{
return store.state.UserHabit.userDetail.email
return store.state.UserHabit.userDetail.givenName
})
let register = reactive({
registerModel:computed(()=>{
@@ -216,7 +216,7 @@ export default defineComponent({
{label:t('account.Ms'),value:'Ms'},
{label:t('account.Miss'),value:'Miss'},
],
selectSex:'Mr',
selectSex:null,
surname:'',
givenName:'',
})
@@ -230,7 +230,7 @@ export default defineComponent({
register.email = newValue == '-------------'?'':newValue
})
watch(userSex,(newValue,oldValue)=>{
register.selectSex = newValue?newValue:'Mr'
register.selectSex = newValue
})
watch(userSurname,(newValue,oldValue)=>{
register.surname = newValue
@@ -338,14 +338,18 @@ export default defineComponent({
message.info("Please select a country");
return;
}
// if (!this.Country && this.bindType != 'Modify') {
// message.info("Please select a country");
// return;
// }
// if (!this.Country && this.bindType != 'Modify') {
// message.info("Please select a country");
// return;
// }
if (!this.selectSex && this.bindType != 'Modify') {
message.info("Please select a title");
return;
}
if (!this.surname && this.bindType != 'Modify') {
message.info("Please select a surname");
return;
}
if (!this.givenName && this.bindType != 'Modify') {
message.info("Please select a givenName");
return;
}
let type = 'BIND_MAILBOX'
if(this.email == this.userDetail.email && this.bindType != 'Modify')type = 'UPDATE_USERINFO'
let data = {
@@ -354,9 +358,9 @@ export default defineComponent({
"operationType": type,
occupation:this.CompanyName,
country:this.Country,
// title:'',
// surname:'',
// givenName:'',
title:this.selectSex,
surname:this.surname,
givenName:this.givenName,
};
if(this.loginTime){
this.loginTime = false

View File

@@ -651,6 +651,12 @@ export default {
jsContent4:'操作困难',
jsContent5:'教程不充足',
jsContent6:'无法生成需要的内容',
jsContent7:'请输入职业',
jsContent8:'请选择一个国家',
jsContent9:'请选择称呼',
jsContent10:'请输入姓',
jsContent11:'请输入名字',
jsContent12:'邮箱格式不正确',
},
frontPage:{
BindWechat:'绑定微信',

View File

@@ -650,6 +650,12 @@ export default {
jsContent4:'Difficult to edit',
jsContent5:'Insufficlent Tutorial/Support',
jsContent6:'Unable to generate what you need',
jsContent7:'Please enter occupation',
jsContent8:'Please select a country',
jsContent9:'Please select a title',
jsContent10:'Please enter surname',
jsContent11:'Please enter givenName',
jsContent12:'The email format is incorrect',
},
frontPage:{
BindWechat:'Bind Wechat',

View File

@@ -82,6 +82,9 @@ const userHabit : Module<UserHabit,RootState> = {
usernameModify:0,
occupation:'',//职业
country:'',//国家
title:'',//称呼
surname:'',//姓氏
givenName:'',//名字
},
bindEmail : {
@@ -187,6 +190,9 @@ const userHabit : Module<UserHabit,RootState> = {
usernameModify:0,
occupation:'',//职业
country:'',//国家
title:'',//称呼
surname:'',//姓氏
givenName:'',//名字
}
state.bindEmail = {
@@ -211,12 +217,18 @@ const userHabit : Module<UserHabit,RootState> = {
state.userDetail.occupation = data.occupation//头像
state.userDetail.usernameModify = data.usernameModify//当月剩余修改次数
state.userDetail.isBeginner = data.isBeginner == 1 ? true : false;//是否完成新手指引
state.userDetail.title = data.title//当月剩余修改次数
state.userDetail.surname = data.surname//当月剩余修改次数
state.userDetail.givenName = data.givenName//当月剩余修改次数
// state.bindEmail.isBindEmail = true
if(
(!data.email && state.userDetail.email == '-------------') ||
(!data.country && !state.userDetail.country) ||
(!data.occupation && !state.userDetail.occupation)
(!data.occupation && !state.userDetail.occupation) ||
(!data.title && !state.userDetail.title) ||
(!data.surname && !state.userDetail.surname) ||
(!data.givenName && !state.userDetail.givenName)
){
state.bindEmail.isBindEmail = true
state.bindEmail.type = ''