Merge branch 'dev' into order

杨炀
Showing 14 changed files with 32 additions and 21 deletions
src/viewsPc/about/wudao.vue
src/viewsPc/index.vue
src/viewsPc/index_en.vue
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/addWdsf.vue
src/viewsPc/match/components/matchInfo-projectList.vue
src/viewsPc/match/components/zu-table.vue
src/viewsPc/match/import.html
src/viewsPc/match/pay.vue
src/viewsPc/match/signPreview.vue
src/viewsPc/register/personal.vue
src/viewsPc/saiC/index.vue
--- a/src/viewsPc/about/wudao.vue
View file @9e10789
+++ b/src/viewsPc/about/wudao.vue
View file @9e10789
@@ -9,7 +9,7 @@
              <ul>
                <li :class="activeIndex==0?'active':''" @click="activeIndex=0">{{ language==0?'组织机构':'Organizer' }}</li>
                <li :class="activeIndex==1?'active':''" @click="activeIndex=1">{{ language==0?'WDSF亚洲体育舞蹈节':'WDSF Asian Dancesport Festival' }}</li>
-                <li :class="activeIndex==2?'active':''" @click="activeIndex=2">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</li>
+<!--                <li :class="activeIndex==2?'active':''" @click="activeIndex=2">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</li>-->
              </ul>
            </div>
          </el-col>
@@ -99,10 +99,10 @@
                event, which will present a wonderful visual feast for global DanceSport fans.
              </div>
-            </div>
+<!--            </div>-->
-            <div class="infoPart pd20" v-if="activeIndex==2">
+<!--            <div class="infoPart pd20" v-if="activeIndex==2">-->
-              <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3>
+<!--              <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3>-->
              <div class="content" v-if="language==0">
                &ensp;&ensp;&ensp;&ensp;WDSF亚洲体育舞蹈节，创办于2023年，是世界体育舞蹈联合会（WDSF）、亚洲体育舞蹈联合会（DSA）、中国体育舞蹈联合会（CDSF）和无锡市四方共同打造的世界级体育舞蹈IP。该项盛会采用“多赛合办、赛会一体”的创新模式，于每年7月，在无锡开展为期一周的体育舞蹈顶级赛事、职业培训、博览盛会、主题展览、行业会议等赛事活动，围绕“节日有竞赛、竞赛节日化”的指导原则，让7月的无锡成为体育舞蹈创意的栖息地、体育舞蹈艺术家的乐土和体育舞蹈文化旅游的热土，有效启动并积极推动世界体育舞蹈中心从欧洲向中国的长期转移，在中国无锡打造“东方舞都”和“世界体育舞蹈第三极”。
                <br/>
--- a/src/viewsPc/index.vue
View file @9e10789
+++ b/src/viewsPc/index.vue
View file @9e10789
@@ -78,7 +78,7 @@
        </el-col>
        <el-col :sm="24" :lg="12">
          <div class="indexTitle">
-            <h3 class="leftboderTT">奖牌榜</h3>
+            <h3 class="leftboderTT">奖牌榜（2023）</h3>
            <a class="more" href="#/saiC">MORE</a>
          </div>
          <!--历史排名-->
--- a/src/viewsPc/index_en.vue
View file @9e10789
+++ b/src/viewsPc/index_en.vue
View file @9e10789
@@ -74,7 +74,7 @@
        </el-col>
        <el-col :sm="24" :lg="12">
          <div class="indexTitle">
-            <h3 class="leftboderTT">MEDAL LIST</h3>
+            <h3 class="leftboderTT">MEDAL LIST（2023）</h3>
            <a class="more" href="#/saiC">MORE</a>
          </div>
          <!--历史排名-->
--- a/src/viewsPc/match/chooseProject.vue
View file @9e10789
+++ b/src/viewsPc/match/chooseProject.vue
View file @9e10789
@@ -19,7 +19,9 @@
                <div class="panel-body">
                  <div v-if="form.danceMate">
                    <div class="text-danger fontsize14 mb10" v-if="language==0">*如果您报名双人舞项目，请勾选您的舞伴</div>
