Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
eb62b289 by zhangmeng
Options

倒计时修改

1 parent 544fb414
Inline Side-by-side
Showing 2 changed files with 127 additions and 89 deletions
src/viewsPc/match/components/affix-invitation.vue
<template>
<el-dialog
v-model="show" :title="title" append-to-body close-icon="CircleClose" center
:close-on-click-modal="false" class="pcloginpop"
v-model="show" :close-on-click-modal="false" :title="title" append-to-body center
class="pcloginpop" close-icon="CircleClose"
destroy-on-close
>
<div class="boxInvitation">
<div class="text-center pd20" v-if="showR">
<div v-if="showR" class="text-center pd20">
<img class="mauto" src="@/assets/dance/ok.png"/>
<!-- 提交成功等待审核-->
<h3 v-if="form.status">
......@@ -26,8 +26,8 @@
</div>
<el-form :model="form" :rules="rules" ref="iformRef" label-position="top" v-else>
<el-form-item :label="language==0?'申请人类别':'Applicant Type'" required prop="applicatType">
<el-form v-else ref="iformRef" :model="form" :rules="rules" label-position="top">
<el-form-item :label="language==0?'申请人类别':'Applicant Type'" prop="applicatType" required>
<el-select v-model="form.applicatType" @change="changeApplicatType">
<el-option label="MNA/Team" value="1"/>
<el-option label="Technical Official" value="2"/>
......@@ -35,25 +35,25 @@
<!-- <el-option label="Supplier" value="4"/>-->
<el-option label="Other(not listed above)" value="5"/>
</el-select>
<el-input class="mt10" v-if="form.applicatType==5" placeholder="Please specify" v-model="form.remarks"/>
<el-input v-if="form.applicatType==5" v-model="form.remarks" class="mt10" placeholder="Please specify"/>
</el-form-item>
<el-form-item :label="language==0?'邀请函类别':'Invitation Type'" required prop="invitationType">
<el-form-item :label="language==0?'邀请函类别':'Invitation Type'" prop="invitationType" required>
<el-select v-model="form.invitationType">
<el-option :label="language==0?'一般邀请函':'General Invitation'" value="1"/>
<el-option :label="language==0?'TE/PU(外办)邀请函':'TE/PU Invitation'" value="2"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.invitationType=='2'" label="Proof of Employment" required prop="invitationFileArr">
<el-form-item v-if="form.invitationType=='2'" label="Proof of Employment" prop="invitationFileArr" required>
<div class="red">Proof of employment is required for TE/PU invitation letters.</div>
<div class="red">
This document must be issued by the invitee's association and must bear an official stamp or signature.
</div>
<br/>
<file-upload v-model="form.invitationFileArr" :is-show-tip="false" :limit="1"
:button-text="language==0?'上传':'Upload'"></file-upload>
<file-upload v-model="form.invitationFileArr" :button-text="language==0?'上传':'Upload'" :is-show-tip="false"
:limit="1"></file-upload>
</el-form-item>
<el-form-item :label="language==0?'是否需要中文邀请函':'Do you need a Chinese invitation？'" required
prop="chinese">
<el-form-item :label="language==0?'是否需要中文邀请函':'Do you need a Chinese invitation？'" prop="chinese"
required>
<el-radio-group v-model="form.chinese">
<el-radio :value="1">{{ language == 0 ? '是' : 'Yes' }}</el-radio>
<el-radio :value="0">{{ language == 0 ? '否' : 'No' }}</el-radio>
......@@ -63,7 +63,7 @@
<!-- 一般信息-->
<el-form-item :label="language==0?'国家/地区协会名':'MNA/Team Name'" :required="form.applicatType==1"
prop="associationCode">
<el-select v-model="form.associationCode" filterable clearable>
<el-select v-model="form.associationCode" clearable filterable>
<el-option v-for="item in mnaList" :key="item.code" :label="language==0?item.nameCn:item.nameEn"
:value="item.code"/>
</el-select>
......@@ -72,12 +72,12 @@
prop="associationAddress">
<el-input v-model="form.associationAddress"/>
</el-form-item>
<el-form-item :label="language==0?'邮箱':'Contact Email'" required prop="email">
<el-form-item :label="language==0?'邮箱':'Contact Email'" prop="email" required>
<div class="red">Note: Notifications from the organizing committee will be sent to this email address.
</div>
<el-input v-model="form.email" type="email">
<template #append>
<el-button @click="sendEmail" v-loading="codeloading">
<el-button v-loading="codeloading" class="codeBtn" @click="sendEmail">
{{ language == 0 ? '发送验证码' : 'Send Code' }}
</el-button>
</template>
......@@ -85,29 +85,29 @@
<!-- <div class="tip"></div>-->
</el-form-item>
<el-form-item prop="code" required>
<el-input placeholder="Email verification code" v-model="form.code"/>
<el-input v-model="form.code" placeholder="Email verification code"/>
</el-form-item>
<el-form-item :label="language==0?'姓名':'Full Name'" required prop="fullName">
<el-form-item :label="language==0?'姓名':'Full Name'" prop="fullName" required>
<el-input v-model="form.fullName"/>
</el-form-item>
<el-form-item :label="language==0?'联系人职位':'Position'" required prop="position">
<el-form-item :label="language==0?'联系人职位':'Position'" prop="position" required>
<el-select v-model="form.position">
<el-option label="Manager" value="0"/>
<el-option label="Team leader" value="1"/>
<el-option label="Coach" value="2"/>
<el-option label="Other" value="3"/>
</el-select>
<el-input v-if="form.position==3" class="mt10" placeholder="Please specify" v-model="form.remarks1"/>
<el-input v-if="form.position==3" v-model="form.remarks1" class="mt10" placeholder="Please specify"/>
</el-form-item>
<el-form-item :label="language==0?'联系电话':'Phone'" required prop="phone">
<el-form-item :label="language==0?'联系电话':'Phone'" prop="phone" required>
<el-input v-model="form.phone"/>
</el-form-item>
<el-form-item :label="language==0?'签证办理中国大使馆':'Chinese Embassy Visas Office'" required prop="embassy">
<el-form-item :label="language==0?'签证办理中国大使馆':'Chinese Embassy Visas Office'" prop="embassy" required>
<div class="red">Ex:EMBASSY OF THE PEOPLE'S REPUBLIC OFCHINA IN THE ISLAMIC REPUBLIC OF PAKISTAN
</div>
<el-input v-model="form.embassy"/>
</el-form-item>
<el-form-item :label="language==0?'中国大使馆邮箱':'Chinese Embassy Email'" required prop="embassyEmail">
<el-form-item :label="language==0?'中国大使馆邮箱':'Chinese Embassy Email'" prop="embassyEmail" required>
<el-input v-model="form.embassyEmail"/>
</el-form-item>
......@@ -123,28 +123,30 @@
</div>
<div class="red">You may upload multiple passports at once to appy for multiple applicants.
</div>
<ImageUpload v-model="form.passportCopy" :is-show-tip="false" :limit="20"
:action="'/league/visa/getPersonInfoFromCert/3' "
paramName="pic" list-type="text" :show-file-list="false"
:button-text="language==0?'上传':'Upload'" @response="getPassportInfo"
<ImageUpload v-model="form.passportCopy" :action="'/league/visa/getPersonInfoFromCert/3' "
:button-text="language==0?'上传':'Upload'"
:is-show-tip="false"
:limit="20" :show-file-list="false" list-type="text"
paramName="pic" @response="getPassportInfo"
/>
</div>
</el-form-item>
<!--识别信息-->
<div v-if="form.cptVisaInfoBos?.length>0" class="border">
<el-table :data="form.cptVisaInfoBos" border size="small">
<el-table-column prop="passportCopy" :label="language==0?'护照':'Passport Copy'" min-width="100">
<el-table-column :label="language==0?'护照':'Passport Copy'" min-width="100" prop="passportCopy">
<template #header>
<div class="esp">
<span class="red">*</span>Passport Copy
</div>
</template>
<template #default="scope">
<el-image style="width: 60px;z-index: 999;" :src="fillImgUrl(scope.row.passportCopy)"
:preview-src-list="[fillImgUrl(scope.row.passportCopy)]" preview-teleported/>
<el-image :preview-src-list="[fillImgUrl(scope.row.passportCopy)]"
:src="fillImgUrl(scope.row.passportCopy)"
preview-teleported style="width: 60px;z-index: 999;"/>
</template>
</el-table-column>
<el-table-column prop="position" :label="'position'" min-width="100">
<el-table-column :label="'position'" min-width="100" prop="position">
<template #header>
<div class="esp">
<span class="red">*</span>Position
......@@ -180,11 +182,11 @@
</template>
<el-option label="Other (please specify)" value="other"/>
</el-select>
<el-input v-if="scope.row.position=='other'" placeholder="Please specify" v-model="scope.row.remarks"
<el-input v-if="scope.row.position=='other'" v-model="scope.row.remarks" placeholder="Please specify"
size="small"></el-input>
</template>
</el-table-column>
<el-table-column prop="lastName" :label="'lastName'" min-width="100">
<el-table-column :label="'lastName'" min-width="100" prop="lastName">
<template #header>
<div class="esp">
<span class="red">*</span>LastName
......@@ -194,7 +196,7 @@
<el-input v-model="scope.row.lastName" size="small"/>
</template>
</el-table-column>
<el-table-column prop="fristName" :label="'firstName'" min-width="100">
<el-table-column :label="'firstName'" min-width="100" prop="fristName">
<template #header>
<div class="esp">
<span class="red">*</span>firstName
......@@ -204,7 +206,7 @@
<el-input v-model="scope.row.fristName" size="small"/>
</template>
</el-table-column>
<el-table-column prop="sex" :label="language==0?'性别':'Gender'" width="70">
<el-table-column :label="language==0?'性别':'Gender'" prop="sex" width="70">
<template #header>
<div class="esp">
<span class="red">*</span>Gender
......@@ -217,34 +219,34 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="nationality" :label="language==0?'国籍':'Nationality'" width="110px">
<el-table-column :label="language==0?'国籍':'Nationality'" prop="nationality" width="110px">
<template #header>
<div class="esp">
<span class="red">*</span>Nationality
</div>
</template>
<template #default="scope">
<el-select v-model="scope.row.nationality" size="small" filterable>
<el-select v-model="scope.row.nationality" filterable size="small">
<el-option v-for="item in countrys" :key="item.id" :label="item.noc"
:value="item.id"/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="birth" :label="language==0?'出生日期':'Birth'" width="130px">
<el-table-column :label="language==0?'出生日期':'Birth'" prop="birth" width="130px">
<template #header>
<div class="esp">
<span class="red">*</span>Birth
</div>
</template>
<template #default="scope">
<el-date-picker size="small"
v-model="scope.row.birthday"
style="width: 100%;" placeholder="YYYY-MM-DD"
type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
<el-date-picker v-model="scope.row.birthday"
format="YYYY-MM-DD"
placeholder="YYYY-MM-DD" size="small"
style="width: 100%;" type="date" value-format="YYYY-MM-DD"
/>
</template>
</el-table-column>
<el-table-column prop="passportNo" :label="language==0?'护照号':'Passport No.'" width="110px">
<el-table-column :label="language==0?'护照号':'Passport No.'" prop="passportNo" width="110px">
<template #header>
<div class="esp">
<span class="red">*</span>Passport No.
......@@ -254,7 +256,7 @@
<el-input v-model="scope.row.passportNo" size="small"/>
</template>
</el-table-column>
<el-table-column prop="expiryDate" :label="language==0?'护照签发日':'DATE OF ISSUE'" width="130px">
<el-table-column :label="language==0?'护照签发日':'DATE OF ISSUE'" prop="expiryDate" width="130px">
<template #header>
<div class="esp">
<span class="red">*</span>DATE OF ISSUE
......@@ -262,13 +264,13 @@
</template>
<template #default="scope">
<el-date-picker
v-model="scope.row.issueDate" size="small"
style="width: 100%;" placeholder="YYYY-MM-DD"
type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
v-model="scope.row.issueDate" format="YYYY-MM-DD"
placeholder="YYYY-MM-DD" size="small"
style="width: 100%;" type="date" value-format="YYYY-MM-DD"
/>
</template>
</el-table-column>
<el-table-column prop="arrival" :label="language==0?'护照过期日':'DATE OF EXPIRY'" width="130px">
<el-table-column :label="language==0?'护照过期日':'DATE OF EXPIRY'" prop="arrival" width="130px">
<template #header>
<div class="esp">
<span class="red">*</span>DATE OF EXPIRY
......@@ -276,15 +278,15 @@
</template>
<template #default="scope">
<el-date-picker
v-model="scope.row.expiryDate" size="small"
style="width: 100%;" placeholder="YYYY-MM-DD"
type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
v-model="scope.row.expiryDate" format="YYYY-MM-DD"
placeholder="YYYY-MM-DD" size="small"
style="width: 100%;" type="date" value-format="YYYY-MM-DD"
/>
</template>
</el-table-column>
<el-table-column label="Actions" fixed="right">
<el-table-column fixed="right" label="Actions">
<template #default="scope">
<el-button type="danger" size="small" @click="delPassportInfo(scope.$index)" icon="delete"/>
<el-button icon="delete" size="small" type="danger" @click="delPassportInfo(scope.$index)"/>
</template>
</el-table-column>
</el-table>
......@@ -292,13 +294,13 @@
</div>
<!-- 补充材料-->
<el-form-item :label="language==0?'补充材料':'Additional Documents'" prop="files">
<file-upload v-model="form.files" :limit="1" :is-show-tip="false"
:button-text="language==0?'上传':'Upload'"/>
<file-upload v-model="form.files" :button-text="language==0?'上传':'Upload'" :is-show-tip="false"
:limit="1"/>
</el-form-item>
<div class="text-center">
<el-button type="primary" size="large" :disabled="!cptId" @click="submit" round class="btn-lineG">
<el-button :disabled="!cptId" class="btn-lineG" round size="large" type="primary" @click="submit">
{{ language == 0 ? '提交' : 'SUBMIT' }}
</el-button>
</div>
......@@ -457,7 +459,7 @@ const getPassportInfo = (res) => {
}
form.value.cptVisaInfoBos.push(obj)
} else {
if(res.data) {
if (res.data) {
ElMessage.error(res.data.code)
let obj = {
......@@ -473,7 +475,7 @@ const getPassportInfo = (res) => {
passportCopy: res.data.pic
}
form.value.cptVisaInfoBos.push(obj)
}else{
} else {
ElMessage.error(res.msg)
}
}
......@@ -511,7 +513,7 @@ function changeApplicatType() {
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.red {
color: red !important;
}
......@@ -548,4 +550,10 @@ h4 {
flex-wrap: wrap;
display: block;
}
.codeBtn {
background-color: #0540EC !important;
color: #fff !important;
}
</style>
......
src/viewsPc/register/components/utype3.vue
<template>
<el-dialog v-model="show" :title="language==0?'注册':'Login'" close-icon="CircleClose"
width="480" :append-to-body="true" destroy-on-close @close="close" center>
<el-dialog v-model="show" :append-to-body="true" :title="language==0?'注册':'Login'"
center close-icon="CircleClose" destroy-on-close width="480" @close="close">
<div>
<el-form class="d-form" size="large" :label-width="language==0?80:150" :label-position="language==0?'right':'top'" style="max-width: 500px;margin: auto">
<!-- <div style="display: flex;gap: 20px;">-->
<el-form :label-position="language==0?'right':'top'" :label-width="language==0?80:150" class="d-form" size="large"
style="max-width: 500px;margin: auto">
<!-- <div style="display: flex;gap: 20px;">-->
<el-form-item :label="language==0?'姓':'Last Name'" required style="width: 100%;">
<el-input type="text" v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"/>
<el-input v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"
type="text"/>
</el-form-item>
<el-form-item :label="language==0?'名':'First Name'" required style="width: 100%;">
<el-input type="text" v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"/>
<el-input v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"
type="text"/>
</el-form-item>
<!-- </div>-->
<!-- </div>-->
<el-form-item :label="language==0?'邮箱':'E-mail'" required>
<el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode"
<el-input v-model="form.account" type="text" @blur="verifyCode" @change="resetCode"
/>
<div class="tip" v-if="language==0">
<div v-if="language==0" class="tip">
（请填写正确的邮箱信息，邮箱信息在注册完成后无法修改。
该邮箱后续会作为您登录的账户，
并接收报名审核结果、支付账单、签证邀请函等相关信息。）
</div>
<div v-else class="tip">
Please fill in the correct email, which cannot be changed after the registration is completed. The email will be used as your login account and to receive relevant information including results of registration review, payment bills, visa invitation letters, etc.
Please fill in the correct email, which cannot be changed after the registration is completed. The email
will be used as your login account and to receive relevant information including results of registration
review, payment bills, visa invitation letters, etc.
</div>
</el-form-item>
<el-form-item :label="language==0?'验证码':'Code'" required>
<el-input v-model="form.code">
<template #append>
<el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
<el-button class="codeBtn" plain style="width: 110px" type="primary" @click="sendsmsMsg">
<count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
{{ totalSeconds }} {{ language == 0 ? '秒' : 's' }}
</count-down>
......@@ -36,8 +41,8 @@
</el-button>
</template>
</el-input>
<div class="vcodeBox" :style="isShow?'height:240px':'height:0'">
<Vcode :show="isShow" :successText="successVcode" :failText="failVcode" :slider-text="sliderText"
<div :style="isShow?'height:240px':'height:0'" class="vcodeBox">
<Vcode :failText="failVcode" :show="isShow" :slider-text="sliderText" :successText="successVcode"
type="inside" @success="codeSuccess"></Vcode>
</div>
</el-form-item>
......@@ -50,20 +55,22 @@
</el-form-item>
<el-form-item :label="language==0?'密码':'Password'" required>
<el-input type="password" show-password v-model="form.password"
:placeholder="language==0?'6-16位密码。区分大小写':''"/>
<el-input v-model="form.password" :placeholder="language==0?'6-16位密码。区分大小写':''" show-password
type="password"/>
</el-form-item>
<el-form-item :label="language==0?'确认密码':'Confirm Password'" required>
<el-input type="password" show-password v-model="form.password2" @blur="vconfirmPassword"
:placeholder="language==0?'再次输入密码':''"/>
<el-input v-model="form.password2" :placeholder="language==0?'再次输入密码':''" show-password type="password"
@blur="vconfirmPassword"/>
</el-form-item>
</el-form>
</div>
<template #footer>
<div class="dialog-footer text-center">
<a class="btn-black w200px" @click="register">{{language==0?'登录':'Confirm'}}</a>
<div class="text-primary underline mt20 pointer" @click="goLogin">{{language==0?'已有账号去登录':'Already have an account? Login'}}</div>
<a class="btn-black w200px" @click="register">{{ language == 0 ? '登录' : 'Confirm' }}</a>
<div class="text-primary underline mt20 pointer" @click="goLogin">
{{ language == 0 ? '已有账号去登录' : 'Already have an account? Login' }}
</div>
</div>
</template>
</el-dialog>
......@@ -92,10 +99,21 @@ const data = reactive({
failVcode: '验证失败，请重试',
successVcode: '验证通过！',
sliderText: '拖动滑块完成拼图',
show:false,
associationList:[]
show: false,
associationList: []
})
const {isShow, isCodeTrue, counting, form, activeStep, failVcode, successVcode, sliderText,show,associationList} = toRefs(data)
const {
isShow,
isCodeTrue,
counting,
form,
activeStep,
failVcode,
successVcode,
sliderText,
show,
associationList
} = toRefs(data)
const emit = defineEmits(['submit'])
onMounted(() => {
if (language.value == 1) {
......@@ -106,7 +124,7 @@ onMounted(() => {
getAssociationList()
})
const getAssociationList = () => {
getAssociation().then(res=>{
getAssociation().then(res => {
associationList.value = res.data
})
}
......@@ -136,7 +154,7 @@ function sendsmsMsg() {
return
}
if (counting.value) {
return
} else {
isShow.value = true
}
......@@ -157,17 +175,19 @@ function codeSuccess(msg) {
getCaptchaSms({account: form.value.account}).then(res => {
counting.value = true
isCodeTrue.value = true
ElMessage.success(language.value == 0 ? '发送成功,请关注邮箱邮件' :'Send success, please check your email')
ElMessage.success(language.value == 0 ? '发送成功,请关注邮箱邮件' : 'Send success, please check your email')
})
}
function resetCode() {
isCodeTrue.value = false
}
function goLogin() {
show.value = false
useUserStore().setReLogin()
}
function register() {
//游客注册
if (!form.value.account) {
......@@ -187,29 +207,39 @@ function register() {
return
}
if (!form.value.password) {
ElMessage.warning(language.value == 0?'请输入密码':'Please enter password')
ElMessage.warning(language.value == 0 ? '请输入密码' : 'Please enter password')
return
}
if (!form.value.password2) {
ElMessage.warning(language.value == 0?'请再次输入密码':'Please enter password')
ElMessage.warning(language.value == 0 ? '请再次输入密码' : 'Please enter password')
return
}
delete form.value.password2
vistorRegister(form.value).then(res=>{
vistorRegister(form.value).then(res => {
setToken(res.data.token)
emit('submitForm')
})
}
const vconfirmPassword = () => {
if (form.value.password !== form.value.password2) {
ElMessage.warning(language.value == 0 ? '两次输入的密码不一致' :'The two passwords entered are inconsistent')
ElMessage.warning(language.value == 0 ? '两次输入的密码不一致' : 'The two passwords entered are inconsistent')
}
}
function close() {
show.value = false
}
</script>
<style scoped lang="scss">
.tip{line-height: 1.6}
<style lang="scss" scoped>
.tip {
line-height: 1.6
}
.codeBtn {
background-color: #0540EC !important;
color: #fff !important;
}
</style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!