47cad97b by 杨炀

no message

1 parent 048aedb4
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <ul> 9 <ul>
10 <li :class="activeIndex==0?'active':''" @click="activeIndex=0">{{ language==0?'组织机构':'Organizer' }}</li> 10 <li :class="activeIndex==0?'active':''" @click="activeIndex=0">{{ language==0?'组织机构':'Organizer' }}</li>
11 <li :class="activeIndex==1?'active':''" @click="activeIndex=1">{{ language==0?'WDSF亚洲体育舞蹈节':'WDSF Asian Dancesport Festival' }}</li> 11 <li :class="activeIndex==1?'active':''" @click="activeIndex=1">{{ language==0?'WDSF亚洲体育舞蹈节':'WDSF Asian Dancesport Festival' }}</li>
12 <li :class="activeIndex==2?'active':''" @click="activeIndex=2">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</li> 12 <!-- <li :class="activeIndex==2?'active':''" @click="activeIndex=2">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</li>-->
13 </ul> 13 </ul>
14 </div> 14 </div>
15 </el-col> 15 </el-col>
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
99 event, which will present a wonderful visual feast for global DanceSport fans. 99 event, which will present a wonderful visual feast for global DanceSport fans.
100 </div> 100 </div>
101 101
102 </div> 102 <!-- </div>-->
103 103
104 <div class="infoPart pd20" v-if="activeIndex==2"> 104 <!-- <div class="infoPart pd20" v-if="activeIndex==2">-->
105 <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3> 105 <!-- <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3>-->
106 <div class="content" v-if="language==0"> 106 <div class="content" v-if="language==0">
107 &ensp;&ensp;&ensp;&ensp;WDSF亚洲体育舞蹈节,创办于2023年,是世界体育舞蹈联合会(WDSF)、亚洲体育舞蹈联合会(DSA)、中国体育舞蹈联合会(CDSF)和无锡市四方共同打造的世界级体育舞蹈IP。该项盛会采用“多赛合办、赛会一体”的创新模式,于每年7月,在无锡开展为期一周的体育舞蹈顶级赛事、职业培训、博览盛会、主题展览、行业会议等赛事活动,围绕“节日有竞赛、竞赛节日化”的指导原则,让7月的无锡成为体育舞蹈创意的栖息地、体育舞蹈艺术家的乐土和体育舞蹈文化旅游的热土,有效启动并积极推动世界体育舞蹈中心从欧洲向中国的长期转移,在中国无锡打造“东方舞都”和“世界体育舞蹈第三极”。 107 &ensp;&ensp;&ensp;&ensp;WDSF亚洲体育舞蹈节,创办于2023年,是世界体育舞蹈联合会(WDSF)、亚洲体育舞蹈联合会(DSA)、中国体育舞蹈联合会(CDSF)和无锡市四方共同打造的世界级体育舞蹈IP。该项盛会采用“多赛合办、赛会一体”的创新模式,于每年7月,在无锡开展为期一周的体育舞蹈顶级赛事、职业培训、博览盛会、主题展览、行业会议等赛事活动,围绕“节日有竞赛、竞赛节日化”的指导原则,让7月的无锡成为体育舞蹈创意的栖息地、体育舞蹈艺术家的乐土和体育舞蹈文化旅游的热土,有效启动并积极推动世界体育舞蹈中心从欧洲向中国的长期转移,在中国无锡打造“东方舞都”和“世界体育舞蹈第三极”。
108 <br/> 108 <br/>
......
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
19 <div class="panel-body"> 19 <div class="panel-body">
20 <div v-if="form.danceMate"> 20 <div v-if="form.danceMate">
21 <div class="text-danger fontsize14 mb10" v-if="language==0">*如果您报名双人舞项目,请勾选您的舞伴</div> 21 <div class="text-danger fontsize14 mb10" v-if="language==0">*如果您报名双人舞项目,请勾选您的舞伴</div>
22 <div class="text-danger fontsize14 mb10" v-else>*Please select your dance partner if you are registering for a couple event</div> 22 <div class="text-danger fontsize14 mb10" v-else>
23 *Please select your dance partner if you are registering for a couple event
24 </div>
23 </div> 25 </div>
24 <div class="chooseForm" style="display: flex;flex-wrap: wrap;"> 26 <div class="chooseForm" style="display: flex;flex-wrap: wrap;">
25 <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;"> 27 <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;">
......
...@@ -847,5 +847,10 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -847,5 +847,10 @@ watch(choosedchoosed, (newVal, oldVal) => {
847 height: 18px; 847 height: 18px;
848 } 848 }
849 } 849 }
850 :deep(.el-select){
851 --el-border-color:var(--el-color-primary);
852 --el-text-color-placeholder:var(--el-color-primary);
853 --el-input-icon-color:var(--el-color-primary);
854 }
850 :deep(.el-select__tags-text){color: #000;font-size: 14px;} 855 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
851 </style> 856 </style>
......
...@@ -163,7 +163,7 @@ const emit = defineEmits(['submitForm']) ...@@ -163,7 +163,7 @@ const emit = defineEmits(['submitForm'])
163 const data = reactive({ 163 const data = reactive({
164 form: { 164 form: {
165 // countryId: 240, 165 // countryId: 240,
166 sex: '0' 166 // sex: '0'
167 }, 167 },
168 rules: { 168 rules: {
169 // xing: [{required: true, message: '必填', trigger: 'blur'}], 169 // xing: [{required: true, message: '必填', trigger: 'blur'}],
......
...@@ -133,7 +133,7 @@ const emit = defineEmits(['submitForm']) ...@@ -133,7 +133,7 @@ const emit = defineEmits(['submitForm'])
133 const data = reactive({ 133 const data = reactive({
134 form: { 134 form: {
135 // countryId: 240 135 // countryId: 240
136 sex: '0' 136 // sex: '0'
137 }, 137 },
138 card: '', 138 card: '',
139 show: false, 139 show: false,
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
12 <th>服务费(元)</th> 12 <th>服务费(元)</th>
13 </tr> 13 </tr>
14 <tr v-else> 14 <tr v-else>
15 <th>Group code</th> 15 <th>EVENT code</th>
16 <th>Group</th> 16 <th>Group</th>
17 <th>Dance Style</th> 17 <th>DISCIPLINE</th>
18 <th>Dance Detail</th> 18 <th>Dance Detail</th>
19 <th>Sex</th> 19 <th>Sex</th>
20 <th>Age</th> 20 <th>Age</th>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="mt20"></div> 2 <div class="mt20"></div>
3 <el-table :data="list" border style="width: 100%"> 3 <el-table :data="list" border style="width: 100%">
4 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/> 4 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
5 <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="project.code"/> 5 <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" prop="project.code"/>
6 <el-table-column :label="language==0?'组别':'Group'" prop="project.name"/> 6 <el-table-column :label="language==0?'组别':'Group'" prop="project.name"/>
7 <el-table-column :label="language==0?'舞种':'Dance Style'" width="120px" prop="project.danceType"/> 7 <el-table-column :label="language==0?'舞种':'Dance Style'" width="120px" prop="project.danceType"/>
8 <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" min-width="160px"> 8 <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" min-width="160px">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </div> 17 </div>
18 </template> 18 </template>
19 </el-table-column> 19 </el-table-column>
20 <el-table-column :label="language==0?'报名费':'REGISTRATION FEE'" width="150px" prop=""> 20 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" width="150px" prop="">
21 <template #default="scope"> 21 <template #default="scope">
22 <div class="text-primary"> 22 <div class="text-primary">
23 {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }} 23 {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }}
......
...@@ -119,12 +119,12 @@ ...@@ -119,12 +119,12 @@
119 <table> 119 <table>
120 <tr> 120 <tr>
121 <th>{{ language == 0 ? '序号' : 'Index' }}</th> 121 <th>{{ language == 0 ? '序号' : 'Index' }}</th>
122 <th>{{ language == 0 ? '组别代码' : 'Group code' }}</th> 122 <th>{{ language == 0 ? '组别代码' : 'EVENT code' }}</th>
123 <th>{{ language == 0 ? '组别' : 'Group' }}</th> 123 <th>{{ language == 0 ? '组别' : 'Group' }}</th>
124 <th>{{ language == 0 ? '舞种' : 'Dance Style' }}</th> 124 <th>{{ language == 0 ? '舞种' : 'DISCIPLINE' }}</th>
125 <th>{{ language == 0 ? '参赛说明' : 'Participation Instructions' }}</th> 125 <th>{{ language == 0 ? '参赛说明' : 'Participation Instructions' }}</th>
126 <th>{{ language == 0 ? '参赛运动员' : 'Participating athletes' }}</th> 126 <th>{{ language == 0 ? '参赛运动员' : 'Participating athletes' }}</th>
127 <th>{{ language == 0 ? '报名费' : 'Registration Fee' }}</th> 127 <th>{{ language == 0 ? '参赛服务费' : 'Registration Fee' }}</th>
128 </tr> 128 </tr>
129 <tr v-for="(row,index) in list"> 129 <tr v-for="(row,index) in list">
130 <td>{{ index + 1 }}</td> 130 <td>{{ index + 1 }}</td>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 :match-id="matchId" :list="signInfoList" :hasAction="false"/> 52 :match-id="matchId" :list="signInfoList" :hasAction="false"/>
53 </div> 53 </div>
54 <div class="pd20" v-if="zuTableList?.length>0||zuQuery.groName"> 54 <div class="pd20" v-if="zuTableList?.length>0||zuQuery.groName">
55 <div class="leftboderTT">{{ language == 0 ? '参赛设项报名费' : 'Registration Fee for Event Entry' }} 55 <div class="leftboderTT">{{ language == 0 ? '参赛设项服务费' : 'Registration Fee for Event Entry' }}
56 <div class="fr"> 56 <div class="fr">
57 <el-input size="small" v-model="zuQuery.groName" :prefix-icon="Search" 57 <el-input size="small" v-model="zuQuery.groName" :prefix-icon="Search"
58 @change="getSignList" clearable/> 58 @change="getSignList" clearable/>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </el-col> 74 </el-col>
75 <el-col :lg="12" :xs="24"> 75 <el-col :lg="12" :xs="24">
76 <div class="flex" v-if="Number(form.totalFee)>0"> 76 <div class="flex" v-if="Number(form.totalFee)>0">
77 <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'报名费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'€' }}{{serviceFeeTotal}}</span></div> 77 <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'€' }}{{serviceFeeTotal}}</span></div>
78 <div class="item" v-if="zuTableList?.length>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'€' }}{{insuranceFeeTotal}}</span></div> 78 <div class="item" v-if="zuTableList?.length>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'€' }}{{insuranceFeeTotal}}</span></div>
79 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span class="size26">{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div> 79 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span class="size26">{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div>
80 </div> 80 </div>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-row class="priceBar"> 69 <el-row class="priceBar">
70 <el-col :lg="12" :xs="24" class="pd20"> 70 <el-col :lg="12" :xs="24" class="pd20">
71 <div class="flex"> 71 <div class="flex">
72 <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'报名费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'€' }}{{form.cptRegistrationFee?.totalFee}}</span></div> 72 <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'€' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
73 <div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'€' }}{{form.cptInsuranceFee?.totalFee}}</span></div> 73 <div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'€' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
74 <div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div> 74 <div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'€' }}{{form.totalFee}}</span></div>
75 </div> 75 </div>
......
...@@ -194,7 +194,7 @@ const data = reactive({ ...@@ -194,7 +194,7 @@ const data = reactive({
194 sliderText: '拖动滑块完成拼图', 194 sliderText: '拖动滑块完成拼图',
195 showError: false, 195 showError: false,
196 wdsfData: { 196 wdsfData: {
197 sex: '0' 197 // sex: '0'
198 }, 198 },
199 wdsfDataRule: { 199 wdsfDataRule: {
200 birthday: [{required: true, message: 'required', trigger: 'blur'}], 200 birthday: [{required: true, message: 'required', trigger: 'blur'}],
...@@ -320,6 +320,10 @@ function next() { ...@@ -320,6 +320,10 @@ function next() {
320 ElMessage.warning(language.value == 0 ? '请上传护照文件' :'Please upload your passport file') 320 ElMessage.warning(language.value == 0 ? '请上传护照文件' :'Please upload your passport file')
321 return 321 return
322 } 322 }
323 if (!wdsfData.value.sex) {
324 ElMessage.warning(language.value == 0 ? '请选择性别' :'Please select your gender')
325 return
326 }
323 console.log(wdsfData.value.personFlag) 327 console.log(wdsfData.value.personFlag)
324 if (wdsfData.value.personFlag == '0') { 328 if (wdsfData.value.personFlag == '0') {
325 let obj = { 329 let obj = {
......
...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 target: 'http://192.168.1.131:8081/', 85 target: 'http://192.168.1.118:8081/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 // target: 'https://dance.itechtop.cn/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!