Skip to content

jijin / dance-pc

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

no message

1 parent 2c092c1c
Inline Side-by-side
Showing 26 changed files with 354 additions and 168 deletions
index.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <meta name="renderer" content="webkit"> 7 <meta name="renderer" content="webkit">
8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> 8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
9 <link rel="icon" href="/favicon.ico"> 9 <link rel="icon" href="/favicon.ico">
10 <title>亚洲体育舞蹈大赛</title> 10 <title>亚洲体育舞蹈节</title>
11 <!-- <script src="./browser.js"></script>--> 11 <!-- <script src="./browser.js"></script>-->
12 <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> 12 <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
13 <style> 13 <style>
......
src/assets/js/data.js
...@@ -351,9 +351,10 @@ export const cjList = [ ...@@ -351,9 +351,10 @@ export const cjList = [
351 {RANK: 5, COUPLE: 'Vadim Shurin - Anastasia Meshkova', COUNTRY: 'LAT', START: '62'}, 351 {RANK: 5, COUPLE: 'Vadim Shurin - Anastasia Meshkova', COUNTRY: 'LAT', START: '62'},
352 {RANK: 6, COUPLE: 'Yuan Shaoyang - Qi Chongxuan', COUNTRY: 'CHN', START: '71'} 352 {RANK: 6, COUPLE: 'Yuan Shaoyang - Qi Chongxuan', COUNTRY: 'CHN', START: '71'}
353 ] 353 ]
354 }, { 354 },
355 {
355 title: '4 . ROUND', 356 title: '4 . ROUND',
356 row: [ 357 rows: [
357 {RANK: 7, COUPLE: 'Dmitri Kolobov - Signe Busk', COUNTRY: 'DEN', START: '40'}, 358 {RANK: 7, COUPLE: 'Dmitri Kolobov - Signe Busk', COUNTRY: 'DEN', START: '40'},
358 {RANK: 8, COUPLE: 'Marco Bodini - Kristina Charitonovaite', COUNTRY: 'LTU', START: '14'}, 359 {RANK: 8, COUPLE: 'Marco Bodini - Kristina Charitonovaite', COUNTRY: 'LTU', START: '14'},
359 {RANK: 9, COUPLE: 'Marius Ilciukas - Grigore Daria', COUNTRY: 'ROU', START: '34'}, 360 {RANK: 9, COUPLE: 'Marius Ilciukas - Grigore Daria', COUNTRY: 'ROU', START: '34'},
...@@ -361,31 +362,72 @@ export const cjList = [ ...@@ -361,31 +362,72 @@ export const cjList = [
361 {RANK: 11, COUPLE: 'Mateusz Brzozowski - Justyna Mozdzonek', COUNTRY: 'POL', START: '16'}, 362 {RANK: 11, COUPLE: 'Mateusz Brzozowski - Justyna Mozdzonek', COUNTRY: 'POL', START: '16'},
362 {RANK: 12, COUPLE: 'Dusan Grula - Giada Cragnolini', COUNTRY: 'SVK', START: '29'}, 363 {RANK: 12, COUPLE: 'Dusan Grula - Giada Cragnolini', COUNTRY: 'SVK', START: '29'},
363 ] 364 ]
364 }, { 365 },
366 {
365 title: '3 . ROUND', 367 title: '3 . ROUND',
366 row: [ 368 rows: [
367 {RANK: 13, COUPLE: '', COUNTRY: 'ISR', START: '42'}, 369 {RANK: 13, COUPLE: 'Vladislav Kozhevnikov - Eleonora Metelitsa', COUNTRY: 'ISR', START: '42'},
368 {RANK: 14, COUPLE: '', COUNTRY: 'UKR', START: '69'}, 370 {RANK: 14, COUPLE: 'Earle Williamson - Veronika Myshko', COUNTRY: 'UKR', START: '69'},
369 {RANK: 15, COUPLE: '', COUNTRY: 'ITA', START: '27'}, 371 {RANK: 15, COUPLE: 'Andrea Gioncada - Vera Demidova', COUNTRY: 'ITA', START: '27'},
370 {RANK: 16, COUPLE: '', COUNTRY: 'BUL', START: '67'}, 372 {RANK: 16, COUPLE: 'Kostadin Vasilev - Roberta Scuderi', COUNTRY: 'BUL', START: '67'},
371 {RANK: 17, COUPLE: '', COUNTRY: 'DEN', START: '70'}, 373 {RANK: 17, COUPLE: 'Errol Williamson - Ami Williamson', COUNTRY: 'DEN', START: '70'},
372 {RANK: 18, COUPLE: '', COUNTRY: 'CHN', START: '49'}, 374 {RANK: 18, COUPLE: 'Liu YI - Zou Xiaotong', COUNTRY: 'CHN', START: '49'},
373 {RANK: 19, COUPLE: '', COUNTRY: 'LAT', START: '21'}, 375 {RANK: 19, COUPLE: 'Romans Dobrecovs - Violetta Levchenko', COUNTRY: 'LAT', START: '21'},
374 {RANK: 20, COUPLE: '', COUNTRY: 'SUI', START: '20'}, 376 {RANK: 20, COUPLE: 'Davide Corrodi - Maja Kucharczyk', COUNTRY: 'SUI', START: '20'},
375 {RANK: 21, COUPLE: '', COUNTRY: 'BUL', START: '22'}, 377 {RANK: 21, COUPLE: 'Iliya Dobrev - Daria Posypai', COUNTRY: 'BUL', START: '22'},
376 {RANK: 22, COUPLE: '', COUNTRY: 'HUN', START: '63'}, 378 {RANK: 22, COUPLE: 'Szalai Denes Ferenc - Balla Petra', COUNTRY: 'HUN', START: '63'},
377 {RANK: 23, COUPLE: '', COUNTRY: 'CZE', START: '15'}, 379 {RANK: 23, COUPLE: 'Jakub Bruck - Marina Makarenko', COUNTRY: 'CZE', START: '15'},
378 {RANK: 24, COUPLE: '', COUNTRY: 'GER', START: '60'}, 380 {RANK: 24, COUPLE: 'Dominik Stoeckl - Anna Gommer', COUNTRY: 'GER', START: '60'},
379 {RANK: 25, COUPLE: '', COUNTRY: 'CZE', START: '52'} 381 {RANK: 25, COUPLE: 'Martin Mestek - Anna Stareckova', COUNTRY: 'CZE', START: '52'}
380 ] 382 ]
381 }, { 383 },
384 {
382 title: '2 . ROUND', 385 title: '2 . ROUND',
383 rows:[] 386 rows:[
387 {RANK: '26-29', COUPLE: 'Luciano Donato - Adele Diodati', COUNTRY: 'ITA', START: '23'},
388 {RANK: '26-29', COUPLE: 'Jean Francois Gueudry - Ilmira Yarullina', COUNTRY: 'FRA', START: '31'},
389 {RANK: '26-29', COUPLE: 'Ilia Rotar - Silvia Susanne Barjabin', COUNTRY: 'EST', START: '57'},
390 {RANK: '26-29', COUPLE: 'Edgar Sztuce Vel Stuzmania - Gemma Dominguez Garcia', COUNTRY: 'ESP', START: '61'},
391 {RANK: 30, COUPLE: 'Tim Grabenwoeger - Natalie Cremar', COUNTRY: 'AUT', START: '28'},
392 {RANK: 31, COUPLE: 'Eric Izakson - Violetta Karnaushenko', COUNTRY: 'ISR', START: '35'},
393 {RANK: 32, COUPLE: 'Gabriel Korpas - Vanessa Murajdova', COUNTRY: 'SVK', START: '41'},
394 {RANK: 33, COUPLE: 'Ivan Valeri Zahariev Aguilar - Magdalena Vidas', COUNTRY: 'CRO', START: '10'},
395 {RANK: '34-36', COUPLE: 'Nicolo Barbizi - Sara Ros Jakobsdottir', COUNTRY: 'ISL', START: '12'},
396 {RANK: '34-36', COUPLE: 'Jung Hoon - Lee Yeeun', COUNTRY: 'KOR', START: '36'},
397 {RANK: '34-36', COUPLE: 'Liu Kai Sum Sam - Liu Wan Hin', COUNTRY: 'HKG', START: '48'},
398 {RANK: '37', COUPLE: 'Andreas Pohl - Magdalena Weinstabl', COUNTRY: 'AUT', START: '56'},
399 {RANK: '38', COUPLE: 'Mikhail Khasanov - Yekaterina Lagutina', COUNTRY: 'KAZ', START: '37'},
400 {RANK: '39-40', COUPLE: 'Minato Kojima - Megumi Morita', COUNTRY: 'JPN', START: '39'},
401 {RANK: '39-40', COUPLE: 'Hiroaki Onishi - Sakina Onishi', COUNTRY: 'JPN', START: '55'},
402 {RANK: '41', COUPLE: 'Florian Baudoux - Natalia Sadowska', COUNTRY: 'FRA', START: '13'},
403 {RANK: '42-44', COUPLE: 'Joost Findhammer - Sina Sawall', COUNTRY: 'NED', START: '26'},
404 {RANK: '42-44', COUPLE: 'Markus Kinnunen - Ellen Puotiniemi', COUNTRY: 'FIN', START: '38'},
405 {RANK: '42-44', COUPLE: 'Genis Betrian Latorre - Lua Ferrando Ortells', COUNTRY: 'ESP', START: '43'},
406 {RANK: '45-48', COUPLE: 'Hoang Tien Manh - Van Quynh Phuong', COUNTRY: 'VIE', START: '33'},
407 {RANK: '45-48', COUPLE: 'Lee Jun Hyeok - Kim Ga Eun', COUNTRY: 'KOR', START: '44'},
408 {RANK: '45-48', COUPLE: 'Lin Li - Hsieh Wen Hsin', COUNTRY: 'TPE', START: '47'},
409 {RANK: '45-48', COUPLE: 'Sean Aranar - Ana Nualla', COUNTRY: 'PHI', START: '58'}
410 ]
384 }, { 411 }, {
385 title: '1 . ROUND', 412 title: '1 . ROUND',
386 rows:[] 413 rows:[
387 } 414 {RANK: '49', COUPLE: 'Vereb Daniel - Unger Fanni', COUNTRY: 'HUN', START: '68'},
388 ] 415 {RANK: '50', COUPLE: 'Wesley van Riel - van Schijndel Sigrid', COUNTRY: 'NED', START: '66'},
416 {RANK: '51', COUPLE: 'Lin Daniel - Chen Angelina', COUNTRY: 'TPE', START: '46'},
417 {RANK: '52', COUPLE: 'Aleksi Ahola - Fay Antikainen', COUNTRY: 'FIN', START: '11'},
418 {RANK: '53', COUPLE: 'Jirapong Thongsanta - Wansika Torwichien', COUNTRY: 'THA', START: '64'},
419 {RANK: '54', COUPLE: 'Hoang Gia Bao - Hoang Gia Linh', COUNTRY: 'VIE', START: '32'},
420 {RANK: '55', COUPLE: 'Adam Mamrak - Emilia Usselmann', COUNTRY: 'SWE', START: '51'},
421 {RANK: '56', COUPLE: 'Issarapong Duangkaew - Thanawan Yananun', COUNTRY: 'THA', START: '24'},
422 {RANK: '57', COUPLE: 'Che Tin Long - Vong Weng Lam', COUNTRY: 'MAC', START: '17'},
423 {RANK: '58', COUPLE: 'Daniel Sverrir Gudbjornsson - Svandis Osk Einarsdottir', COUNTRY: 'ISL', START: '30'},
424 {RANK: '59', COUPLE: 'Lee Kwan Yau - Chow Cheuk Ying', COUNTRY: 'HKG', START: '45'},
425 {RANK: '60-62', COUPLE: 'Chuluunbaatar Ankhbayar - Nomun Batsaikhan', COUNTRY: 'MGL', START: '18'},
426 {RANK: '60-62', COUPLE: 'Hoh Leonard - Mu Linda', COUNTRY: 'MAS', START: '50'},
427 {RANK: '60-62', COUPLE: 'Tuyo Wen Hao - Tuyo Xing Yao', COUNTRY: 'MAS', START: '65'},
428
429 ]
430 }]
389 }, 431 },
390 { 432 {
391 title: '2023 年 WDSF 世界体育舞蹈大奖赛(拉丁舞、标准舞)', 433 title: '2023 年 WDSF 世界体育舞蹈大奖赛(拉丁舞、标准舞)',
...@@ -443,50 +485,78 @@ export const cjList = [ ...@@ -443,50 +485,78 @@ export const cjList = [
443 ] 485 ]
444 }, { 486 }, {
445 title: '5 . ROUND', 487 title: '5 . ROUND',
446 rows: [] 488 rows: [
489 { RANK: 7, COUPLE: 'Marco Bodini - Kristina Charitonovaite', COUNTRY: 'LTU', START: '106', BASE: '280', POINTS: '728'},
490 { RANK: 8, COUPLE: 'Georgy Kalashnikov - Domile Semeskeviciute', COUNTRY: 'LTU', START: '146', BASE: '260', POINTS: '676'},
491 { RANK: 9, COUPLE: 'Qiu Yuming - HU Jingyi', COUNTRY: 'CHN', START: '182', BASE: '240', POINTS: '624'},
492 { RANK: 10, COUPLE: 'Marius Ilciukas - Grigore Daria', COUNTRY: 'ROU', START: '142', BASE: '220', POINTS: '572'},
493 { RANK: 11, COUPLE: 'Evgeny Nikitin - Valeriya Menyaylo', COUNTRY: 'AZE', START: '176', BASE: '200', POINTS: '520'},
494 { RANK: 12, COUPLE: 'Bartlomiej Szkutnik - Agata Brychcy', COUNTRY: 'POL', START: '197', BASE: '180', POINTS: '468'}
495 ]
447 }, { 496 }, {
448 title: '4 . ROUND', 497 title: '4 . ROUND',
449 rows: [] 498 rows: [
450 }, { 499 { RANK:13,COUPLE:'Mateusz Brzozowski - Justyna Mozdzonek',COUNTRY:'POL',START:'109',BASE:'140',POINTS:'364'},
451 title: '3 . ROUND', 500 { RANK:14,COUPLE:'Dusan Grula - Giada Cragnolini',COUNTRY:'SVK',START:'133',BASE:'135',POINTS:'351'},
452 rows: [] 501 { RANK:15,COUPLE:'Andrea Gioncada - Vera Demidova',COUNTRY:'ITA',START:'130',BASE:'130',POINTS:'338'},
453 }, { 502 { RANK:'16-17',COUPLE:'Alexey Bredikhin - Daria Bredikhina',COUNTRY:'ALB',START:'107',BASE:'125',POINTS:'325'},
454 title: '2 . ROUND', 503 { RANK:'16-17',COUPLE:'Earle Williamson - Veronika Myshko',COUNTRY:'UKB',START:'206',BASE:'125',POINTS:'325'},
455 rows: [] 504 { RANK:18,COUPLE:'Vladislav Kozhevnikov - Eleonora Metelitsa',COUNTRY:'ISR',START:'153',BASE:'115',POINTS:'299'},
456 }, { 505 { RANK:19,COUPLE:'Errol Williamson - Ami Williamson',COUNTRY:'DEN',START:'207',BASE:'110',POINTS:'286'},
457 title: '1 . ROUND', 506 { RANK:20,COUPLE:'Iliya Dobrev - Daria Posypai',COUNTRY:'BUL',START:'118',BASE:'105',POINTS:'273'},
458 rows: [] 507 { RANK:21,COUPLE:'WU Hongbo - LU Wanying',COUNTRY:'CHN',START:'208',BASE:'100',POINTS:'260'},
508 { RANK:22,COUPLE:'Kostadin Vasilev - Roberta Scuderi',COUNTRY:'BUL',START:'200',BASE:'95',POINTS:'247'},
509 { RANK:23,COUPLE:'Ilia Rotar - Silvia Susanne Barjabin',COUNTRY:'EST',START:'185',BASE:'90',POINTS:'234'},
510 { RANK:24,COUPLE:'Pawel Subczynski - Aleksandra Kucharska',COUNTRY:'POL',START:'193',BASE:'85',POINTS:'221'},
511 { RANK:25,COUPLE:'Dominik Stoeckl - Anna Gommer',COUNTRY:'GER',START:'191',BASE:'70',POINTS:'182'},
512 { RANK:26,COUPLE:'Martin Mestek - Anna Stareckova',COUNTRY:'CZE',START:'172',BASE:'70',POINTS:'182'},
513 { RANK:27,COUPLE:'Eric Izakson - Violetta Karnaushenko',COUNTRY:'ISR',START:'144',BASE:'70',POINTS:'182'}
514 ]
515 // }, {
516 // title: '3 . ROUND',
517 // rows: []
518 // }, {
519 // title: '2 . ROUND',
520 // rows: []
521 // }, {
522 // title: '1 . ROUND',
523 // rows: []
459 }] 524 }]
460 }, { 525 },
526 {
461 title: '2023 WDSF GrandSlam(Standard&Latin)', 527 title: '2023 WDSF GrandSlam(Standard&Latin)',
462 list: [{ 528 list: [{
463 title: 'FINAL', 529 title: 'FINAL',
464 row: [ 530 rows: [
465 { 531 {RANK: 1, COUPLE: 'Marius-Andrei Balan - Khrystyna Moshenska', COUNTRY: 'GER', START: '303', BASE: '400', POINTS: '1080'},
466 RANK: 1, 532 {RANK: 2,COUPLE:'Charles-Guillaume Schmitt - Elena Salikhova',COUNTRY:'FRA',START:'375',BASE:'380',POINTS:'1026'},
467 COUPLE: 'Marius-Andrei Balan - Khrystyna Moshenska', 533 {RANK: 3,COUPLE:'Yan Bangbang - Du Yujun',COUNTRY:'CHN',START:'406',BASE:'360',POINTS:'972'},
468 COUNTRY: 'GER', 534 {RANK: 4,COUPLE:'Malthe Brinch Rohde - Sandra Sorensen',COUNTRY:'DEN',START:'372',BASE:'340',POINTS:'918'},
469 START: '303', 535 {RANK: 5,COUPLE:'Winson Tam - Anastasia Novikova',COUNTRY:'HKG',START:'383',BASE:'320',POINTS:'864'},
470 BASE: '400', 536 {RANK: 6,COUPLE:'Konstantin Gorodilov - Polina Figurenko',COUNTRY:'EST',START:'323',BASE:'300',POINTS:'810'}
471 POINTS: '1080'
472 },
473
474 ] 537 ]
475 }, { 538 }, {
476 title: '5 . ROUND', 539 title: '5 . ROUND',
477 rows: [] 540 rows: [
478 }, { 541 {RANK: 7,COUPLE:'Miculescu Ionut Alexandru - Pacurar Andra',COUNTRY:'ROU',START:'364',BASE:'280',POINTS:'756'},
479 title: '4 . ROUND', 542 {RANK: 8,COUPLE:'Artur Balandin - Anna Salita',COUNTRY:'GER',START:'304',BASE:'260',POINTS:'702'},
480 rows: [] 543 {RANK: 9,COUPLE:'Jakub Lipowski - Tereza Kucerova',COUNTRY:'CZE',START:'354',BASE:'240',POINTS:'648'},
481 }, { 544 {RANK: 10,COUPLE:'Eric Testa - Federica Brezzo',COUNTRY:'ITA',START:'384',BASE:'220',POINTS:'594'},
482 title: '3 . ROUND', 545 {RANK: 11,COUPLE:'Vicenc Torremade - Megija Dana Morite',COUNTRY:'LAT',START:'374',BASE:'200',POINTS:'540'},
483 rows: [] 546 {RANK: 12,COUPLE:'Egor Kondratenko - Mie Lincke Funch',COUNTRY:'DEN',START:'344',BASE:'180',POINTS:'486'}
484 }, { 547 ]
485 title: '2 . ROUND', 548 // }, {
486 rows: [] 549 // title: '4 . ROUND',
487 }, { 550 // rows: []
488 title: '1 . ROUND', 551 // }, {
489 rows: [] 552 // title: '3 . ROUND',
553 // rows: []
554 // }, {
555 // title: '2 . ROUND',
556 // rows: []
557 // }, {
558 // title: '1 . ROUND',
559 // rows: []
490 }] 560 }]
491 } 561 }
492 ] 562 ]
......
src/components/ImageUpload/index2.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 <!--裁剪--> 58 <!--裁剪-->
59 <el-dialog 59 <el-dialog
60 v-model="open" 60 v-model="open"
61 title="裁剪图片" 61 :title="language=='0'?'裁剪图片':'Cropper'"
62 width="600px" 62 width="600px"
63 append-to-body 63 append-to-body
64 @opened="modalOpened" 64 @opened="modalOpened"
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 :accept="accept" 91 :accept="accept"
92 > 92 >
93 <el-button> 93 <el-button>
94 选择 94 {{ language=='0'?'选择':'chose' }}
95 <el-icon class="el-icon--right"><Upload /></el-icon> 95 <el-icon class="el-icon--right"><Upload /></el-icon>
96 </el-button> 96 </el-button>
97 </el-upload> 97 </el-upload>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 <el-button icon="RefreshRight" @click="rotateRight()" /> 109 <el-button icon="RefreshRight" @click="rotateRight()" />
110 </el-col> 110 </el-col>
111 <el-col :lg="{ span: 1, offset: 5 }" :md="2"> 111 <el-col :lg="{ span: 1, offset: 5 }" :md="2">
112 <el-button type="primary" @click="uploadImg()">提 交</el-button> 112 <el-button type="primary" @click="uploadImg()">{{ language=='0'?'提 交':'submit' }}</el-button>
113 </el-col> 113 </el-col>
114 </el-row> 114 </el-row>
115 </el-dialog> 115 </el-dialog>
...@@ -123,6 +123,8 @@ import { computed, getCurrentInstance, ref, watch } from 'vue' ...@@ -123,6 +123,8 @@ import { computed, getCurrentInstance, ref, watch } from 'vue'
123 import { reactive } from '@vue/runtime-core' 123 import { reactive } from '@vue/runtime-core'
124 import request from '@/utils/request' 124 import request from '@/utils/request'
125 import _ from 'lodash' 125 import _ from 'lodash'
126 import {useStorage} from "@vueuse/core/index";
127 const language= useStorage('language',0)
126 128
127 const props = defineProps({ 129 const props = defineProps({
128 modelValue: [String, Object, Array], 130 modelValue: [String, Object, Array],
...@@ -286,7 +288,7 @@ function uploadImg() { ...@@ -286,7 +288,7 @@ function uploadImg() {
286 }).then((res) => { 288 }).then((res) => {
287 open.value = false 289 open.value = false
288 options.img = res.msg 290 options.img = res.msg
289 proxy.$modal.msgSuccess('上传成功') 291 proxy.$modal.msgSuccess(language.value==0?'上传成功':'Upload Success')
290 visible.value = false 292 visible.value = false
291 fileList.value.push({ 293 fileList.value.push({
292 url: options.img 294 url: options.img
......
src/layoutPc/components/AppBottom.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <el-col :lg="10" :md="12" :xs="24"> 14 <el-col :lg="10" :md="12" :xs="24">
15 <ul style="text-align: right"> 15 <ul style="text-align: right">
16 <li>客服及报障电话:15606190026</li> 16 <li>客服及报障电话:15606190026</li>
17 <li>客服及报障邮箱: info@jinsports.com</li> 17 <li>客服及报障邮箱: info@wdsfwuxicenter.com</li>
18 <li> 18 <li>
19 19
20 <!-- <a class="ffoot" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010102004192">--> 20 <!-- <a class="ffoot" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010102004192">-->
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 <p class="text-center mt10">微博关注</p> 30 <p class="text-center mt10">微博关注</p>
31 </div> 31 </div>
32 </el-col> 32 </el-col>
33 <el-col :span="24"> 33 <el-col :span="24" style="border-top: 1px solid #fff">
34 <div class="text-center copyright">版权所有@无锡和畅赛事运营有限公司 34 <div class="text-center copyright pd10">版权所有@无锡和畅赛事运营有限公司
35 &ensp;&ensp; 35 &ensp;&ensp;
36 <a target="_blank" href="https://beian.miit.gov.cn/">ICP备案号：苏ICP备2023054420号-2</a></div> 36 <a target="_blank" href="https://beian.miit.gov.cn/">ICP备案号：苏ICP备2023054420号-2</a></div>
37 </el-col> 37 </el-col>
...@@ -41,21 +41,35 @@ ...@@ -41,21 +41,35 @@
41 <el-row style="align-items: center;" v-if="language==1"> 41 <el-row style="align-items: center;" v-if="language==1">
42 <el-col :lg="12" :md="12" :xs="24"> 42 <el-col :lg="12" :md="12" :xs="24">
43 <ul> 43 <ul>
44 <li> 44 <li>Postal code：214000</li>
45 <router-link to="/about">All rights reserved WDSF ASIAN DANCESPORT FESTIVAL .WUXI 2024</router-link> 45 <li>100 meters northeast of the intersection of Hefeng Road and Qingshu, the Taihu Lake New Town, Wuxi, Jiangsu</li>
46 </li> 46
47 <li>
48 Phone: Miss Chang +86 18888888888
49 </li>
50 </ul> 47 </ul>
51 </el-col> 48 </el-col>
52 <el-col :lg="12" :md="12" :xs="24"> 49 <el-col :lg="18" :md="12" :xs="24">
53 <ul style="text-align: right"> 50 <ul style="text-align: right">
54 <li>Address：No.88 Qingshu Road,Economic and Development District, Wuxi City,Jiangsu Province,China 51 <li>telephone:15606190026</li>
52 <li>e-mail:info@wdsfwuxicenter.com</li>
53 <li>
54
55 <!-- <a class="ffoot" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010102004192">-->
56 <!-- <img src="@/assets/v1/beian.png">-->
57 <!-- 京公网安备 11010102004192号</a>-->
58
55 </li> 59 </li>
56 <li>Email: 8888989@163.com</li>
57 </ul> 60 </ul>
58 </el-col> 61 </el-col>
62 <el-col :lg="4" :md="12" :xs="24">
63 <div>
64 <img class="mauto" src="/img/wb2.jpg"/>
65 <p class="text-center mt10">Weibo</p>
66 </div>
67 </el-col>
68 <el-col :span="24" style="border-top: 1px solid #fff">
69 <div class="text-center copyright pd10">Copyright@Wuxi Hechang Sports Operations Co., Ltd
70 &ensp;&ensp;
71 <a target="_blank" href="https://beian.miit.gov.cn/">ICP：苏ICP备2023054420号-2</a></div>
72 </el-col>
59 </el-row> 73 </el-row>
60 </div> 74 </div>
61 </div> 75 </div>
...@@ -72,7 +86,7 @@ const language = useStorage('language', 0) ...@@ -72,7 +86,7 @@ const language = useStorage('language', 0)
72 .copyright{ font-size: 14px; 86 .copyright{ font-size: 14px;
73 opacity: 0.88; 87 opacity: 0.88;
74 color: #4C5359;} 88 color: #4C5359;}
75 .footAll{background: #E0E3E5;;padding: 36px 0 15px; 89 .footAll{background: #E0E3E5;;padding: 36px 0 5px;
76 p{ font-size: 14px; 90 p{ font-size: 14px;
77 opacity: 0.88; 91 opacity: 0.88;
78 color: #4C5359;} 92 color: #4C5359;}
......
src/viewsPc/about/wudao.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <div class="content"> 45 <div class="content">
46 <div class="phone"> 46 <div class="phone">
47 <h4>电话</h4> 47 <h4>电话</h4>
48 <p>张小姐：18888888888</p> 48 <p>武先生:15606190026</p>
49 </div> 49 </div>
50 <div class="address"> 50 <div class="address">
51 <h4>地址</h4> 51 <h4>地址</h4>
......
src/viewsPc/about/wudao_en.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <div class="content"> 40 <div class="content">
41 <div class="phone"> 41 <div class="phone">
42 <h4>Phone</h4> 42 <h4>Phone</h4>
43 <p>Miss Chang：+86 18888888888</p> 43 <p>Mr.WU:15606190026</p>
44 </div> 44 </div>
45 <div class="address"> 45 <div class="address">
46 <h4>Address</h4> 46 <h4>Address</h4>
......
src/viewsPc/center/myInfo.vue
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <el-form-item label="Passport" required> 48 <el-form-item label="Passport" required>
49 <el-input v-model="myform.passportNumber"/> 49 <el-input v-model="myform.passportNumber"/>
50 </el-form-item> 50 </el-form-item>
51 <el-form-item label="Passport File"> 51 <el-form-item label="Passport File" required>
52 <file-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/> 52 <file-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
53 </el-form-item> 53 </el-form-item>
54 <el-form-item :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin"> 54 <el-form-item :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin">
......
src/viewsPc/index.vue
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
9 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 9 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
10 <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;"> 10 <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
11 <div v-if="n.progressStatusCode=='2'" style="position: absolute;bottom: 50%;right: 5%"> 11
12 <el-button class="btn-lineG w200px" style="font-size: 17px;height: 40px" round @click="goMatch(n)" type="primary">开始报名</el-button> 12 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)">
13 </div>
14 <div class="banner-count" v-else-if="n.time>0">
15 距离开始还有 13 距离开始还有
16 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒"> 14 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
17 <template #default="timeData"> 15 <template #default="timeData">
...@@ -33,6 +31,10 @@ ...@@ -33,6 +31,10 @@
33 </template> 31 </template>
34 </van-count-down> 32 </van-count-down>
35 </div> 33 </div>
34 <div class="banner-count" style="width: 580px;justify-content: center;height: 100px;font-size: 30px" v-else @click="goMatch(n)">
35 开始报名
36 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
37 </div>
36 </div> 38 </div>
37 </div> 39 </div>
38 </div> 40 </div>
...@@ -141,7 +143,7 @@ ...@@ -141,7 +143,7 @@
141 </template> 143 </template>
142 </el-table-column> 144 </el-table-column>
143 145
144 <el-table-column label="国家/地区" prop="name"> 146 <el-table-column label="国家" prop="name">
145 <template #default="scope"> 147 <template #default="scope">
146 <div> 148 <div>
147 <span :class="`flag-icon flag-icon-${scope.row.code}`"></span> 149 <span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
...@@ -149,7 +151,7 @@ ...@@ -149,7 +151,7 @@
149 </div> 151 </div>
150 </template> 152 </template>
151 </el-table-column> 153 </el-table-column>
152 <el-table-column label="队伍名称" align="center"> 154 <el-table-column label="组合" align="center">
153 <template #default="scope"> 155 <template #default="scope">
154 <div class="text-primary esp">{{ scope.row.name }}</div> 156 <div class="text-primary esp">{{ scope.row.name }}</div>
155 </template> 157 </template>
...@@ -318,15 +320,15 @@ ...@@ -318,15 +320,15 @@
318 <div class="content"> 320 <div class="content">
319 <div class="phone"> 321 <div class="phone">
320 <h4>电话</h4> 322 <h4>电话</h4>
321 <p>张小姐：18888888888</p> 323 <p>武先生:15606190026</p>
322 </div> 324 </div>
323 <div class="address"> 325 <div class="address">
324 <h4>地址</h4> 326 <h4>地址</h4>
325 <p>无锡市经开区清舒道88号</p> 327 <p>江苏省 无锡市太湖新城和风路与清舒交叉口东北100米</p>
326 </div> 328 </div>
327 <div class="email"> 329 <div class="email">
328 <h4>邮箱</h4> 330 <h4>邮箱</h4>
329 <p>8888989@163.com</p> 331 <p>info@wdsfwuxicenter.com</p>
330 </div> 332 </div>
331 </div> 333 </div>
332 </div> 334 </div>
......
src/viewsPc/index_en.vue
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
9 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 9 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
10 <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;"> 10 <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
11 <div v-if="n.progressStatusCode=='2'" style="position: absolute;bottom: 50%;right: 5%"> 11
12 <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round @click="goMatch(n)" type="primary">开始报名</el-button> 12 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)">
13 </div>
14 <div class="banner-count" v-else-if="n.time>0">
15 Countdown 13 Countdown
16 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒"> 14 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
17 <template #default="timeData"> 15 <template #default="timeData">
...@@ -30,6 +28,10 @@ ...@@ -30,6 +28,10 @@
30 </template> 28 </template>
31 </van-count-down> 29 </van-count-down>
32 </div> 30 </div>
31 <div class="banner-count" style="width: 580px;justify-content: center;height: 100px;font-size: 30px" v-else @click="goMatch(n)">
32 Register Now
33 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
34 </div>
33 </div> 35 </div>
34 </div> 36 </div>
35 </div> 37 </div>
...@@ -135,7 +137,7 @@ ...@@ -135,7 +137,7 @@
135 <!--历史排名--> 137 <!--历史排名-->
136 <el-card :body-style="{'padding':'10px 20px 18px'}"> 138 <el-card :body-style="{'padding':'10px 20px 18px'}">
137 <el-table stripe :data="rankList"> 139 <el-table stripe :data="rankList">
138 <el-table-column label="Ranking" align="center" width="80" type="index"> 140 <el-table-column label="RANK" align="center" width="80" type="index">
139 <template #default="scope"> 141 <template #default="scope">
140 <span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span> 142 <span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span>
141 <span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span> 143 <span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span>
...@@ -143,7 +145,7 @@ ...@@ -143,7 +145,7 @@
143 <span v-else>{{ scope.row.index }}</span> 145 <span v-else>{{ scope.row.index }}</span>
144 </template> 146 </template>
145 </el-table-column> 147 </el-table-column>
146 <el-table-column label="Country/Region"> 148 <el-table-column label="COUNTRY">
147 <template #default="scope"> 149 <template #default="scope">
148 <div> 150 <div>
149 <span :class="`flag-icon flag-icon-${scope.row.code}`"></span> 151 <span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
...@@ -321,7 +323,7 @@ ...@@ -321,7 +323,7 @@
321 <div class="content"> 323 <div class="content">
322 <div class="phone"> 324 <div class="phone">
323 <h4>Phone</h4> 325 <h4>Phone</h4>
324 <p>Miss Chang：+86 18888888888</p> 326 <p>Mr.WU:15606190026</p>
325 </div> 327 </div>
326 <div class="address"> 328 <div class="address">
327 <h4>Address</h4> 329 <h4>Address</h4>
...@@ -329,7 +331,7 @@ ...@@ -329,7 +331,7 @@
329 </div> 331 </div>
330 <div class="email"> 332 <div class="email">
331 <h4>Email</h4> 333 <h4>Email</h4>
332 <p>8888989@163.com</p> 334 <p>info@wdsfwuxicenter.com</p>
333 </div> 335 </div>
334 </div> 336 </div>
335 </div> 337 </div>
......
src/viewsPc/match/chooseCoach.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <div class="chooseForm"> 21 <div class="chooseForm">
22 <el-checkbox-group v-model="form.coachs" @change="changecoachs"> 22 <el-checkbox-group v-model="form.coachs" @change="changecoachs">
23 <div class="addBttn" @click="addCoach('1')">+</div> 23 <div class="addBttn" @click="addCoach('1')">+</div>
24 <el-checkbox v-for="c in personAllList?.coaches" :label="c.id"> 24 <el-checkbox v-for="c in personAllList?.coaches" :value="c.id">
25 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 25 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
26 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 26 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
27 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 27 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <div class="chooseForm"> 49 <div class="chooseForm">
50 <el-checkbox-group v-model="form.leader"> 50 <el-checkbox-group v-model="form.leader">
51 <div class="addBttn" @click="addCoach('2')">+</div> 51 <div class="addBttn" @click="addCoach('2')">+</div>
52 <el-checkbox v-for="c in personAllList?.leaders" :label="c.id"> 52 <el-checkbox v-for="c in personAllList?.leaders" :value="c.id">
53 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 53 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
54 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 54 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
55 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 55 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 <div class="chooseForm"> 74 <div class="chooseForm">
75 <el-checkbox-group v-model="form.doctor"> 75 <el-checkbox-group v-model="form.doctor">
76 <div class="addBttn" @click="addCoach('4')">+</div> 76 <div class="addBttn" @click="addCoach('4')">+</div>
77 <el-checkbox v-for="c in personAllList?.teamDoctors" :label="c.id"> 77 <el-checkbox v-for="c in personAllList?.teamDoctors" :value="c.id">
78 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 78 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
79 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 79 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
80 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 80 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 <div class="chooseForm"> 99 <div class="chooseForm">
100 <el-checkbox-group v-model="form.translator"> 100 <el-checkbox-group v-model="form.translator">
101 <div class="addBttn" @click="addCoach('5')">+</div> 101 <div class="addBttn" @click="addCoach('5')">+</div>
102 <el-checkbox v-for="c in personAllList?.translators" :label="c.id"> 102 <el-checkbox v-for="c in personAllList?.translators" :value="c.id">
103 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 103 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
104 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 104 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
105 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 105 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 <div class="chooseForm"> 124 <div class="chooseForm">
125 <el-checkbox-group v-model="form.official"> 125 <el-checkbox-group v-model="form.official">
126 <div class="addBttn" @click="addCoach('6')">+</div> 126 <div class="addBttn" @click="addCoach('6')">+</div>
127 <el-checkbox v-for="c in personAllList?.officials" :label="c.id"> 127 <el-checkbox v-for="c in personAllList?.officials" :value="c.id">
128 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 128 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
129 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 129 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
130 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 130 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 <div class="chooseForm"> 149 <div class="chooseForm">
150 <el-checkbox-group v-model="form.other"> 150 <el-checkbox-group v-model="form.other">
151 <div class="addBttn" @click="addCoach('3')">+</div> 151 <div class="addBttn" @click="addCoach('3')">+</div>
152 <el-checkbox v-for="c in personAllList?.others" :label="c.id"> 152 <el-checkbox v-for="c in personAllList?.others" :value="c.id">
153 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/> 153 <el-avatar fit="cover" v-if="c.picUrl" :size="60" :src="fillImgUrl(c.picUrl)"/>
154 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/> 154 <el-avatar fit="cover" v-else-if="c.sex == 0" :size="60" src="/img/head1.png"/>
155 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/> 155 <el-avatar fit="cover" v-else-if="c.sex == 1" :size="60" src="/img/head0.png"/>
......
src/viewsPc/match/chooseProject.vue
...@@ -36,9 +36,11 @@ ...@@ -36,9 +36,11 @@
36 <el-checkbox-group v-model="mateChosed" @change="changeMate"> 36 <el-checkbox-group v-model="mateChosed" @change="changeMate">
37 <el-checkbox :label="form.danceMate.id"> 37 <el-checkbox :label="form.danceMate.id">
38 <div> 38 <div>
39 <el-avatar fit="cover" v-if="form.danceMate.sex == 0" :size="60" 39 <el-avatar fit="cover" v-if="form.danceMate.picUrl" :size="60" :src="fillImgUrl(form.danceMate.picUrl)"/>
40
41 <el-avatar fit="cover" v-else-if="form.danceMate.sex == 0" :size="60"
40 src="/img/head1.png"/> 42 src="/img/head1.png"/>
41 <el-avatar fit="cover" v-if="form.danceMate.sex == 1" :size="60" 43 <el-avatar fit="cover" v-else-if="form.danceMate.sex == 1" :size="60"
42 src="/img/head0.png"/> 44 src="/img/head0.png"/>
43 <div class="text-center mt10" @click="editMate(form.danceMate)"> 45 <div class="text-center mt10" @click="editMate(form.danceMate)">
44 <span>{{ form.danceMate.realName }}</span> 46 <span>{{ form.danceMate.realName }}</span>
...@@ -76,7 +78,7 @@ ...@@ -76,7 +78,7 @@
76 clearable/> 78 clearable/>
77 </div> 79 </div>
78 </div> 80 </div>
79 <div v-loading="loadingProject" style="height: 55vh"> 81 <div v-loading="loadingProject" style="height: 55vh;overflow: auto;">
80 <el-checkbox-group v-model="projectIds"> 82 <el-checkbox-group v-model="projectIds">
81 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id"> 83 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id">
82 <div class="flexBetween w100"> 84 <div class="flexBetween w100">
...@@ -690,7 +692,7 @@ function switchTabletype() { ...@@ -690,7 +692,7 @@ function switchTabletype() {
690 } 692 }
691 693
692 .flexBetweenBox { 694 .flexBetweenBox {
693 width: 100%; 695 width: 100%;margin-right: 0;
694 height: auto; 696 height: auto;
695 border-bottom: 1px solid #eee; 697 border-bottom: 1px solid #eee;
696 padding: 0 10px; 698 padding: 0 10px;
......
src/viewsPc/match/chooseSportsman.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 clearable/> 78 clearable/>
79 </div> 79 </div>
80 </div> 80 </div>
81 <div v-loading="loadingProject" id="projectbox" style="height: 60vh"> 81 <div v-loading="loadingProject" id="projectbox" style="height: 60vh;overflow: auto;">
82 <el-checkbox-group v-model="projectIds" @change="changeProject"> 82 <el-checkbox-group v-model="projectIds" @change="changeProject">
83 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id"> 83 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id">
84 <div class="flexBetween w100"> 84 <div class="flexBetween w100">
...@@ -617,7 +617,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -617,7 +617,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
617 617
618 .flexBetweenBox { 618 .flexBetweenBox {
619 width: 100%; 619 width: 100%;
620 height: auto; 620 height: auto;margin-right: 0;
621 border-bottom: 1px solid #eee; 621 border-bottom: 1px solid #eee;
622 padding: 0 10px; 622 padding: 0 10px;
623 } 623 }
...@@ -626,7 +626,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -626,7 +626,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
626 background: #FAFBFD; 626 background: #FAFBFD;
627 } 627 }
628 628
629 .flexBetween { 629 .flexBetween {white-space: normal;
630 padding: 10px; 630 padding: 10px;
631 border-left: 1px solid #eee; 631 border-left: 1px solid #eee;
632 632
......
src/viewsPc/match/chooseSportsman2.vue
...@@ -13,13 +13,17 @@ ...@@ -13,13 +13,17 @@
13 <h3 class="panel-title" v-if="language==0">选择参赛运动员清单</h3> 13 <h3 class="panel-title" v-if="language==0">选择参赛运动员清单</h3>
14 <h3 class="panel-title" v-else>Select list of participating athletes</h3> 14 <h3 class="panel-title" v-else>Select list of participating athletes</h3>
15 <!-- <a class="fr" @click="emptyChoosed">{{ language == 0 ? '清空' : 'Empty' }}</a>--> 15 <!-- <a class="fr" @click="emptyChoosed">{{ language == 0 ? '清空' : 'Empty' }}</a>-->
16 <el-button type="primary" style="color: #fff" class="fr" @click="chooseSportman">选手管理</el-button>
16 </div> 17 </div>
17 <div class="panel-body" style="padding: 10px"> 18 <div class="panel-body" style="padding: 10px">
18 <div style="margin: 0 4px 10px"> 19 <div style="margin: 0 4px 10px">
19 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable 20 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
20 @change="getProjectList"> 21 @change="getProjectList">
21 <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id" ></el-option> 22 <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id" >
23 {{c.realName}}({{c.sexStr}})-{{c.age}}
24 </el-option>
22 </el-select> 25 </el-select>
26 <el-button type="primary" @change="emptychoosedchoosed">重选</el-button>
23 </div> 27 </div>
24 <div class="noPicChooseForm" id="chooseArr"> 28 <div class="noPicChooseForm" id="chooseArr">
25 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed"> 29 <el-checkbox-group v-model="choosedchoosed" @change="changechoosed">
...@@ -303,7 +307,9 @@ function goPrev() { ...@@ -303,7 +307,9 @@ function goPrev() {
303 } 307 }
304 }) 308 })
305 } 309 }
306 310 function emptychoosedchoosed() {
311 choosedchoosed.value = []
312 }
307 function chooseSportman() { 313 function chooseSportman() {
308 const params = { 314 const params = {
309 title: language.value == 0 ? '选择运动员' : 'Participating athletes', 315 title: language.value == 0 ? '选择运动员' : 'Participating athletes',
......
src/viewsPc/match/components/addAccompany.vue
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
4 :close-on-click-modal="false" class="pcloginpop" 4 :close-on-click-modal="false" class="pcloginpop"
5 destroy-on-close 5 destroy-on-close
6 > 6 >
7 <!-- 舞伴--> 7 <!-- 随性人员-->
8 <div class="pd10"></div>
8 <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="160px" inline> 9 <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="160px" inline>
9 <el-row :gutter="30"> 10 <el-row :gutter="30">
10 <el-col :lg="24"> 11 <el-col :lg="24">
...@@ -28,7 +29,9 @@ ...@@ -28,7 +29,9 @@
28 <el-form-item :label="language==0?'护照号':'PassPort Number'" prop="idcCode" required> 29 <el-form-item :label="language==0?'护照号':'PassPort Number'" prop="idcCode" required>
29 <el-input v-model="form.idcCode"/> 30 <el-input v-model="form.idcCode"/>
30 </el-form-item> 31 </el-form-item>
31 32 <el-form-item :label="language==0?'护照文件':'Passport File'" required>
33 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
34 </el-form-item>
32 <el-form-item :label="language==0?'出生日期':'birth'" prop="birth" required> 35 <el-form-item :label="language==0?'出生日期':'birth'" prop="birth" required>
33 <el-date-picker 36 <el-date-picker
34 v-model="form.birth" 37 v-model="form.birth"
...@@ -165,6 +168,15 @@ watch(show, (value) => { ...@@ -165,6 +168,15 @@ watch(show, (value) => {
165 }) 168 })
166 169
167 function submitForm() { 170 function submitForm() {
171 if (!form.value.passportUrl) {
172 ElMessage.error('Please upload your passport file')
173 return
174 }
175 if(Array.isArray(form.value.passportUrl)){
176 form.value.passportUrl = form.value.passportUrl[0].url
177 } else {
178 form.value.passportUrl = form.value.passportUrl
179 }
168 proxy.$refs['dialogRef'].validate((valid) => { 180 proxy.$refs['dialogRef'].validate((valid) => {
169 if (valid) { 181 if (valid) {
170 form.value.label = form.value.labelArr.toString() 182 form.value.label = form.value.labelArr.toString()
......
src/viewsPc/match/components/addWdsf.vue
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
4 :close-on-click-modal="false" class="pcloginpop" @close="cancel" 4 :close-on-click-modal="false" class="pcloginpop" @close="cancel"
5 destroy-on-close 5 destroy-on-close
6 > 6 >
7 <!-- 随行人员--> 7 <!-- wdsf 个人/舞伴-->
8 <div class="pd10"></div>
8 <el-form ref="dialogRef" :model="form" :label-width="language==0?120:180" inline> 9 <el-form ref="dialogRef" :model="form" :label-width="language==0?120:180" inline>
9 <el-form-item :label="language==0?'WDSF卡号':'WDSF ID'" v-if="form.id"> 10 <el-form-item :label="language==0?'WDSF卡号':'WDSF ID'" v-if="form.id">
10 {{ form.wdsfMin }} 11 {{ form.wdsfMin }}
...@@ -51,6 +52,12 @@ ...@@ -51,6 +52,12 @@
51 {{ language == 0 ? '补充信息' : 'Supplementary Information' }} 52 {{ language == 0 ? '补充信息' : 'Supplementary Information' }}
52 </div> 53 </div>
53 <div class="h20"></div> 54 <div class="h20"></div>
55 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
56 <ImageUpload2
57 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
58 :is-show-tip="false"
59 />
60 </el-form-item>
54 <el-form-item :label="language==0?'性别':'Sex'" required> 61 <el-form-item :label="language==0?'性别':'Sex'" required>
55 <el-radio-group v-model="form.sex"> 62 <el-radio-group v-model="form.sex">
56 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio> 63 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
...@@ -68,7 +75,7 @@ ...@@ -68,7 +75,7 @@
68 <el-form-item label="Passport number" required> 75 <el-form-item label="Passport number" required>
69 <el-input v-model="form.passportNumber"/> 76 <el-input v-model="form.passportNumber"/>
70 </el-form-item> 77 </el-form-item>
71 <el-form-item label="Passport File"> 78 <el-form-item label="Passport File" required>
72 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/> 79 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
73 </el-form-item> 80 </el-form-item>
74 </el-form> 81 </el-form>
...@@ -178,8 +185,21 @@ watch(show, (value) => { ...@@ -178,8 +185,21 @@ watch(show, (value) => {
178 }) 185 })
179 186
180 function submitForm() { 187 function submitForm() {
188 if (!form.value.passportNumber) {
189 ElMessage.error('Please fill in your passport number')
190 return
191 }
192 if (!form.value.picUrl) {
193 ElMessage.error('Please upload your photo')
194 return
195 }
196 if (!form.value.passportUrl) {
197 ElMessage.error('Please upload your passport file')
198 return
199 }
181 if (editgay) { 200 if (editgay) {
182 // id不是0 201 // id不是0
202
183 form.value.cptId = cptId.value 203 form.value.cptId = cptId.value
184 if(Array.isArray(form.value.passportUrl)){ 204 if(Array.isArray(form.value.passportUrl)){
185 form.value.passportUrl = form.value.passportUrl[0].url 205 form.value.passportUrl = form.value.passportUrl[0].url
...@@ -192,10 +212,6 @@ function submitForm() { ...@@ -192,10 +212,6 @@ function submitForm() {
192 emit('submitForm') 212 emit('submitForm')
193 }) 213 })
194 } else { 214 } else {
195 if (!form.value.passportNumber) {
196 ElMessage.error('Please fill in your passport number')
197 return
198 }
199 if (!form.value.birth) { 215 if (!form.value.birth) {
200 ElMessage.error('Please fill in your birthday') 216 ElMessage.error('Please fill in your birthday')
201 return 217 return
......
src/viewsPc/match/components/allSportsmanList.vue
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
38 <el-table ref="allSportmenTable" v-loading="loading" :data="tableData" height="60vh" 38 <el-table ref="allSportmenTable" v-loading="loading" :data="tableData" height="60vh"
39 @selection-change="handleSelectionChange"> 39 @selection-change="handleSelectionChange">
40 <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/> 40 <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>
41 <!-- <el-table-column type="index" :label="language==0?'序号':'Index'" :selectable="selectable"/>-->
41 <el-table-column :label="language==0?'姓氏':'Last Name'" prop="xing" min-width="100"/> 42 <el-table-column :label="language==0?'姓氏':'Last Name'" prop="xing" min-width="100"/>
42 <el-table-column :label="language==0?'名':'First Name'" prop="ming" min-width="100"/> 43 <el-table-column :label="language==0?'名':'First Name'" prop="ming" min-width="100"/>
43 <el-table-column :label="language==0?'所属国家':'Nationality'" prop="countryName" min-width="100"/> 44 <el-table-column :label="language==0?'所属国家':'Nationality'" prop="countryName" min-width="100"/>
......
src/viewsPc/match/components/extraForm.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 :is-show-tip="false" 33 :is-show-tip="false"
34 /> 34 />
35 <!-- 文件 2--> 35 <!-- 文件 2-->
36 <FileUpload v-if="s.type == '2'" v-model="s.fixWxFile" :action="uploadUrl" /> 36 <FileUpload :button-text="language=='0'?'上传附件':'upload'" :is-show-tip="false" v-if="s.type == '2'" v-model="s.fixWxFile" :action="uploadUrl" />
37 </el-form-item> 37 </el-form-item>
38 </el-form> 38 </el-form>
39 </el-col> 39 </el-col>
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 41
42 <template #footer> 42 <template #footer>
43 <div class="dialog-footer text-center"> 43 <div class="dialog-footer text-center">
44 <el-button type="primary" @click="submitForm">保 存</el-button> 44 <el-button type="primary" @click="submitForm">{{ language=='0'?'保 存':'Save' }}</el-button>
45 <el-button @click="cancel">取 消</el-button> 45 <el-button @click="cancel">{{ language=='0'?'取 消':'Cancel' }}</el-button>
46 </div> 46 </div>
47 </template> 47 </template>
48 </el-dialog> 48 </el-dialog>
...@@ -138,7 +138,7 @@ function getCountryList() { ...@@ -138,7 +138,7 @@ function getCountryList() {
138 function submitForm() { 138 function submitForm() {
139 let fileInfo = {} 139 let fileInfo = {}
140 for (const n of participantsInfoArr.value) { 140 for (const n of participantsInfoArr.value) {
141 if (n.status == 0 && (!n.value && (!n.fixWxFile||!n.fixWxFile.length==0))) { 141 if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {
142 ElMessage.error(`请完善${n.name}信息`) 142 ElMessage.error(`请完善${n.name}信息`)
143 return 143 return
144 } 144 }
......
src/viewsPc/match/components/substation-list.vue
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 <div class="matchItem" v-for="n in list" :key="n.id" @click="goDetail(n.id)"> 3 <div class="matchItem" v-for="n in list" :key="n.id" @click="goDetail(n.id)">
4 <el-row :gutter="15"> 4 <el-row :gutter="15">
5 <el-col :lg="7" :md="24" :xl="6"> 5 <el-col :lg="7" :md="24" :xl="6">
6 <img class="mauto w100 coverLimitHeight" :src="fillImgUrl(n.coverUrl)"> 6 <img class="mauto mw100 coverLimitHeight" :src="fillImgUrl(n.coverUrl)">
7 </el-col> 7 </el-col>
8 <el-col :lg="9" :md="12" :xl="12"> 8 <el-col :lg="9" :md="12" :xl="12">
9 <div class="info"> 9 <div class="info">
10 <h3>{{ n.name }}</h3> 10 <h3>{{ n.name }}</h3>
11 <p class="ppl"><label>{{ language==0?'比赛时间':'Playing Time' }}：</label>{{n.beginTime?.slice(0,10)}} ~ {{ n.endTime?.slice(0,10) }}</p> 11 <p class="ppl"><label>{{ language==0?'比赛时间':'Playing Time' }}：</label>{{n.beginTime?.slice(0,10)}} ~ {{ n.endTime?.slice(0,10) }}</p>
12 <p class="ppl"><label>{{ language==0?'地&ensp;&ensp;&ensp;&ensp;点':'Location' }}：</label>{{ n.address }}</p> 12 <!-- <p class="ppl"><label>{{ language==0?'地&ensp;&ensp;&ensp;&ensp;点':'Location' }}：</label>{{ n.address }}</p>-->
13 <p class="ppl"><label>{{ language==0?'报名截止':'Registration Deadline' }}：</label>{{ n.signEndTime?.slice(0,10) }}</p> 13 <p class="ppl"><label>{{ language==0?'报名截止':'Registration Deadline' }}：</label>{{ n.signEndTime?.slice(0,10) }}</p>
14 14
15 <p class="ppl" v-if="n.contactPerson"><label>{{ language==0?'联系人员':'Contact Person' }}：</label>{{ n.contactPerson }}</p> 15 <p class="ppl" v-if="n.contactPerson"><label>{{ language==0?'联系人员':'Contact Person' }}：</label>{{ n.contactPerson }}</p>
...@@ -160,7 +160,7 @@ function goDetail(id) { ...@@ -160,7 +160,7 @@ function goDetail(id) {
160 160
161 .colon { 161 .colon {
162 display: inline-block; 162 display: inline-block;
163 font-size: 16px; 163 font-size: 14px;
164 margin: 0 8px; 164 margin: 0 8px;
165 color: #7B7F83; 165 color: #7B7F83;
166 } 166 }
...@@ -180,5 +180,5 @@ function goDetail(id) { ...@@ -180,5 +180,5 @@ function goDetail(id) {
180 @media (max-width: 1450px) { 180 @media (max-width: 1450px) {
181 .block{width: 44px;font-size: 20px;} 181 .block{width: 44px;font-size: 20px;}
182 } 182 }
183 .coverLimitHeight{max-height: 165px;object-fit: cover;} 183 .coverLimitHeight{max-height: 160px;object-fit: cover;}
184 </style> 184 </style>
......
src/viewsPc/match/detail.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <el-col :lg="7" :md="matchData.type=='0'?24:12" :xl="matchData.type=='0'?6:6"> 16 <el-col :lg="7" :md="matchData.type=='0'?24:12" :xl="matchData.type=='0'?6:6">
17 <img class="mauto w100" :src="fillImgUrl(matchData.coverUrl)"> 17 <img class="mauto w100" :src="fillImgUrl(matchData.coverUrl)">
18 </el-col> 18 </el-col>
19 <el-col :lg="matchData.type=='0'?9:17" :md="matchData.type=='0'?12:12" :xl="matchData.type=='0'?10:10"> 19 <el-col style="position: relative" :lg="matchData.type=='0'?9:17" :md="matchData.type=='0'?12:12" :xl="matchData.type=='0'?10:10">
20 <h3 class="mtitle"> 20 <h3 class="mtitle">
21 {{ matchData.name }} 21 {{ matchData.name }}
22 </h3> 22 </h3>
...@@ -25,7 +25,20 @@ ...@@ -25,7 +25,20 @@
25 <p class="ppl"><label class="bm2">赛事级别：</label>{{ matchData.level }}</p> 25 <p class="ppl"><label class="bm2">赛事级别：</label>{{ matchData.level }}</p>
26 <p class="ppl" v-if="matchData.address"><label class="bm3">地&ensp;&ensp;&ensp;&ensp;点：</label>{{ matchData.address }}</p> 26 <p class="ppl" v-if="matchData.address"><label class="bm3">地&ensp;&ensp;&ensp;&ensp;点：</label>{{ matchData.address }}</p>
27 <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">报名截止：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p> 27 <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">报名截止：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p>
28 <div> 28 <p class="ppl" v-if="matchData.type=='1'">
29 <label>
30 <svg style="position: relative;top: 2px;" t="1711707785514" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6578" width="18" height="18">
31 <path d="M780 68H256c-71.6 0-130.2 55.5-130.2 123.2v711.2c1.5 42.8 50 69.3 90.6 50.6l227.2-105c38.5-17.8 83.4-18.5 122.6-1.9l255.4 108.6c34.8 14.8 76.1-2.7 86.3-37.6 1.6-5.4 2.4-11 2.4-16.9v-709C910.2 123.5 851.6 68 780 68zM276.9 231.3h255.9c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41z m386.8 464H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z m0-191H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z" p-id="6579" fill="#d3d8d9"></path></svg>
32 分站赛：</label>{{matchData.cpts.length}}
33 </p>
34
35 <p class="ppl" v-if="matchData.type=='1'">
36 <label>
37 <svg style="position: relative;top: 2px;" t="1711708779620" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7920" width="20" height="20"><path d="M398.652952 165.692952c-32.280381-46.006857-58.172952-61.318095-92.867047-54.808381-14.969905 2.80381-24.210286 7.850667-41.20381 22.528l-12.946285 11.361524-25.185524 20.894476-6.582857 5.753905c-3.705905 3.413333-6.38781 6.217143-9.825524 10.118095-64 72.46019-81.724952 185.782857-44.470857 292.327619 26.794667 76.55619 74.605714 152.624762 142.774857 228.644572 72.289524 80.62781 133.046857 131.364571 202.922666 168.374857 54.857143 29.013333 96.865524 41.74019 145.676191 43.227429 59.001905 1.828571 110.957714-11.50781 153.648762-39.15581a162.133333 162.133333 0 0 0 19.553524-15.189333l8.289523-7.558095 16.335239-15.213715 5.534476-4.924952 10.922666-9.435429c22.040381-19.651048 29.184-31.939048 30.646858-51.370666 2.194286-29.647238-11.215238-52.736-49.737143-85.699048l-26.063238-21.820952-12.117334-10.581334-11.459047-9.825524c-37.229714-30.744381-64.804571-40.69181-100.205715-35.35238-24.283429 3.632762-38.278095 12.141714-63.073523 38.107428l-10.947048 11.654095c-18.041905 19.017143-28.330667 26.258286-43.544381 29.305905-22.25981 4.461714-44.373333-7.046095-80.262095-36.205714-46.250667-37.546667-84.626286-80.676571-117.613715-131.949714-22.869333-35.766857-31.890286-62.902857-24.941714-87.600762 2.82819-9.99619 9.679238-17.042286 24.064-28.184381l14.994286-11.312762 2.413714-1.877334 22.747429-18.553904c20.114286-16.822857 28.281905-28.281905 32.572952-45.836191 8.899048-36.10819 0.487619-66.072381-32.426667-117.638095l-15.62819-24.234667-5.558857-8.533333-6.436572-9.435429z" p-id="7921" fill="#d3d8d9"></path></svg>
38 联系电话：</label>{{matchData.contactTelno}}
39 </p>
40 <div style="height: 30px"></div>
41 <div class="ppl_pb">
29 <el-link class="mr20" v-if="matchData.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank"> 42 <el-link class="mr20" v-if="matchData.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
30 <el-icon :size="20"> 43 <el-icon :size="20">
31 <Download /> 44 <Download />
...@@ -63,7 +76,7 @@ ...@@ -63,7 +76,7 @@
63 </template> 76 </template>
64 </van-count-down> 77 </van-count-down>
65 78
66 <div> 79 <div class="mt30">
67 <a class="btn-lineG mb20" v-if="matchData.progressStatusCode=='2'" @click="choseSignType" style="display: block;text-align: center;">我要报名</a> 80 <a class="btn-lineG mb20" v-if="matchData.progressStatusCode=='2'" @click="choseSignType" style="display: block;text-align: center;">我要报名</a>
68 <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名已结束</div> 81 <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名已结束</div>
69 </div> 82 </div>
...@@ -421,7 +434,7 @@ function checkIsSign() { ...@@ -421,7 +434,7 @@ function checkIsSign() {
421 434
422 435
423 .ppl { 436 .ppl {
424 color: #29343C; 437 color: #29343C;margin: 10px 0 0;
425 438
426 label { 439 label {
427 color: #929AA0; 440 color: #929AA0;
...@@ -938,7 +951,12 @@ function checkIsSign() { ...@@ -938,7 +951,12 @@ function checkIsSign() {
938 .table { 951 .table {
939 white-space: nowrap 952 white-space: nowrap
940 } 953 }
941 954 .ppl_pb{position: absolute;bottom:0;}
955 @media (max-width: 1650px){
956 .ppl {
957 color: #29343C;margin: 5px 0 0;
958 }
959 }
942 @media (max-width: 800px) { 960 @media (max-width: 800px) {
943 .van-count-down { 961 .van-count-down {
944 .block { 962 .block {
......
src/viewsPc/match/detail_en.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <el-col :lg="7" :md="12" :xl="6"> 16 <el-col :lg="7" :md="12" :xl="6">
17 <img class="mauto w100" :src="fillImgUrl(matchData.coverUrl)"> 17 <img class="mauto w100" :src="fillImgUrl(matchData.coverUrl)">
18 </el-col> 18 </el-col>
19 <el-col :lg="9" :md="12" :xl="10"> 19 <el-col :lg="9" :md="12" :xl="10" style="position: relative">
20 <h3 class="m0"> 20 <h3 class="m0">
21 {{ matchData.name }} 21 {{ matchData.name }}
22 </h3> 22 </h3>
...@@ -26,7 +26,21 @@ ...@@ -26,7 +26,21 @@
26 <p class="ppl" v-if="matchData.address"><label class="bm3">Location：</label>{{ matchData.address }}</p> 26 <p class="ppl" v-if="matchData.address"><label class="bm3">Location：</label>{{ matchData.address }}</p>
27 <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">Registration 27 <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">Registration
28 Deadline：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p> 28 Deadline：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p>
29 <div> 29
30 <p class="ppl" v-if="matchData.type=='1'">
31 <label>
32 <svg style="position: relative;top: 2px;" t="1711707785514" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6578"
33 width="18" height="18">
34 <path d="M780 68H256c-71.6 0-130.2 55.5-130.2 123.2v711.2c1.5 42.8 50 69.3 90.6 50.6l227.2-105c38.5-17.8 83.4-18.5 122.6-1.9l255.4 108.6c34.8 14.8 76.1-2.7 86.3-37.6 1.6-5.4 2.4-11 2.4-16.9v-709C910.2 123.5 851.6 68 780 68zM276.9 231.3h255.9c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41z m386.8 464H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z m0-191H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z" p-id="6579" fill="#d3d8d9"></path></svg>
35 Station race：</label>{{matchData.cpts.length}}
36 </p>
37 <p class="ppl" v-if="matchData.type=='1'">
38 <label>
39 <svg style="position: relative;top: 2px;" t="1711708779620" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7920" width="20" height="20"><path d="M398.652952 165.692952c-32.280381-46.006857-58.172952-61.318095-92.867047-54.808381-14.969905 2.80381-24.210286 7.850667-41.20381 22.528l-12.946285 11.361524-25.185524 20.894476-6.582857 5.753905c-3.705905 3.413333-6.38781 6.217143-9.825524 10.118095-64 72.46019-81.724952 185.782857-44.470857 292.327619 26.794667 76.55619 74.605714 152.624762 142.774857 228.644572 72.289524 80.62781 133.046857 131.364571 202.922666 168.374857 54.857143 29.013333 96.865524 41.74019 145.676191 43.227429 59.001905 1.828571 110.957714-11.50781 153.648762-39.15581a162.133333 162.133333 0 0 0 19.553524-15.189333l8.289523-7.558095 16.335239-15.213715 5.534476-4.924952 10.922666-9.435429c22.040381-19.651048 29.184-31.939048 30.646858-51.370666 2.194286-29.647238-11.215238-52.736-49.737143-85.699048l-26.063238-21.820952-12.117334-10.581334-11.459047-9.825524c-37.229714-30.744381-64.804571-40.69181-100.205715-35.35238-24.283429 3.632762-38.278095 12.141714-63.073523 38.107428l-10.947048 11.654095c-18.041905 19.017143-28.330667 26.258286-43.544381 29.305905-22.25981 4.461714-44.373333-7.046095-80.262095-36.205714-46.250667-37.546667-84.626286-80.676571-117.613715-131.949714-22.869333-35.766857-31.890286-62.902857-24.941714-87.600762 2.82819-9.99619 9.679238-17.042286 24.064-28.184381l14.994286-11.312762 2.413714-1.877334 22.747429-18.553904c20.114286-16.822857 28.281905-28.281905 32.572952-45.836191 8.899048-36.10819 0.487619-66.072381-32.426667-117.638095l-15.62819-24.234667-5.558857-8.533333-6.436572-9.435429z" p-id="7921" fill="#d3d8d9"></path></svg>
40 Phone：</label>{{matchData.contactTelno}}
41 </p>
42 <div style="height: 30px"></div>
43 <div class="ppl_pb">
30 <el-link class="mr20" v-if="matchData.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank"> 44 <el-link class="mr20" v-if="matchData.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
31 <el-icon :size="20"> 45 <el-icon :size="20">
32 <Download /> 46 <Download />
...@@ -66,7 +80,7 @@ ...@@ -66,7 +80,7 @@
66 </van-count-down> 80 </van-count-down>
67 81
68 <div class="flexCenter"> 82 <div class="flexCenter">
69 <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" type="primary" round size="large" class="btn-lineG mb20 mt30 w100" 83 <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" type="primary" round class="btn-lineG mb20 mt20 w100"
70 @click="choseSignType" style="font-size: 16px">Register 84 @click="choseSignType" style="font-size: 16px">Register
71 </el-button> 85 </el-button>
72 <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">Registration has ended</div> 86 <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">Registration has ended</div>
...@@ -485,13 +499,13 @@ function checkIsSign() { ...@@ -485,13 +499,13 @@ function checkIsSign() {
485 } 499 }
486 500
487 .ppl { 501 .ppl {
488 color: #29343C; 502 color: #29343C;margin: 10px 0 0;
489 503
490 label { 504 label {
491 color: #929AA0; 505 color: #929AA0;
492 } 506 }
493 } 507 }
494 508 .ppl_pb{position: absolute;bottom:0;}
495 .bm1 { 509 .bm1 {
496 background: url("@/assets/dance/bm1.png") no-repeat left; 510 background: url("@/assets/dance/bm1.png") no-repeat left;
497 background-size: contain; 511 background-size: contain;
...@@ -742,7 +756,7 @@ function checkIsSign() { ...@@ -742,7 +756,7 @@ function checkIsSign() {
742 756
743 .colon { 757 .colon {
744 display: inline-block; 758 display: inline-block;
745 font-size: 16px; 759 font-size: 14px;
746 margin: 0 6px; 760 margin: 0 6px;
747 color: #7B7F83; 761 color: #7B7F83;
748 } 762 }
...@@ -1005,6 +1019,12 @@ function checkIsSign() { ...@@ -1005,6 +1019,12 @@ function checkIsSign() {
1005 white-space: nowrap 1019 white-space: nowrap
1006 } 1020 }
1007 1021
1022 @media (max-width: 1650px){
1023 .ppl {
1024 color: #29343C;margin: 5px 0 0;
1025 }
1026 }
1027
1008 @media (max-width: 800px) { 1028 @media (max-width: 800px) {
1009 .van-count-down { 1029 .van-count-down {
1010 .block { 1030 .block {
......
src/viewsPc/match/index.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
10 <label>{{ language==0?'类型':'Type' }}：</label> 10 <label>{{ language==0?'类型':'Type' }}：</label>
11 <el-radio-group v-model="query.type" @change="getList"> 11 <el-radio-group v-model="query.type" @change="getList">
12 <el-radio-button value="-1">{{ language==0?'全部':'All' }}</el-radio-button> 12 <el-radio-button value="-1">{{ language==0?'全部':'All' }}</el-radio-button>
13 <el-radio-button value="0">{{ language==0?'联赛':'League' }}</el-radio-button> 13 <el-radio-button value="0">{{ language==0?'独立赛':'Station race' }}</el-radio-button>
14 <el-radio-button value="1">{{ language==0?'独立赛':'Station race' }}</el-radio-button> 14 <el-radio-button value="1">{{ language==0?'联赛':'League' }}</el-radio-button>
15 </el-radio-group> 15 </el-radio-group>
16 </li> 16 </li>
17 <li> 17 <li>
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
21 @change="getList" 21 @change="getList"
22 > 22 >
23 <el-radio-button value="-1">{{ language==0?'全部':'All' }}</el-radio-button> 23 <el-radio-button value="-1">{{ language==0?'全部':'All' }}</el-radio-button>
24 <el-radio-button value="2">{{ language==0?'报名中':'Registration in progress' }}</el-radio-button> 24 <el-radio-button value="2">{{ language==0?'报名中':'Registering now' }}</el-radio-button>
25 <el-radio-button value="3">{{ language==0?'赛事即将开始':'Begin in a minute' }}</el-radio-button>
25 <el-radio-button value="4">{{ language==0?'赛事进行中':'In progress' }}</el-radio-button> 26 <el-radio-button value="4">{{ language==0?'赛事进行中':'In progress' }}</el-radio-button>
26 <el-radio-button value="3">{{ language==0?'即将开始':'Begin in a minute' }}</el-radio-button>
27 <el-radio-button value="5">{{ language==0?'已结束':'Ended' }}</el-radio-button> 27 <el-radio-button value="5">{{ language==0?'已结束':'Ended' }}</el-radio-button>
28 </el-radio-group> 28 </el-radio-group>
29 </li> 29 </li>
...@@ -59,13 +59,14 @@ ...@@ -59,13 +59,14 @@
59 <div class="matchItem" v-for="n in list" :key="n.id" @click="goDetail(n.id)"> 59 <div class="matchItem" v-for="n in list" :key="n.id" @click="goDetail(n.id)">
60 <el-row :gutter="15"> 60 <el-row :gutter="15">
61 <el-col :lg="7" :md="24" :xl="6"> 61 <el-col :lg="7" :md="24" :xl="6">
62 <img class="mauto w100 coverLimitHeight" :src="fillImgUrl(n.coverUrl)"> 62 <img class="mauto mw100 coverLimitHeight" :src="fillImgUrl(n.coverUrl)">
63 </el-col> 63 </el-col>
64 <el-col :lg="9" :md="12" :xl="12"> 64 <el-col :lg="9" :md="12" :xl="12">
65 <div class="info"> 65 <div class="info">
66 <h3>{{ n.name }}</h3> 66 <h3>{{ n.name }}</h3>
67 <p class="ppl"><label>{{language==0?'赛事级别':'Level'}}：</label>{{n.level}}</p>
67 <p class="ppl"><label>{{ language==0?'比赛时间':'Playing Time' }}：</label>{{n.beginTime?.slice(0,10)}} ~ {{ n.endTime?.slice(0,10) }}</p> 68 <p class="ppl"><label>{{ language==0?'比赛时间':'Playing Time' }}：</label>{{n.beginTime?.slice(0,10)}} ~ {{ n.endTime?.slice(0,10) }}</p>
68 <p class="ppl" v-if="n.address"><label>{{ language==0?'地&ensp;&ensp;&ensp;&ensp;点':'Location' }}：</label>{{ n.address }}</p> 69 <!-- <p class="ppl" v-if="n.address"><label>{{ language==0?'地&ensp;&ensp;&ensp;&ensp;点':'Location' }}：</label>{{ n.address }}</p>-->
69 <p class="ppl"><label>{{ language==0?'报名截止':'Registration Deadline' }}：</label>{{ n.signEndTime?.slice(0,10) }}</p> 70 <p class="ppl"><label>{{ language==0?'报名截止':'Registration Deadline' }}：</label>{{ n.signEndTime?.slice(0,10) }}</p>
70 71
71 <p class="ppl" v-if="n.contactPerson"><label>{{ language==0?'联系人员':'Contact Person' }}：</label>{{ n.contactPerson }}</p> 72 <p class="ppl" v-if="n.contactPerson"><label>{{ language==0?'联系人员':'Contact Person' }}：</label>{{ n.contactPerson }}</p>
...@@ -269,7 +270,8 @@ function goDetail(id) { ...@@ -269,7 +270,8 @@ function goDetail(id) {
269 width: 100%; 270 width: 100%;
270 left: 0; 271 left: 0;
271 } 272 }
272 .info .ppl{margin: 5px 0;} 273 .info h3{margin: 0 0 15px}
274 .info .ppl{margin: 14px 0;}
273 .ppl{color: #29343C; 275 .ppl{color: #29343C;
274 label{color: #929AA0;} 276 label{color: #929AA0;}
275 } 277 }
...@@ -280,7 +282,7 @@ function goDetail(id) { ...@@ -280,7 +282,7 @@ function goDetail(id) {
280 282
281 .colon { 283 .colon {
282 display: inline-block; 284 display: inline-block;
283 font-size: 16px; 285 font-size: 14px;
284 margin: 0 8px; 286 margin: 0 8px;
285 color: #7B7F83; 287 color: #7B7F83;
286 } 288 }
...@@ -340,5 +342,6 @@ function goDetail(id) { ...@@ -340,5 +342,6 @@ function goDetail(id) {
340 .el-button--primary:hover { 342 .el-button--primary:hover {
341 background: var(--el-color-primary) 343 background: var(--el-color-primary)
342 } 344 }
343 .coverLimitHeight{max-height: 165px;object-fit: cover;} 345 .coverLimitHeight{max-height: 160px;object-fit: cover;}
346 .mw100{max-width: 100%;}
344 </style> 347 </style>
......
src/viewsPc/match/pay.vue
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
15 </div> 15 </div>
16 <div> 16 <div>
17 <el-table class="mt20" :data="myMemberTable" border> 17 <el-table class="mt20" :data="myMemberTable" border>
18 <el-table-column type="index" :label="language==0?'Index':'序号'" width="70" align="center"/> 18 <el-table-column type="index" :label="language=='0'?'序号':'Index'" width="70" align="center"/>
19 <el-table-column :label="language==0?'姓氏':'surname'" prop="xing" min-width="100"/> 19 <el-table-column :label="language=='1'?'surname':'姓氏'" prop="xing" min-width="100"/>
20 <el-table-column :label="language==0?'名':'name'" prop="ming" min-width="100"/> 20 <el-table-column :label="language=='0'?'名':'name'" prop="ming" min-width="100"/>
21 <el-table-column :label="language==0?'Passport number':'护照号'" prop="idcCode" min-width="120"/> 21 <el-table-column :label="language=='1'?'Passport number':'护照号'" prop="idcCode" min-width="120"/>
22 <el-table-column :label="language==0?'Birthday':'生日'" prop="birth"/> 22 <el-table-column :label="language=='1'?'Birthday':'生日'" prop="birth"/>
23 <el-table-column :label="language==0?'Sex':'性别'" prop="sexStr"/> 23 <el-table-column :label="language=='1'?'Sex':'性别'" prop="sexStr"/>
24 <el-table-column :label="language==0?'Role':'角色'" min-width="160"> 24 <el-table-column :label="language=='1'?'Role':'角色'" min-width="160">
25 <template #default="scope"> 25 <template #default="scope">
26 <div class="roletd"> 26 <div class="roletd">
27 <span v-for="item in scope.row.label?.split(',')" :key="item.id" class="text-primary"> 27 <span v-for="item in scope.row.label?.split(',')" :key="item.id" class="text-primary">
...@@ -119,10 +119,11 @@ ...@@ -119,10 +119,11 @@
119 <div class="leftboderTT">{{ language==0?'选择支付方式':'Choose payment method' }}</div> 119 <div class="leftboderTT">{{ language==0?'选择支付方式':'Choose payment method' }}</div>
120 <div class="mt20"> 120 <div class="mt20">
121 <el-radio-group v-model="payType" @change="changePaytype"> 121 <el-radio-group v-model="payType" @change="changePaytype">
122 <!-- 0 线下 1 支付宝 2 微信 3 paypal-->
122 <!-- <el-radio label="1" border>--> 123 <!-- <el-radio label="1" border>-->
123 <!-- <svg t="1709003181386" class="icon" viewBox="0 0 3283 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31015" width="100" height="40"><path d="M1163.122759 94.631724H593.92A133.826207 133.826207 0 0 0 459.034483 228.457931v567.084138a133.473103 133.473103 0 0 0 133.826207 133.826207h570.262069a133.826207 133.826207 0 0 0 134.17931-133.826207v-5.296552s-217.864828-90.394483-328.033103-143.36c-73.445517 90.747586-168.783448 145.478621-267.652414 145.478621-167.017931 0-223.514483-145.831724-144.419311-241.875862a169.136552 169.136552 0 0 1 92.16-51.906207c70.62069-17.302069 184.32 10.946207 290.604138 45.903448A587.211034 587.211034 0 0 0 988.689655 429.373793h-328.73931v-32.838621h168.783448V337.213793h-204.446896v-33.191724h204.446896V219.630345a14.124138 14.124138 0 0 1 14.477241-14.477242h82.273104v98.868966h202.328276v33.191724h-202.328276v59.321379h165.252414a677.605517 677.605517 0 0 1-70.62069 176.551725c50.14069 18.008276 94.984828 35.310345 128.529655 46.256551a930.427586 930.427586 0 0 0 147.950345 42.725518V228.457931a133.826207 133.826207 0 0 0-133.473103-133.826207z" fill="#089fe8" p-id="31016"></path><path d="M663.481379 548.016552a162.78069 162.78069 0 0 0-81.566896 30.366896c-64.617931 55.790345-26.129655 158.190345 104.165517 158.190345 75.917241 0 151.481379-48.375172 211.862069-125.704827-85.804138-40.96-156.424828-70.267586-234.46069-62.852414zM2488.673103 225.28h239.757242v47.668966h85.804138V216.805517a22.951724 22.951724 0 0 0-21.892414-23.304827h-139.122759V149.009655h-89.335172v44.137931h-160.662069v79.80138h85.451034zM1882.394483 360.518621h67.442758v247.172413h73.798621V280.011034h-26.835862l55.437241-126.764137H1970.317241l-87.922758 207.271724zM2824.827586 596.391724l-26.835862-90.747586a13.771034 13.771034 0 0 0-13.064827-10.24h-70.62069l20.48 70.62069H2648.275862v-135.944828h164.546207v-32.132414H2648.275862v-63.55862h164.546207v-32.132414h-409.6v32.132414h164.546207v63.55862h-164.546207v32.132414h164.546207V564.965517h-164.546207v32.132414H2824.827586zM2158.521379 323.442759a16.595862 16.595862 0 0 0-15.183448-9.886897h-63.558621l49.434483 156.424828h75.564138z" fill="#089fe8" p-id="31017"></path><path d="M2319.889655 156.777931h-76.623448v80.154483h-188.557241v32.132414h188.557241v287.426206a13.064828 13.064828 0 0 1-12.358621 12.005518h-38.841379v31.77931h99.222069a30.013793 30.013793 0 0 0 28.601379-29.66069V269.064828h31.073104v-32.132414h-31.073104zM1871.448276 577.677241a913.831724 913.831724 0 0 1-168.783448-80.507586 357.34069 357.34069 0 0 0 141.241379-194.56H1694.896552V249.997241h170.195862v-32.83862H1694.896552V150.422069h-75.211035a15.536552 15.536552 0 0 0-15.183448 15.536552v51.2h-169.136552v32.83862h169.136552v52.612414h-141.241379v32.838621h284.248276a278.951724 278.951724 0 0 1-93.572414 127.470345 360.871724 360.871724 0 0 1-93.572414-94.984828H1483.034483a423.724138 423.724138 0 0 0 122.173793 130.295173 662.775172 662.775172 0 0 1-172.667586 77.329655v39.194482A773.296552 773.296552 0 0 0 1653.230345 529.655172 781.771034 781.771034 0 0 0 1871.448276 614.753103zM1553.655172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.188966-79.095172 26.482758 79.095172zM1796.237241 674.78069h-34.251034v190.675862h115.464827v-26.129655h-81.213793v-164.546207zM2003.155862 674.78069h34.251035v190.322758h-34.251035zM2250.328276 674.78069h-74.151724v190.675862h35.310345v-73.445518h39.900689a58.615172 58.615172 0 1 0 0-117.230344z m-2.118621 91.100689H2210.427586v-64.971034h37.782069a31.073103 31.073103 0 0 1 30.366897 32.485517 30.72 30.72 0 0 1-30.366897 32.485517zM2465.015172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.542069-79.095172 27.188966 79.095172zM2716.071724 755.994483l-38.135172-81.213793H2641.213793l57.555862 112.286896v78.388966h33.897931v-78.388966l0.353104-0.353103 57.555862-111.933793h-37.075862l-37.428966 81.213793z" fill="#089fe8" p-id="31018"></path></svg>--> 124 <!-- <svg t="1709003181386" class="icon" viewBox="0 0 3283 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31015" width="100" height="40"><path d="M1163.122759 94.631724H593.92A133.826207 133.826207 0 0 0 459.034483 228.457931v567.084138a133.473103 133.473103 0 0 0 133.826207 133.826207h570.262069a133.826207 133.826207 0 0 0 134.17931-133.826207v-5.296552s-217.864828-90.394483-328.033103-143.36c-73.445517 90.747586-168.783448 145.478621-267.652414 145.478621-167.017931 0-223.514483-145.831724-144.419311-241.875862a169.136552 169.136552 0 0 1 92.16-51.906207c70.62069-17.302069 184.32 10.946207 290.604138 45.903448A587.211034 587.211034 0 0 0 988.689655 429.373793h-328.73931v-32.838621h168.783448V337.213793h-204.446896v-33.191724h204.446896V219.630345a14.124138 14.124138 0 0 1 14.477241-14.477242h82.273104v98.868966h202.328276v33.191724h-202.328276v59.321379h165.252414a677.605517 677.605517 0 0 1-70.62069 176.551725c50.14069 18.008276 94.984828 35.310345 128.529655 46.256551a930.427586 930.427586 0 0 0 147.950345 42.725518V228.457931a133.826207 133.826207 0 0 0-133.473103-133.826207z" fill="#089fe8" p-id="31016"></path><path d="M663.481379 548.016552a162.78069 162.78069 0 0 0-81.566896 30.366896c-64.617931 55.790345-26.129655 158.190345 104.165517 158.190345 75.917241 0 151.481379-48.375172 211.862069-125.704827-85.804138-40.96-156.424828-70.267586-234.46069-62.852414zM2488.673103 225.28h239.757242v47.668966h85.804138V216.805517a22.951724 22.951724 0 0 0-21.892414-23.304827h-139.122759V149.009655h-89.335172v44.137931h-160.662069v79.80138h85.451034zM1882.394483 360.518621h67.442758v247.172413h73.798621V280.011034h-26.835862l55.437241-126.764137H1970.317241l-87.922758 207.271724zM2824.827586 596.391724l-26.835862-90.747586a13.771034 13.771034 0 0 0-13.064827-10.24h-70.62069l20.48 70.62069H2648.275862v-135.944828h164.546207v-32.132414H2648.275862v-63.55862h164.546207v-32.132414h-409.6v32.132414h164.546207v63.55862h-164.546207v32.132414h164.546207V564.965517h-164.546207v32.132414H2824.827586zM2158.521379 323.442759a16.595862 16.595862 0 0 0-15.183448-9.886897h-63.558621l49.434483 156.424828h75.564138z" fill="#089fe8" p-id="31017"></path><path d="M2319.889655 156.777931h-76.623448v80.154483h-188.557241v32.132414h188.557241v287.426206a13.064828 13.064828 0 0 1-12.358621 12.005518h-38.841379v31.77931h99.222069a30.013793 30.013793 0 0 0 28.601379-29.66069V269.064828h31.073104v-32.132414h-31.073104zM1871.448276 577.677241a913.831724 913.831724 0 0 1-168.783448-80.507586 357.34069 357.34069 0 0 0 141.241379-194.56H1694.896552V249.997241h170.195862v-32.83862H1694.896552V150.422069h-75.211035a15.536552 15.536552 0 0 0-15.183448 15.536552v51.2h-169.136552v32.83862h169.136552v52.612414h-141.241379v32.838621h284.248276a278.951724 278.951724 0 0 1-93.572414 127.470345 360.871724 360.871724 0 0 1-93.572414-94.984828H1483.034483a423.724138 423.724138 0 0 0 122.173793 130.295173 662.775172 662.775172 0 0 1-172.667586 77.329655v39.194482A773.296552 773.296552 0 0 0 1653.230345 529.655172 781.771034 781.771034 0 0 0 1871.448276 614.753103zM1553.655172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.188966-79.095172 26.482758 79.095172zM1796.237241 674.78069h-34.251034v190.675862h115.464827v-26.129655h-81.213793v-164.546207zM2003.155862 674.78069h34.251035v190.322758h-34.251035zM2250.328276 674.78069h-74.151724v190.675862h35.310345v-73.445518h39.900689a58.615172 58.615172 0 1 0 0-117.230344z m-2.118621 91.100689H2210.427586v-64.971034h37.782069a31.073103 31.073103 0 0 1 30.366897 32.485517 30.72 30.72 0 0 1-30.366897 32.485517zM2465.015172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.542069-79.095172 27.188966 79.095172zM2716.071724 755.994483l-38.135172-81.213793H2641.213793l57.555862 112.286896v78.388966h33.897931v-78.388966l0.353104-0.353103 57.555862-111.933793h-37.075862l-37.428966 81.213793z" fill="#089fe8" p-id="31018"></path></svg>-->
124 <!-- </el-radio>--> 125 <!-- </el-radio>-->
125 <el-radio label="2" v-if="form.payTypeArr.indexOf('1')>-1" border> 126 <el-radio label="2" v-if="form.payTypeArr.indexOf('0')>-1" border>
126 <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1" 127 <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
127 xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40"> 128 xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40">
128 <path 129 <path
......
src/viewsPc/match/teamSign.vue
...@@ -241,7 +241,7 @@ function submitForm() { ...@@ -241,7 +241,7 @@ function submitForm() {
241 if (valid) { 241 if (valid) {
242 console.log(form.value) 242 console.log(form.value)
243 for (const n of participantsInfoArr.value) { 243 for (const n of participantsInfoArr.value) {
244 if (n.status == 0 && (!n.value && (!n.fixWxFile||!n.fixWxFile.length==0))) { 244 if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {
245 ElMessage.error(language.value==0?`请完善${n.name}信息`:`Please complete ${n.name} information`) 245 ElMessage.error(language.value==0?`请完善${n.name}信息`:`Please complete ${n.name} information`)
246 return 246 return
247 } 247 }
......
src/viewsPc/register/personal.vue
...@@ -50,6 +50,13 @@ ...@@ -50,6 +50,13 @@
50 {{ language == 0 ? '补充信息' : 'Supplementary Information' }} 50 {{ language == 0 ? '补充信息' : 'Supplementary Information' }}
51 </div> 51 </div>
52 <div class="h20"></div> 52 <div class="h20"></div>
53 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
54 <ImageUpload2
55 v-model="wdsfData.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
56 :is-show-tip="false"
57 />
58 </el-form-item>
59
53 <el-form-item :label="language==0?'性别':'Sex'" required> 60 <el-form-item :label="language==0?'性别':'Sex'" required>
54 <el-radio-group v-model="wdsfData.sex"> 61 <el-radio-group v-model="wdsfData.sex">
55 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio> 62 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
...@@ -67,7 +74,7 @@ ...@@ -67,7 +74,7 @@
67 <el-form-item label="Passport number" required> 74 <el-form-item label="Passport number" required>
68 <el-input v-model="wdsfData.passportNumber"/> 75 <el-input v-model="wdsfData.passportNumber"/>
69 </el-form-item> 76 </el-form-item>
70 <el-form-item label="Passport File"> 77 <el-form-item label="Passport File" required>
71 <file-upload v-model="wdsfData.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/> 78 <file-upload v-model="wdsfData.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
72 </el-form-item> 79 </el-form-item>
73 80
...@@ -234,6 +241,9 @@ function codeSuccess(msg) { ...@@ -234,6 +241,9 @@ function codeSuccess(msg) {
234 if (isCodeTrue.value == 1) { 241 if (isCodeTrue.value == 1) {
235 checkWdsf({card: form.value.card}).then(res => { 242 checkWdsf({card: form.value.card}).then(res => {
236 wdsfData.value = res.data 243 wdsfData.value = res.data
244 if(wdsfData.value.passportUrl){
245
246 }
237 if (!wdsfData.value.sex) { 247 if (!wdsfData.value.sex) {
238 wdsfData.value.sex = '0' 248 wdsfData.value.sex = '0'
239 } 249 }
...@@ -253,6 +263,8 @@ function codeSuccess(msg) { ...@@ -253,6 +263,8 @@ function codeSuccess(msg) {
253 counting.value = true 263 counting.value = true
254 getCaptchaSms({account: wdsfData.value.email}).then(res => { 264 getCaptchaSms({account: wdsfData.value.email}).then(res => {
255 265
266 }).catch(err => {
267 isCodeTrue.value = 1
256 }) 268 })
257 } 269 }
258 270
...@@ -285,10 +297,15 @@ function next() { ...@@ -285,10 +297,15 @@ function next() {
285 ElMessage.error('Please fill in your birthday') 297 ElMessage.error('Please fill in your birthday')
286 return 298 return
287 } 299 }
300 if (!wdsfData.value.passportUrl) {
301 ElMessage.error('Please upload your passport file')
302 return
303 }
288 if (wdsfData.value.personFlag == '0') { 304 if (wdsfData.value.personFlag == '0') {
289 let obj = { 305 let obj = {
290 card: form.value.card, 306 card: form.value.card,
291 account: wdsfData.value.email, 307 account: wdsfData.value.email,
308 picUrl: wdsfData.value.picUrl,
292 code: form.value.code, 309 code: form.value.code,
293 password: form.value.password, 310 password: form.value.password,
294 sex: wdsfData.value.sex, 311 sex: wdsfData.value.sex,
...@@ -296,7 +313,7 @@ function next() { ...@@ -296,7 +313,7 @@ function next() {
296 passportNumber: wdsfData.value.passportNumber, 313 passportNumber: wdsfData.value.passportNumber,
297 } 314 }
298 if(Array.isArray(wdsfData.value.passportUrl)){ 315 if(Array.isArray(wdsfData.value.passportUrl)){
299 obj.passportUrl = form.value.passportUrl[0].url 316 obj.passportUrl = wdsfData.value.passportUrl[0].url
300 } else { 317 } else {
301 obj.passportUrl = wdsfData.value.passportUrl || '' 318 obj.passportUrl = wdsfData.value.passportUrl || ''
302 } 319 }
...@@ -321,7 +338,7 @@ function next() { ...@@ -321,7 +338,7 @@ function next() {
321 password: form.value.password, 338 password: form.value.password,
322 } 339 }
323 if(Array.isArray(wdsfData.value.passportUrl)){ 340 if(Array.isArray(wdsfData.value.passportUrl)){
324 obj.passportUrl = form.value.passportUrl[0].url 341 obj.passportUrl = wdsfData.value.passportUrl[0].url
325 } else { 342 } else {
326 obj.passportUrl = wdsfData.value.passportUrl 343 obj.passportUrl = wdsfData.value.passportUrl
327 } 344 }
...@@ -337,7 +354,7 @@ function next() { ...@@ -337,7 +354,7 @@ function next() {
337 function afterR() { 354 function afterR() {
338 if (matchId.value != '0') { 355 if (matchId.value != '0') {
339 router.push({ 356 router.push({
340 name: 'chooseProject', 357 name: 'matchDetail',
341 params: { 358 params: {
342 id: matchId.value 359 id: matchId.value
343 }, 360 },
...@@ -349,7 +366,7 @@ function afterR() { ...@@ -349,7 +366,7 @@ function afterR() {
349 }) 366 })
350 } else { 367 } else {
351 router.push({ 368 router.push({
352 name: 'matchDetail', 369 name: 'matchList',
353 params: { 370 params: {
354 id: 0 371 id: 0
355 } 372 }
......
src/viewsPc/saiC/index.vue
...@@ -53,12 +53,12 @@ ...@@ -53,12 +53,12 @@
53 <table class="table table-striped"> 53 <table class="table table-striped">
54 <thead> 54 <thead>
55 <tr class="bg-lineg"> 55 <tr class="bg-lineg">
56 <td>{{ language==0?'编号':'RANK' }}</td> 56 <td>{{ language==0?'名次':'RANK' }}</td>
57 <td>{{ language==0?'团体名称':'COUPLE' }}</td> 57 <td>{{ language==0?'组合':'COUPLE' }}</td>
58 <td>{{ language==0?'国家':'COUNTRY' }}</td> 58 <td width="100">{{ language==0?'国家':'COUNTRY' }}</td>
59 <td class="text-center">START #</td> 59 <td width="120" class="text-center">START #</td>
60 <td class="text-center" v-if="index>0">BASE</td> 60 <td width="120" class="text-center" v-if="index>0">BASE</td>
61 <td class="text-center" v-if="index>0">POINTS</td> 61 <td width="120" class="text-center" v-if="index>0">POINTS</td>
62 </tr> 62 </tr>
63 </thead> 63 </thead>
64 <tbody> 64 <tbody>
......
vite.config.js
...@@ -82,8 +82,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,8 +82,8 @@ 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.96:9083/', 85 // target: 'http://192.168.1.131:8083/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 target: 'https://dance.itechtop.cn/stage-api',
87 changeOrigin: true, 87 changeOrigin: true,
88 rewrite: (p) => p.replace(/^\/dev-api/, '') 88 rewrite: (p) => p.replace(/^\/dev-api/, '')
89 } 89 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!