Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
ac828b6e by 杨炀
Options

Merge branch 'dev' into order

2 parents 29d49653 c8463b4e
Inline Side-by-side
Showing 3 changed files with 12 additions and 12 deletions
src/viewsPc/match/detail_en.vue
...@@ -484,7 +484,7 @@ function goTeamSign() { ...@@ -484,7 +484,7 @@ function goTeamSign() {
484 }) 484 })
485 } else { 485 } else {
486 // 国际赛 486 // 国际赛
487 if(group.type!='4'){ 487 if(group.type!='4'&& matchData.value.countryLimit=='1'){
488 ElMessageBox.confirm( 488 ElMessageBox.confirm(
489 language.value==0?'您的团体类型不符合报名条件':'Your Team type does not meet the registration requirements', 489 language.value==0?'您的团体类型不符合报名条件':'Your Team type does not meet the registration requirements',
490 language.value==0?'提示':'Warning', 490 language.value==0?'提示':'Warning',
......
src/viewsPc/match/teamSign.vue
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
29 <el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/> 29 <el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
30 </el-select> 30 </el-select>
31 </el-form-item> 31 </el-form-item>
32 <!-- <el-form-item :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">--> 32 <el-form-item v-if="form.type!='4'" :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">
33 <!-- <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>--> 33 <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
34 <!-- </el-form-item>--> 34 </el-form-item>
35 <el-form-item v-if="!isNational" :label="language==0?'团体名称':'Team Name'" prop="name" required> 35 <!-- <el-form-item v-if="form.type!='4'" :label="language==0?'团体名称':'Team Name'" prop="name" required>-->
36 <!-- <div>--> 36 <!-- <div>-->
37 <!-- <span v-if="language==0">{{form.country.name}}代表队</span>--> 37 <!-- <span v-if="language==0">{{form.country.name}}代表队</span>-->
38 <!-- <span v-else>{{form.country.enName}} Delegation</span>--> 38 <!-- <span v-else>{{form.country.enName}} Delegation</span>-->
39 <!-- </div>--> 39 <!-- </div>-->
40 <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" /> 40 <!-- <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />-->
41 </el-form-item> 41 <!-- </el-form-item>-->
42 <el-form-item :label="language==0?'联系人姓名':'Contact Person'" required prop="contactPerson"> 42 <el-form-item :label="language==0?'联系人姓名':'Contact Person'" required prop="contactPerson">
43 <el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" /> 43 <el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" />
44 </el-form-item> 44 </el-form-item>
......
src/viewsPc/register/team/step2.vue
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
25 <el-form class="d-form" size="large" :model="form" ref="registerRef" 25 <el-form class="d-form" size="large" :model="form" ref="registerRef"
26 :rules="form.is=='0'?registerRules:registerRulesEn" label-width="120" :label-position="language==0?'left':'top'" 26 :rules="form.is=='0'?registerRules:registerRulesEn" label-width="120" :label-position="language==0?'left':'top'"
27 style="max-width: 500px;margin: auto"> 27 style="max-width: 500px;margin: auto">
28 <el-form-item label="是否国家队" v-if="language==0" required> 28 <el-form-item :label="language==0?'是否国家队':'National Team'" required>
29 <el-select filterable v-model="form.is" @change="changeIs"> 29 <el-select filterable v-model="form.is" @change="changeIs">
30 <el-option label="是" value="1"></el-option> 30 <el-option :label="language==0?'是':'Yes'" value="1"></el-option>
31 <el-option label="否" value="0"></el-option> 31 <el-option :label="language==0?'否':'No'" value="0"></el-option>
32 </el-select> 32 </el-select>
33 <div class="tip"> 33 <div class="tip">
34 注册完成后，该属性不可变更 34 {{ language==0?'注册完成后，该属性不可变更':'After registration, this attribute cannot be changed' }}
35 </div> 35 </div>
36 </el-form-item> 36 </el-form-item>
37 <el-form-item :label="language==0?'代表国家/地区':'Representing'" required prop="countryId"> 37 <el-form-item :label="language==0?'代表国家/地区':'Representing'" required prop="countryId">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 /> 49 />
50 <el-input type="textarea" v-model="form.address" class="mt10"/> 50 <el-input type="textarea" v-model="form.address" class="mt10"/>
51 </el-form-item> 51 </el-form-item>
52 <el-form-item v-if="form.is=='0'&&language==0" :label="language==0?'团体类型':'Group type'" prop="type" required> 52 <el-form-item v-if="form.is=='0'" :label="language==0?'团体类型':'Group type'" prop="type" required>
53 <el-select v-model="form.type" :placeholder="language==0?'请选择团体类型':''" style="width: 100%;"> 53 <el-select v-model="form.type" :placeholder="language==0?'请选择团体类型':''" style="width: 100%;">
54 <el-option :label="language==0?'普通院校':'School'" value="0" /> 54 <el-option :label="language==0?'普通院校':'School'" value="0" />
55 <el-option :label="language==0?'专业舞蹈学校':'Professional dance school'" value="1" /> 55 <el-option :label="language==0?'专业舞蹈学校':'Professional dance school'" value="1" />
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!