Merge branch 'order' of https://code.itechtop.cn/yangyang/dance-pc into order

@@ -38,7 +38,10 @@
                   <div class="text-center mt20">
                   <div class="text-center mt20">
                     <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
                     <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
                   </div>
                   </div>
-
+                  <div class="tip">
+                    <span v-if="language==0">*如果您参加个人项目，或给其它组合/选手进行报名，请点击切换按钮重新选择人员</span>
+                    <span v-else>*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.</span>
+                  </div>
                 </div>
                 </div>
               </div>
               </div>
             </el-col>
             </el-col>

@@ -23,7 +23,7 @@
                 </el-form-item>
                 </el-form-item>
               </el-col>
               </el-col>
               <el-col :lg="10">
               <el-col :lg="10">
-                <el-form-item :label="language==0?'代表国家/地区':'Representing'">
+                <el-form-item :label="language==0?'代表国家/地区':'Representing'" required>
                   <el-select filterable v-model="form.countryId" @change="changeCountryId"
                   <el-select filterable v-model="form.countryId" @change="changeCountryId"
                     :disabled="form.type!='4'">
                     :disabled="form.type!='4'">
 <!--                    <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id"/>-->
 <!--                    <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id"/>-->

@@ -26,7 +26,7 @@
                 <el-form-item :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">
                 <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-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item :label="language==0?'团体名称':'Team Name'" prop="name">
+                <el-form-item :label="language==0?'团体名称':'Team Name'" prop="name" required>
                   <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />
                   <el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />
                 </el-form-item>
                 </el-form-item>
                 <el-form-item :label="language==0?'所属国家/地区':'Country'" required>
                 <el-form-item :label="language==0?'所属国家/地区':'Country'" required>

@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },
         '/dev-api': {
         '/dev-api': {
-          target: 'http://192.168.1.131:8081/',
+          target: 'http://192.168.1.118:8081/',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           changeOrigin: true,
           changeOrigin: true,