Merge branch 'dev' into order

@@ -484,7 +484,7 @@ function goTeamSign() {
     })
   } else {
     // 国际赛
-    if(group.type!='4'){
+    if(group.type!='4'&& matchData.value.countryLimit=='1'){
       ElMessageBox.confirm(
           language.value==0?'您的团体类型不符合报名条件':'Your Team type does not meet the registration requirements',
           language.value==0?'提示':'Warning',

@@ -29,16 +29,16 @@
                     <el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
                   </el-select>
                 </el-form-item>
-<!--                <el-form-item :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">-->
-<!--                  <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>-->
-<!--                </el-form-item>-->
-                <el-form-item v-if="!isNational" :label="language==0?'团体名称':'Team Name'" prop="name" required>
+                <el-form-item v-if="form.type!='4'" :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">
+                  <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
+                </el-form-item>
+<!--                <el-form-item v-if="form.type!='4'" :label="language==0?'团体名称':'Team Name'" prop="name" required>-->
 <!--                  <div>-->
 <!--                    <span v-if="language==0">{{form.country.name}}代表队</span>-->
 <!--                    <span v-else>{{form.country.enName}} Delegation</span>-->
 <!--                  </div>-->
-                  <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />
-                </el-form-item>
+<!--                  <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />-->
+<!--                </el-form-item>-->
                 <el-form-item :label="language==0?'联系人姓名':'Contact Person'" required prop="contactPerson">
                   <el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" />
                 </el-form-item>

@@ -25,13 +25,13 @@
       <el-form class="d-form" size="large" :model="form" ref="registerRef"
                :rules="form.is=='0'?registerRules:registerRulesEn" label-width="120" :label-position="language==0?'left':'top'"
                style="max-width: 500px;margin: auto">
-        <el-form-item label="是否国家队" v-if="language==0" required>
+        <el-form-item :label="language==0?'是否国家队':'National Team'" required>
           <el-select filterable v-model="form.is" @change="changeIs">
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
+            <el-option :label="language==0?'是':'Yes'" value="1"></el-option>
+            <el-option :label="language==0?'否':'No'" value="0"></el-option>
           </el-select>
           <div class="tip">
-            注册完成后，该属性不可变更
+            {{ language==0?'注册完成后，该属性不可变更':'After registration, this attribute cannot be changed' }}
           </div>
         </el-form-item>
         <el-form-item :label="language==0?'代表国家/地区':'Representing'" required prop="countryId">
@@ -49,7 +49,7 @@
           />
           <el-input type="textarea" v-model="form.address" class="mt10"/>
         </el-form-item>
-        <el-form-item v-if="form.is=='0'&&language==0" :label="language==0?'团体类型':'Group type'" prop="type" required>
+        <el-form-item v-if="form.is=='0'" :label="language==0?'团体类型':'Group type'" prop="type" required>
           <el-select  v-model="form.type" :placeholder="language==0?'请选择团体类型':''" style="width: 100%;">
             <el-option :label="language==0?'普通院校':'School'" value="0" />
             <el-option :label="language==0?'专业舞蹈学校':'Professional dance school'" value="1" />