-                    <div class="text-danger fontsize14 mb10" v-else>*Please select your dance partner if you are registering for a couple event</div>
+                    <div class="text-danger fontsize14 mb10" v-else>
+                      *Please select your dance partner if you are registering for a couple event
+                    </div>
                  </div>
                  <div class="chooseForm" style="display: flex;flex-wrap: wrap;">
                    <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;">
--- a/src/viewsPc/match/chooseSportsman.vue
View file @9e10789
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @9e10789
@@ -847,5 +847,10 @@ watch(choosedchoosed, (newVal, oldVal) => {
    height: 18px;
  }
 }
+:deep(.el-select){
+  --el-border-color:var(--el-color-primary);
+  --el-text-color-placeholder:var(--el-color-primary);
+  --el-input-icon-color:var(--el-color-primary);
+}
 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
 </style>
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @9e10789
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @9e10789
@@ -163,7 +163,7 @@ const emit = defineEmits(['submitForm'])
 const data = reactive({
  form: {
    // countryId: 240,
-    sex: '0'
+    // sex: '0'
  },
  rules: {
    // xing: [{required: true, message: '必填', trigger: 'blur'}],
--- a/src/viewsPc/match/components/addWdsf.vue
View file @9e10789
+++ b/src/viewsPc/match/components/addWdsf.vue
View file @9e10789
@@ -133,7 +133,7 @@ const emit = defineEmits(['submitForm'])
 const data = reactive({
  form: {
    // countryId: 240
-    sex: '0'
+    // sex: '0'
  },
  card: '',
  show: false,
--- a/src/viewsPc/match/components/matchInfo-projectList.vue
View file @9e10789
+++ b/src/viewsPc/match/components/matchInfo-projectList.vue
View file @9e10789
@@ -12,9 +12,9 @@
          <th>服务费（元）</th>
        </tr>
        <tr v-else>
-          <th>Group code</th>
+          <th>EVENT code</th>
          <th>Group</th>
-          <th>Dance Style</th>
+          <th>DISCIPLINE</th>
          <th>Dance Detail</th>
          <th>Sex</th>
          <th>Age</th>
--- a/src/viewsPc/match/components/zu-table.vue
View file @9e10789
+++ b/src/viewsPc/match/components/zu-table.vue
View file @9e10789
@@ -2,7 +2,7 @@
  <div class="mt20"></div>
  <el-table :data="list" border style="width: 100%">
    <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
-    <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="project.code"/>
+    <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" prop="project.code"/>
    <el-table-column :label="language==0?'组别':'Group'" prop="project.name"/>
    <el-table-column :label="language==0?'舞种':'Dance Style'" width="120px" prop="project.danceType"/>
    <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" min-width="160px">
@@ -17,7 +17,7 @@
        </div>
      </template>
    </el-table-column>
-    <el-table-column :label="language==0?'报名费':'REGISTRATION FEE'" width="150px" prop="">
+    <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" width="150px" prop="">
      <template #default="scope">
        <div class="text-primary">
          {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }}
--- a/src/viewsPc/match/import.html
View file @9e10789
+++ b/src/viewsPc/match/import.html
View file @9e10789
@@ -119,12 +119,12 @@
    <table>
        <tr>
            <th>{{ language == 0 ? '序号' : 'Index' }}</th>
-            <th>{{ language == 0 ? '组别代码' : 'Group code' }}</th>
+            <th>{{ language == 0 ? '组别代码' : 'EVENT code' }}</th>
            <th>{{ language == 0 ? '组别' : 'Group' }}</th>
-            <th>{{ language == 0 ? '舞种' : 'Dance Style' }}</th>
+            <th>{{ language == 0 ? '舞种' : 'DISCIPLINE' }}</th>
            <th>{{ language == 0 ? '参赛说明' : 'Participation Instructions' }}</th>
            <th>{{ language == 0 ? '参赛运动员' : 'Participating athletes' }}</th>
-            <th>{{ language == 0 ? '报名费' : 'Registration Fee' }}</th>
+            <th>{{ language == 0 ? '参赛服务费' : 'Registration Fee' }}</th>
        </tr>
        <tr v-for="(row,index) in list">
            <td>{{ index + 1 }}</td>
--- a/src/viewsPc/match/pay.vue
View file @9e10789
+++ b/src/viewsPc/match/pay.vue
View file @9e10789
@@ -52,7 +52,7 @@
                             :match-id="matchId" :list="signInfoList" :hasAction="false"/>
          </div>
          <div class="pd20" v-if="zuTableList?.length>0||zuQuery.groName">
-            <div class="leftboderTT">{{ language == 0 ? '参赛设项报名费' : 'Registration Fee for Event Entry' }}
+            <div class="leftboderTT">{{ language == 0 ? '参赛设项服务费' : 'Registration Fee for Event Entry' }}
              <div class="fr">
                <el-input size="small" v-model="zuQuery.groName" :prefix-icon="Search"
                          @change="getSignList" clearable/>
@@ -74,7 +74,7 @@
            </el-col>
            <el-col :lg="12" :xs="24">
              <div class="flex" v-if="Number(form.totalFee)>0">
-                <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'报名费':'REGISTRATION FEE' }}：</label><span>{{ language==0?'¥':'€' }}{{serviceFeeTotal}}</span></div>
+                <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}：</label><span>{{ language==0?'¥':'€' }}{{serviceFeeTotal}}</span></div>
                <div class="item" v-if="zuTableList?.length>0"><label>{{ language==0?'保险费':'INSURANCE' }}：</label><span>{{ language==0?'¥':'€' }}{{insuranceFeeTotal}}</span></div>
                <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}：</label><span class="size26">{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div>
              </div>
--- a/src/viewsPc/match/signPreview.vue
View file @9e10789
+++ b/src/viewsPc/match/signPreview.vue
View file @9e10789
@@ -69,7 +69,7 @@
        <el-row class="priceBar">
          <el-col :lg="12" :xs="24" class="pd20">
            <div class="flex">
-              <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'报名费':'REGISTRATION FEE' }}：</label><span>{{ language==0?'¥':'€' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
+              <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}：</label><span>{{ language==0?'¥':'€' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
              <div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}：</label><span>{{ language==0?'¥':'€' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
              <div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}：</label><span>{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div>
            </div>
--- a/src/viewsPc/register/personal.vue
View file @9e10789
+++ b/src/viewsPc/register/personal.vue
View file @9e10789
@@ -194,7 +194,7 @@ const data = reactive({
  sliderText: '拖动滑块完成拼图',
  showError: false,
  wdsfData: {
-    sex: '0'
+    // sex: '0'
  },
  wdsfDataRule: {
    birthday: [{required: true, message: 'required', trigger: 'blur'}],
@@ -320,6 +320,10 @@ function next() {
    ElMessage.warning(language.value == 0 ? '请上传护照文件' :'Please upload  your passport file')
    return
  }
+  if (!wdsfData.value.sex) {
+    ElMessage.warning(language.value == 0 ? '请选择性别' :'Please select your gender')
+    return
+  }
  console.log(wdsfData.value.personFlag)
  if (wdsfData.value.personFlag == '0') {
    let obj = {
--- a/src/viewsPc/saiC/index.vue
View file @9e10789
+++ b/src/viewsPc/saiC/index.vue
View file @9e10789
@@ -34,7 +34,7 @@
        </el-row>
      </el-card>
-      <el-card class="mt20 mb20" v-for="(n,index) in cjList">
+      <el-card class="mt20 mb20" v-for="(n,index) in cjList" hidden>
        <div class="leftboderTT">{{ language==0?n.title:n.en_title }}</div>
        <div v-for="(m,jndex) in n.list">
          <h3 class="text-center">{{ m.title }}</h3>