Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
50ce5172 by 杨炀
Options

Merge branch 'dev' into order 

# Conflicts:
#	src/assets/styles/ruoyi.scss
#	src/viewsPc/index_en.vue
#	src/viewsPc/match/components/quick-row.vue
2 parents e665b5d8 e0d73fd9
Inline Side-by-side
Showing 27 changed files with 233 additions and 182 deletions
src/assets/styles/ruoyi.scss
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
7 .popo{position: absolute;left: 0;} 7 .popo{position: absolute;left: 0;}
8 .no-pointer { pointer-events: none } 8 .no-pointer { pointer-events: none }
9 .blur20 { filter: blur(20px) } 9 .blur20 { filter: blur(20px) }
10
10 .flex{display: flex;} 11 .flex{display: flex;}
12
13 .text-gray{color: #999}
14
11 .pt5 { 15 .pt5 {
12 padding-top: 5px; 16 padding-top: 5px;
13 } 17 }
......
src/layoutPc/components/AppHeader.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item> 13 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item>
14 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item> 14 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item>
15 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item> 15 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item>
16 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'SIGN UP' }}</el-menu-item> 16 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item>
17 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item> 17 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item>
18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
19 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 19 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item> 31 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item>
32 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item> 32 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item>
33 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item> 33 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item>
34 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'SIGN UP' }}</el-menu-item> 34 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item>
35 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item> 35 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item>
36 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 36 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
37 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 37 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 <el-menu-item index="/">HOME</el-menu-item> 122 <el-menu-item index="/">HOME</el-menu-item>
123 <el-menu-item index="/news">NEWS</el-menu-item> 123 <el-menu-item index="/news">NEWS</el-menu-item>
124 <el-menu-item index="/notice">NOTICEBOARD</el-menu-item> 124 <el-menu-item index="/notice">NOTICEBOARD</el-menu-item>
125 <el-menu-item index="/match/list">SIGN UP</el-menu-item> 125 <el-menu-item index="/match/list">REGISTRATION</el-menu-item>
126 <el-menu-item index="/saiC">COMPETITIONS</el-menu-item> 126 <el-menu-item index="/saiC">COMPETITIONS</el-menu-item>
127 <el-menu-item index="/meta">MEDIA</el-menu-item> 127 <el-menu-item index="/meta">MEDIA</el-menu-item>
128 <el-menu-item index="/guide">GUIDELINE</el-menu-item> 128 <el-menu-item index="/guide">GUIDELINE</el-menu-item>
...@@ -216,14 +216,14 @@ const logout = () => { ...@@ -216,14 +216,14 @@ const logout = () => {
216 }) 216 })
217 } 217 }
218 218
219 const goLogin = (flag) => { 219 const goLogin = (query) => {
220 let param = null 220 let param = {}
221 if (_.isBoolean(flag)) { 221 // if (_.isBoolean(flag)) {
222 param = { 222 // param = {
223 notShowClose: flag 223 // notShowClose: flag
224 } 224 // }
225 } 225 // }
226 proxy.$refs['pcloginDialog'].open(param) 226 proxy.$refs['pcloginDialog'].open(query)
227 } 227 }
228 228
229 const reFlash = () => { 229 const reFlash = () => {
...@@ -231,8 +231,9 @@ const reFlash = () => { ...@@ -231,8 +231,9 @@ const reFlash = () => {
231 location.reload() 231 location.reload()
232 } 232 }
233 watch(() => useUserStore().reLogin, (val) => { 233 watch(() => useUserStore().reLogin, (val) => {
234 if (val) { 234 if (val.show) {
235 goLogin() 235 console.log(val)
236 goLogin(val.query)
236 } 237 }
237 }) 238 })
238 239
......
src/store/modules/user.js
...@@ -30,7 +30,7 @@ const useUserStore = defineStore( ...@@ -30,7 +30,7 @@ const useUserStore = defineStore(
30 isExam: '1', // 是否为考点，0：是；1：否, 30 isExam: '1', // 是否为考点，0：是；1：否,
31 genFlag: '', // 是否是自动的协会 31 genFlag: '', // 是否是自动的协会
32 badge: {}, 32 badge: {},
33 reLogin: false, 33 reLogin: {show:false,query:{}},
34 language: 0 34 language: 0
35 }), 35 }),
36 actions: { 36 actions: {
...@@ -138,10 +138,11 @@ const useUserStore = defineStore( ...@@ -138,10 +138,11 @@ const useUserStore = defineStore(
138 this.badge = res.data 138 this.badge = res.data
139 }) 139 })
140 }, 140 },
141 setReLogin() { 141 setReLogin(query) {
142 this.reLogin = true 142 console.log(query)
143 this.reLogin = {show:true,query:query}
143 setTimeout(() => { 144 setTimeout(() => {
144 this.reLogin = false 145 this.reLogin = {show:false,query:query}
145 }, 1000) 146 }, 1000)
146 }, 147 },
147 checkAndLogin() { 148 checkAndLogin() {
......
src/viewsPc/center/myMatch.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <h3>{{ n.name }}</h3> 19 <h3>{{ n.name }}</h3>
20 </el-col> 20 </el-col>
21 <el-col :lg="8"> 21 <el-col :lg="8">
22 <p class="ppl"><label>{{ language==0?'赛事级别':'Event Type' }}：</label>{{ n.level }}</p> 22 <p class="ppl"><label>{{ language==0?'赛事级别':'Event Level' }}：</label>{{ n.level }}</p>
23 <p class="ppl" v-if="n.languageSource=='100'"><label v-if="n.groupName">{{ language==0?'参赛队':'Name of participating team' }}：</label>{{n.groupName}}</p> 23 <p class="ppl" v-if="n.languageSource=='100'"><label v-if="n.groupName">{{ language==0?'参赛队':'Name of participating team' }}：</label>{{n.groupName}}</p>
24 </el-col> 24 </el-col>
25 <el-col :lg="8"> 25 <el-col :lg="8">
......
src/viewsPc/home.vue
...@@ -2,6 +2,61 @@ ...@@ -2,6 +2,61 @@
2 <div> 2 <div>
3 <index-Ch v-if="language ==0"/> 3 <index-Ch v-if="language ==0"/>
4 <index-En v-else/> 4 <index-En v-else/>
5
6
7 <div v-if="showgg" class="fixed_gg">
8 <!--天气-->
9 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
10 <div class="bg-lineg pd20">
11 <div class="smallToday" @click="popWeather">
12 <div>
13 <div class="type">
14 <weather-icon :type="weatherObj.forecast[0]?.type" :width="50"/>
15 </div>
16 </div>
17 <div>
18 <h3 v-if="language == 0">无锡</h3>
19 <h3 v-else>WUXI</h3>
20 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
21 </div>
22 </div>
23 </div>
24 <el-dialog v-model="weatherdialog" width="540" :close-on-click-modal="true"
25 style="--el-dialog-padding-primary:0;--el-dialog-border-radius:15px;
26 --el-dialog-bg-color:transparent;overflow: hidden;">
27 <div class="bg-lineg pd20">
28 <div class="weatherbox">
29 <div class="today">
30 <div>
31 <div class="wd">{{weatherObj.wendu}}°c</div>
32 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
33 <div class="week">{{weatherObj.forecast[0]?.week}}</div>
34 </div>
35 <div>
36 <div class="type">
37 <weather-icon :type="weatherObj.forecast[0].type" :width="64"/>
38 </div>
39 </div>
40 </div>
41 <ul class="wlist">
42 <li v-for="n in weatherObj.forecast.slice(1,6)">
43 <div class="type">
44 <weather-icon :type="n.type" :width="32"/>
45 </div>
46 <div class="wd">{{n.low.slice(2,-1)}}/{{n.high.slice(2)}}</div>
47 <div class="week" v-if="language==1">
48 {{n.week=='星期一'?'Mon':n.week=='星期二'?'Tue':n.week=='星期三'?'Wed':n.week=='星期四'?'Thu':n.week=='星期五'?'Fri':n.week=='星期六'?'Sat':n.week=='星期日'?'Sun':''}}
49 </div>
50 <div class="week" v-else>
51 {{n.week}}
52 </div>
53 <div class="date mt10">{{n.ymd.slice(5,10)}}</div>
54 </li>
55 </ul>
56 </div>
57 </div>
58 </el-dialog>
59 </div>
5 </div> 60 </div>
6 61
7 </template> 62 </template>
...@@ -9,9 +64,29 @@ ...@@ -9,9 +64,29 @@
9 <script setup> 64 <script setup>
10 import IndexCh from '/src/viewsPc/index' 65 import IndexCh from '/src/viewsPc/index'
11 import IndexEn from '/src/viewsPc/index_en' 66 import IndexEn from '/src/viewsPc/index_en'
67 import WeatherIcon from '@/viewsPc/components/weatherIcon'
68
12 import {useStorage} from "@vueuse/core/index"; 69 import {useStorage} from "@vueuse/core/index";
70 import {ref} from "vue";
71 import {getWeather} from "@/apiPc/webSite";
72 const showgg = ref(true)
13 73
14 const language = useStorage('language', 0) 74 const language = useStorage('language', 0)
75 const weatherObj = ref({
76 forecast:[]
77 })
78 const weatherdialog = ref(false)
79 init()
80 function init(){
81 getWeather().then(res=>{
82 weatherObj.value = JSON.parse(res.data).data
83 console.log(weatherObj.value)
84 })
85 }
86 const popWeather = () => {
87 weatherdialog.value = true
88 }
89
15 </script> 90 </script>
16 91
17 <style scoped lang="scss"> 92 <style scoped lang="scss">
......
src/viewsPc/index.vue
...@@ -331,62 +331,6 @@ ...@@ -331,62 +331,6 @@
331 </el-col> 331 </el-col>
332 </el-row> 332 </el-row>
333 </div> 333 </div>
334
335 <div v-if="showgg" class="fixed_gg">
336 <!--天气-->
337 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
338 <!-- <img src="@/assets/dance/weather_en.png">-->
339 <div class="bg-lineg pd10">
340 <div class="smallToday" @click="popWeather">
341 <div>
342 <div class="type">
343 <weather-icon :type="weatherObj.forecast[0]?.type" :width="50"/>
344 </div>
345 </div>
346 <div>
347 <h3>无锡</h3>
348 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
349 </div>
350 </div>
351
352 <!-- <iframe width="150" scrolling="no" height="60" frameborder="0" allowtransparency="true" src="https://i.tianqi.com?c=code&id=84&color=%23FFFFFF&bgc=%23&icon=1&py=binhuqu&site=17"></iframe>-->
353 </div>
354 <el-dialog v-model="weatherdialog" width="540" :close-on-click-modal="true" :show-close="false"
355 style="--el-dialog-padding-primary:0;--el-dialog-border-radius:15px;
356 --el-dialog-bg-color:transparent;overflow: hidden;">
357 <div class="bg-lineg pd20">
358 <!-- <iframe width="500" scrolling="no" height="270" frameborder="0" allowtransparency="true" src="https://i.tianqi.com?c=code&id=95&color=%23FFFFFF&icon=4&py=binhuqu&site=15"></iframe>-->
359 <div class="weatherbox">
360 <div class="today">
361 <div>
362 <div class="wd">{{weatherObj.wendu}}°c</div>
363 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
364 <div class="week">{{weatherObj.forecast[0]?.week}}</div>
365 </div>
366 <div>
367 <div class="type">
368 <weather-icon :type="weatherObj.forecast[0].type" :width="64"/>
369 <!-- <div class="mt10">{{weatherObj.forecast[0].type}}</div>-->
370 </div>
371 </div>
372 </div>
373 <ul class="wlist">
374 <li v-for="n in weatherObj.forecast.slice(1,6)">
375 <div class="type">
376 <weather-icon :type="n.type" :width="32"/>
377 </div>
378 <div class="wd">{{n.low.slice(2,-1)}}/{{n.high.slice(2)}}</div>
379 <!-- <div class="date">{{n.ymd}}</div>-->
380 <div class="week">
381 {{n.week}}
382 </div>
383 </li>
384 </ul>
385 </div>
386
387 </div>
388 </el-dialog>
389 </div>
390 </div> 334 </div>
391 </template> 335 </template>
392 <script setup> 336 <script setup>
...@@ -402,7 +346,6 @@ import {Autoplay, Navigation} from 'swiper' ...@@ -402,7 +346,6 @@ import {Autoplay, Navigation} from 'swiper'
402 import 'swiper/css' 346 import 'swiper/css'
403 import {dayjs} from 'element-plus' 347 import {dayjs} from 'element-plus'
404 import * as match from "@/apiPc/match"; 348 import * as match from "@/apiPc/match";
405 import WeatherIcon from '@/viewsPc/components/weatherIcon'
406 const modules = [Autoplay, Navigation] 349 const modules = [Autoplay, Navigation]
407 const navigationPic = ref({ 350 const navigationPic = ref({
408 nextEl: '.picnext', 351 nextEl: '.picnext',
...@@ -444,7 +387,7 @@ const weatherdialog = ref(false) ...@@ -444,7 +387,7 @@ const weatherdialog = ref(false)
444 const picList = ref([]) 387 const picList = ref([])
445 const calendarValue = ref(dayjs('2024-07-22').toDate()) 388 const calendarValue = ref(dayjs('2024-07-22').toDate())
446 const calendarRange = ref([dayjs('2024-07-21').toDate(), dayjs('2024-07-27').toDate()]) 389 const calendarRange = ref([dayjs('2024-07-21').toDate(), dayjs('2024-07-27').toDate()])
447 const showgg = ref(true) 390
448 onMounted(() => { 391 onMounted(() => {
449 init() 392 init()
450 }) 393 })
...@@ -492,11 +435,6 @@ const init = () => { ...@@ -492,11 +435,6 @@ const init = () => {
492 } 435 }
493 matchData.value = maList.value[0] 436 matchData.value = maList.value[0]
494 }) 437 })
495
496 getWeather().then(res=>{
497 weatherObj.value = JSON.parse(res.data).data
498 console.log(weatherObj.value)
499 })
500 } 438 }
501 const carouselChange = (e) => { 439 const carouselChange = (e) => {
502 console.log(e) 440 console.log(e)
......
src/viewsPc/index_en.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 </van-count-down> 29 </van-count-down>
30 </div> 30 </div>
31 <div class="banner-count bb" v-else @click="goMatch(n)"> 31 <div class="banner-count bb" v-else @click="goMatch(n)">
32 Register Now 32 REGISTER NOW
33 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>--> 33 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
34 </div> 34 </div>
35 </div> 35 </div>
...@@ -47,13 +47,43 @@ ...@@ -47,13 +47,43 @@
47 <div class="bgbg"> 47 <div class="bgbg">
48 <h1 style="color: #fff">WDSF ASIAN DANCESPORT FESTIVAL .WUXI 2024</h1> 48 <h1 style="color: #fff">WDSF ASIAN DANCESPORT FESTIVAL .WUXI 2024</h1>
49 <a class="zn-btn" @click="goGuide"> 49 <a class="zn-btn" @click="goGuide">
50 ENTRY GUIDE 50 GUIDELINE
51 <el-icon><download /></el-icon> 51 <el-icon><download /></el-icon>
52 </a> 52 </a>
53 </div> 53 </div>
54 </el-col> 54 </el-col>
55 <el-col :sm="24" :lg="14"> 55 <el-col :sm="24" :lg="14">
56 <HomeQuick :match-id="matchData?.id"/> 56 <div class="itemBox">
57 <el-row :gutter="20">
58 <el-col :sm="12" :lg="8">
59 <div class="item" @click="building"><img src="@/assets/dance/btn01.png">
60 <p>Hotel Reservation</p>
61 </div></el-col>
62 <el-col :sm="12" :lg="8">
63 <div class="item" @click="building"><img src="@/assets/dance/btn02.png">
64 <p>Vehicle Reservation</p>
65 </div></el-col>
66 <el-col :sm="12" :lg="8">
67 <div class="item" @click="building"><img src="@/assets/dance/btn03.png">
68 <p>Dining Reservation</p>
69 </div>
70 </el-col>
71 <el-col :sm="12" :lg="8">
72 <div class="item" @click="building"><img src="@/assets/dance/btn04.png">
73 <p>Ticket Booking</p>
74 </div>
75 </el-col>
76 <el-col :sm="12" :lg="8">
77 <div class="item" @click="building"><img src="@/assets/dance/btn05.png">
78 <p>Makeup Appointment</p>
79 </div></el-col>
80 <el-col :sm="12" :lg="8">
81 <div class="item" @click="building"><img src="@/assets/dance/btn06.png">
82 <p>Photography Appointment</p>
83 </div></el-col>
84 </el-row>
85 </div>
86
57 </el-col> 87 </el-col>
58 </el-row> 88 </el-row>
59 </div> 89 </div>
...@@ -338,69 +368,19 @@ ...@@ -338,69 +368,19 @@
338 </el-row> 368 </el-row>
339 </div> 369 </div>
340 370
341 <div v-if="showgg" class="fixed_gg"> 371
342 <!--天气-->
343 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
344 <div class="bg-lineg pd20">
345 <div class="smallToday" @click="popWeather">
346 <div>
347 <div class="type">
348 <weather-icon :type="weatherObj.forecast[0]?.type" :width="50"/>
349 </div>
350 </div>
351 <div>
352 <h3>WUXI</h3>
353 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
354 </div>
355 </div>
356 </div>
357 <el-dialog v-model="weatherdialog" width="540" :close-on-click-modal="true"
358 style="--el-dialog-padding-primary:0;--el-dialog-border-radius:15px;
359 --el-dialog-bg-color:transparent;overflow: hidden;">
360 <div class="bg-lineg pd20">
361 <div class="weatherbox">
362 <div class="today">
363 <div>
364 <div class="wd">{{weatherObj.wendu}}°c</div>
365 <div class="wd_p">{{weatherObj.forecast[0]?.low.slice(2)}}~{{weatherObj.forecast[0]?.high.slice(2)}}</div>
366 <div class="week">{{weatherObj.forecast[0]?.week}}</div>
367 </div>
368 <div>
369 <div class="type">
370 <weather-icon :type="weatherObj.forecast[0].type" :width="64"/>
371 </div>
372 </div>
373 </div>
374 <ul class="wlist">
375 <li v-for="n in weatherObj.forecast.slice(1,6)">
376 <div class="type">
377 <weather-icon :type="n.type" :width="32"/>
378 </div>
379 <div class="wd">{{n.low.slice(2,-1)}}/{{n.high.slice(2)}}</div>
380 <!-- <div class="date">{{n.ymd}}</div>-->
381 <div class="week">
382 {{n.week=='星期一'?'Mon':n.week=='星期二'?'Tue':n.week=='星期三'?'Wed':n.week=='星期四'?'Thu':n.week=='星期五'?'Fri':n.week=='星期六'?'Sat':n.week=='星期日'?'Sun':''}}
383 </div>
384 </li>
385 </ul>
386 </div>
387 </div>
388 </el-dialog>
389 </div>
390 </div> 372 </div>
391 </template> 373 </template>
392 <script setup> 374 <script setup>
393 import HomeQuick from '@/viewsPc/components/homeQuick'
394 import { ref, nextTick, onMounted, watch } from 'vue' 375 import { ref, nextTick, onMounted, watch } from 'vue'
395 import { getCurrentInstance } from '@vue/runtime-core' 376 import { getCurrentInstance } from '@vue/runtime-core'
396 import { getNewsListById, getNewsList,getWeather} from '@/apiPc/webSite' 377 import { getNewsListById, getNewsList,getWeather} from '@/apiPc/webSite'
397 import { useRouter } from 'vue-router' 378 import { useRouter } from 'vue-router'
398 import WeatherIcon from '@/viewsPc/components/weatherIcon'
399 import _ from 'lodash' 379 import _ from 'lodash'
400 import { Swiper, SwiperSlide } from 'swiper/vue' 380 import { Swiper, SwiperSlide } from 'swiper/vue'
401 import { Autoplay, Navigation } from 'swiper' 381 import { Autoplay, Navigation } from 'swiper'
402 import 'swiper/css' 382 import 'swiper/css'
403 import { dayjs } from 'element-plus' 383 import {dayjs, ElMessage} from 'element-plus'
404 import * as match from "@/apiPc/match"; 384 import * as match from "@/apiPc/match";
405 import {rankList} from '@/assets/js/data' 385 import {rankList} from '@/assets/js/data'
406 const modules = [Autoplay, Navigation] 386 const modules = [Autoplay, Navigation]
...@@ -411,10 +391,7 @@ const navigationPic = ref({ ...@@ -411,10 +391,7 @@ const navigationPic = ref({
411 const router = useRouter() 391 const router = useRouter()
412 const { proxy } = getCurrentInstance() 392 const { proxy } = getCurrentInstance()
413 const time = ref(0) 393 const time = ref(0)
414 const weatherObj = ref({ 394
415 forecast:[]
416 })
417 const weatherdialog = ref(false)
418 const personList = ref([ 395 const personList = ref([
419 { name: 'Wolfgang Eliasch', pp: 'Chairperson for Latin AUT', src: '/img/1.png' }, 396 { name: 'Wolfgang Eliasch', pp: 'Chairperson for Latin AUT', src: '/img/1.png' },
420 { name: 'Nenad Jeftic', pp: 'Chairperson for Standard SRB', src: '/img/2.png' }, 397 { name: 'Nenad Jeftic', pp: 'Chairperson for Standard SRB', src: '/img/2.png' },
...@@ -438,7 +415,7 @@ const livelist = ref([]) ...@@ -438,7 +415,7 @@ const livelist = ref([])
438 const maList = ref([]) 415 const maList = ref([])
439 const picList = ref([]) 416 const picList = ref([])
440 const calendarValue = ref('2024-07-22') 417 const calendarValue = ref('2024-07-22')
441 const showgg = ref(true) 418
442 const matchData = ref({}) 419 const matchData = ref({})
443 onMounted(() => { 420 onMounted(() => {
444 init() 421 init()
...@@ -477,10 +454,6 @@ const init = () => { ...@@ -477,10 +454,6 @@ const init = () => {
477 } 454 }
478 matchData.value = maList.value[0] 455 matchData.value = maList.value[0]
479 }) 456 })
480 getWeather().then(res=>{
481 weatherObj.value = JSON.parse(res.data).data
482 console.log(weatherObj.value)
483 })
484 } 457 }
485 458
486 459
...@@ -515,13 +488,14 @@ const goMatch = (n) => { ...@@ -515,13 +488,14 @@ const goMatch = (n) => {
515 path: `/match/list/${n.id}` 488 path: `/match/list/${n.id}`
516 }) 489 })
517 } 490 }
518 const popWeather = () => { 491
519 weatherdialog.value = true 492 const building = () => {
493 ElMessage.warning('Building')
520 } 494 }
521 const goGuide = () => { 495 const goGuide = () => {
522 router.push({ 496 router.push({
523 name: 'guide', 497 path: `/guide`,
524 query: { 498 query:{
525 index:8 499 index:8
526 } 500 }
527 }) 501 })
...@@ -539,11 +513,24 @@ const goGuide = () => { ...@@ -539,11 +513,24 @@ const goGuide = () => {
539 justify-content: space-between; 513 justify-content: space-between;
540 img{margin: 5% 0} 514 img{margin: 5% 0}
541 } 515 }
516 .itemBox{
517 padding: 20px 40px;
518 p{margin: 0;height: 40px;line-height: 20px;display: flex;align-items: center;}
519 }
542 border-radius: 15px; 520 border-radius: 15px;
543 .zn-btn{background: #FFFFFF; 521 .zn-btn{background: #FFFFFF;
544 font-size: 18px; width: fit-content; 522 font-size: 18px; width: fit-content;
545 color: #453DEA; 523 color: #453DEA;
546 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;} 524 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
525 .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0;
526 display: flex;align-items: center;text-align: center;
527 font-size: 18px; flex-direction: column;padding: 35px 10px 20px;
528 background:url("@/assets/dance/znbb.png") no-repeat left #FFFFFF;
529 background-size: cover;
530 position: relative;
531 border-radius: 15px;
532 img{position: absolute;top: -30px}
533 }
547 } 534 }
548 535
549 .app-main { 536 .app-main {
......
src/viewsPc/login.vue
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 destroy-on-close :show-close="showClose" :close-on-click-modal="false" @close="close" 4 destroy-on-close :show-close="showClose" :close-on-click-modal="false" @close="close"
5 > 5 >
6 <div class="pd10"></div> 6 <div class="pd10"></div>
7 <el-form ref="loginRef" :model="loginForm" :rules="language==0?loginRules:loginRules_en" class="login-form" 7 <el-form v-if="loginStatus==0" ref="loginRef" :model="loginForm"
8 v-if="loginStatus==0"> 8 :rules="language==0?loginRules:loginRules_en" class="login-form">
9 <el-form-item prop="username"> 9 <el-form-item prop="username">
10 10
11 <el-input 11 <el-input
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
81 </el-form> 81 </el-form>
82 82
83 <div v-if="loginStatus==1"> 83 <div v-if="loginStatus==1">
84 <a class="poLeft" @click="close()"><el-icon><ArrowLeftBold /></el-icon></a>
84 <div class="rItem r1" @click="goRegister(1)"> 85 <div class="rItem r1" @click="goRegister(1)">
85 <h3>{{ language == 0 ? '机构用户' : 'Organization' }}</h3> 86 <h3>{{ language == 0 ? '机构用户' : 'Organization' }}</h3>
86 </div> 87 </div>
...@@ -89,6 +90,7 @@ ...@@ -89,6 +90,7 @@
89 </div> 90 </div>
90 </div> 91 </div>
91 <div v-if="loginStatus==2"> 92 <div v-if="loginStatus==2">
93 <a class="poLeft" @click="close()"><el-icon><ArrowLeftBold /></el-icon></a>
92 <el-form ref="changePasswordRef" :model="changePasswordForm" 94 <el-form ref="changePasswordRef" :model="changePasswordForm"
93 :rules="language==0?changePasswordRules:changePasswordRules_en" class="login-form"> 95 :rules="language==0?changePasswordRules:changePasswordRules_en" class="login-form">
94 <el-form-item prop="username"> 96 <el-form-item prop="username">
...@@ -241,8 +243,11 @@ const changePasswordForm = ref({ ...@@ -241,8 +243,11 @@ const changePasswordForm = ref({
241 }) 243 })
242 244
243 const open = (params) => { 245 const open = (params) => {
246 console.log(params)
244 show.value = true 247 show.value = true
245 showClose.value = !(params?.notShowClose || false) 248 showClose.value = !(params?.notShowClose || false)
249 loginStatus.value = params?.active || 0
250 changePasswordForm.value.username = params?.account || ''
246 if (language.value == 0) { 251 if (language.value == 0) {
247 title.value = '用户登录' 252 title.value = '用户登录'
248 } else { 253 } else {
...@@ -561,4 +566,5 @@ function handleChangePassword() { ...@@ -561,4 +566,5 @@ function handleChangePassword() {
561 border: var(--el-color-primary) solid 1px; 566 border: var(--el-color-primary) solid 1px;
562 border-radius: 0; 567 border-radius: 0;
563 } 568 }
569 .poLeft{position: absolute;top:24px;font-size: 20px;left:20px}
564 </style> 570 </style>
......
src/viewsPc/match/components/addCoach_en.vue
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
24 </el-button> 24 </el-button>
25 </template> 25 </template>
26 </el-input> 26 </el-input>
27 <a class="text-primary text-sm mt10" href="https://www.worlddancesport.org/Athlete/List" target="_blank">
28 <el-icon><Link /></el-icon>
29 {{language==0?'去WDSF官网查询我的会员号':'Search my WSDF MIN on the WDSF official website'}}
30 </a>
27 </el-form-item> 31 </el-form-item>
28 <el-form-item :label="language==0?'姓氏':'Surname'" prop="xing" :required="!editDis"> 32 <el-form-item :label="language==0?'姓氏':'Surname'" prop="xing" :required="!editDis">
29 <el-input v-model="form.xing" :disabled="editDis"/> 33 <el-input v-model="form.xing" :disabled="editDis"/>
...@@ -37,7 +41,10 @@ ...@@ -37,7 +41,10 @@
37 <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio> 41 <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio>
38 </el-radio-group> 42 </el-radio-group>
39 </el-form-item> 43 </el-form-item>
40 <el-form-item :label="language==0?'所属国家/地区':'Nationality'" prop="countryId" required> 44 <el-form-item v-if="form.wdsfMin" :label="language==0?'代表':'Representing'" required>
45 <el-input v-model="form.representing" disabled/>
46 </el-form-item>
47 <el-form-item v-else :label="language==0?'所属国家/地区':'Nationality'" prop="countryId" required>
41 <el-select filterable v-model="form.countryId" style="width: 100%;" @change="changeCountry"> 48 <el-select filterable v-model="form.countryId" style="width: 100%;" @change="changeCountry">
42 <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" 49 <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName"
43 :value="item.id"/> 50 :value="item.id"/>
...@@ -244,6 +251,13 @@ const open = (params) => { ...@@ -244,6 +251,13 @@ const open = (params) => {
244 match.getPersonInfoById(params.id).then(res => { 251 match.getPersonInfoById(params.id).then(res => {
245 form.value = res.data 252 form.value = res.data
246 form.value.id = params.id 253 form.value.id = params.id
254 if(form.value.wdsfMin){
255 editDis.value = true
256 }
257 if(form.value.idcType=='3'){
258 form.value.idcType = ''
259 form.value.idcCode = ''
260 }
247 if (form.value.label) { 261 if (form.value.label) {
248 // {0:0,1:1,2:3} 262 // {0:0,1:1,2:3}
249 form.value.labelArr = form.value.label.split(',') 263 form.value.labelArr = form.value.label.split(',')
......
src/viewsPc/match/components/addSportman_en.vue
...@@ -255,7 +255,7 @@ function codeSuccess(msg) { ...@@ -255,7 +255,7 @@ function codeSuccess(msg) {
255 if (language.value == 0) { 255 if (language.value == 0) {
256 ElMessage.warning('WDSF卡号错误') 256 ElMessage.warning('WDSF卡号错误')
257 } else { 257 } else {
258 ElMessage.warning('WDSF ID is Error') 258 ElMessage.warning('WDSF MIN is Error')
259 } 259 }
260 } 260 }
261 }) 261 })
......
src/viewsPc/match/components/addWdsf.vue
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
7 <!-- wdsf 个人/舞伴/国际赛运动员--> 7 <!-- wdsf 个人/舞伴/国际赛运动员-->
8 <div class="pd10"></div> 8 <div class="pd10"></div>
9 <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>
10 <el-form-item :label="language==0?'WDSF卡号':'WDSF ID'" v-if="form.id&&form.id!='0'"> 10 <el-form-item :label="language==0?'WDSF卡号':'WDSF MIN'" v-if="form.id&&form.id!='0'">
11 {{ form.wdsfMin }} 11 {{ form.wdsfMin }}
12 </el-form-item> 12 </el-form-item>
13 <el-form-item :label="language==0?'WDSF卡号':'WDSF ID'" required v-else> 13 <el-form-item :label="language==0?'WDSF卡号':'WDSF MIN'" required v-else>
14 <el-input type="text" v-model="card" @change="resetCode"> 14 <el-input type="text" v-model="card" @change="resetCode">
15 <template #append> 15 <template #append>
16 <el-button type="primary" plain style="width: 110px" @click="checkCard"> 16 <el-button type="primary" plain style="width: 110px" @click="checkCard">
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
21 </el-button> 21 </el-button>
22 </template> 22 </template>
23 </el-input> 23 </el-input>
24 <a class="text-primary text-sm mt10" href="https://www.worlddancesport.org/Athlete/List" target="_blank">
25 <el-icon><Link /></el-icon>
26 {{language==0?'去WDSF官网查询我的会员号':'Search my WSDF MIN on the WDSF official website'}}
27 </a>
28
24 <Vcode :show="showVcode" :z-index="2999" @success="codeSuccess()"></Vcode> 29 <Vcode :show="showVcode" :z-index="2999" @success="codeSuccess()"></Vcode>
25 </el-form-item> 30 </el-form-item>
26 <div class="h30"></div> 31 <div class="h30"></div>
...@@ -319,7 +324,7 @@ function codeSuccess(msg) { ...@@ -319,7 +324,7 @@ function codeSuccess(msg) {
319 if (language.value == 0) { 324 if (language.value == 0) {
320 ElMessage.warning('WDSF卡号错误') 325 ElMessage.warning('WDSF卡号错误')
321 } else { 326 } else {
322 ElMessage.warning('WDSF ID is Error') 327 ElMessage.warning('WDSF MIN is Error')
323 } 328 }
324 } 329 }
325 }) 330 })
......
src/viewsPc/match/components/groupInfo-row.vue
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
7 <img class="w100" :src="fillImgUrl(groupInfo.imgUrl)"/> 7 <img class="w100" :src="fillImgUrl(groupInfo.imgUrl)"/>
8 </el-col> 8 </el-col>
9 <el-col :span="20"> 9 <el-col :span="20">
10 <div class="item"><label>{{ language==0?'团体名称':'Team Name' }}</label>{{ groupInfo.name }}</div> 10 <div class="item" v-if="groupInfo.type=='4'"><label>{{ language==0?'代表队':'Represent' }}</label>{{ groupInfo.name?.substring(0,3) }}</div>
11 <div class="item" v-if="groupInfo.type!='4'"><label>{{ language==0?'团体名称':'Team name' }}</label>{{ groupInfo.name?.substring(0,3) }}</div>
11 <div class="item"><label>{{ language==0?'团体类型':'Group type' }}</label> 12 <div class="item"><label>{{ language==0?'团体类型':'Group type' }}</label>
12 <text v-if="groupInfo.type=='0'">{{language==0?'普通院校':'School'}}</text> 13 <text v-if="groupInfo.type=='0'">{{language==0?'普通院校':'School'}}</text>
13 <text v-if="groupInfo.type=='1'">{{language==0?'专业舞蹈学校':'Professional dance school'}}</text> 14 <text v-if="groupInfo.type=='1'">{{language==0?'专业舞蹈学校':'Professional dance school'}}</text>
......
src/viewsPc/match/components/matchInfo-row.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="border-info" style="margin: 20px" v-loading="loading"> 2 <div class="border-info" style="margin: 20px" v-loading="loading">
3 <el-row v-if="language==0"> 3 <el-row v-if="language==0">
4 <el-col :lg="8"><div class="item"><label>赛事名称</label>{{matchInfo.name}}</div></el-col> 4 <el-col :lg="8"><div class="item"><label>赛事名称</label>{{matchInfo.name}}</div></el-col>
5 <el-col :lg="8"><div class="item"><label>赛事类型</label>{{matchInfo.level}}</div></el-col> 5 <el-col :lg="8"><div class="item"><label>赛事级别</label>{{matchInfo.level}}</div></el-col>
6 <el-col :lg="8"><div class="item"><label>赛事时间</label>{{matchInfo.beginTime?.slice(0,10)}} 至 {{ matchInfo.endTime?.slice(0,10) }}</div></el-col> 6 <el-col :lg="8"><div class="item"><label>赛事时间</label>{{matchInfo.beginTime?.slice(0,10)}} 至 {{ matchInfo.endTime?.slice(0,10) }}</div></el-col>
7 <el-col :lg="8"><div class="item"><label>报名时间</label>{{ matchInfo.signBeginTime?.slice(0,10) }} 至{{ matchInfo.signEndTime?.slice(0,10) }}</div></el-col> 7 <el-col :lg="8"><div class="item"><label>报名时间</label>{{ matchInfo.signBeginTime?.slice(0,10) }} 至{{ matchInfo.signEndTime?.slice(0,10) }}</div></el-col>
8 <el-col :lg="16"><div class="item"><label>比赛地址</label>{{matchInfo.address}}</div></el-col> 8 <el-col :lg="16"><div class="item"><label>比赛地址</label>{{matchInfo.address}}</div></el-col>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </el-row> 12 </el-row>
13 <el-row v-else> 13 <el-row v-else>
14 <el-col :lg="8"><div class="item"><label>Event Name</label>{{matchInfo.name}}</div></el-col> 14 <el-col :lg="8"><div class="item"><label>Event Name</label>{{matchInfo.name}}</div></el-col>
15 <el-col :lg="8"><div class="item"><label>Event Type</label>{{matchInfo.level}}</div></el-col> 15 <el-col :lg="8"><div class="item"><label>Event Level</label>{{matchInfo.level}}</div></el-col>
16 <el-col :lg="8"><div class="item"><label>Event Date</label>{{matchInfo.beginTime?.slice(0,10)}} ~ {{ matchInfo.endTime?.slice(0,10) }}</div></el-col> 16 <el-col :lg="8"><div class="item"><label>Event Date</label>{{matchInfo.beginTime?.slice(0,10)}} ~ {{ matchInfo.endTime?.slice(0,10) }}</div></el-col>
17 <el-col :lg="8"><div class="item"><label>Registration Period</label>{{ matchInfo.signBeginTime?.slice(0,10) }} ~{{ matchInfo.signEndTime?.slice(0,10) }}</div></el-col> 17 <el-col :lg="8"><div class="item"><label>Registration Period</label>{{ matchInfo.signBeginTime?.slice(0,10) }} ~{{ matchInfo.signEndTime?.slice(0,10) }}</div></el-col>
18 <el-col :lg="16"><div class="item"><label>Event Address</label>{{matchInfo.address}}</div></el-col> 18 <el-col :lg="16"><div class="item"><label>Event Address</label>{{matchInfo.address}}</div></el-col>
......
src/viewsPc/match/components/singleSignStep.vue
1 <template> 1 <template>
2 <el-steps :active="activeStep" align-center> 2 <el-steps :active="activeStep" align-center>
3 <el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF ID'" /> 3 <el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF MIN'" />
4 <el-step :title="language==0?'选手报名':'Participant Registration'" /> 4 <el-step :title="language==0?'选手报名':'Participant Registration'" />
5 <el-step :title="language==0?'提交审核':'Submit for review'" /> 5 <el-step :title="language==0?'提交审核':'Submit for review'" />
6 </el-steps> 6 </el-steps>
......
src/viewsPc/match/components/substation-list.vue
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
50 <div v-else style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center"> 50 <div v-else style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">
51 {{ language == 0 ? '报名已结束' : 'Registration has ended' }} 51 {{ language == 0 ? '报名已结束' : 'Registration has ended' }}
52 </div> 52 </div>
53 <p class="text-gray">{{ language==0?'报名截止':'Registration Deadline' }}：{{ n.signEndTime?.slice(0,10) }}</p>
53 </div> 54 </div>
54 </el-col> 55 </el-col>
55 </el-row> 56 </el-row>
......
src/viewsPc/match/components/zu-table.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="zuName"/> 5 <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="zuName"/>
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'"> 8 <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" min-width="110px">
9 <template #default="scope"> 9 <template #default="scope">
10 <div v-html="scope.row.project.remarks"></div> 10 <div v-html="scope.row.project.remarks"></div>
11 </template> 11 </template>
...@@ -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="120px" prop=""> 20 <el-table-column :label="language==0?'报名费':'Registration Fee'" width="130px" 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 }}
......
src/viewsPc/match/detail.vue
...@@ -272,7 +272,7 @@ function changeMenu(menu, l) { ...@@ -272,7 +272,7 @@ function changeMenu(menu, l) {
272 } 272 }
273 } 273 }
274 function goLogin() { 274 function goLogin() {
275 useUserStore().setReLogin(true) 275 useUserStore().setReLogin()
276 } 276 }
277 function choseSignType() { 277 function choseSignType() {
278 console.log(matchData.value.signType,user) 278 console.log(matchData.value.signType,user)
......
src/viewsPc/match/detail_en.vue
...@@ -104,11 +104,9 @@ ...@@ -104,11 +104,9 @@
104 <label>{{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'E-mail' }}：</label> 104 <label>{{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'E-mail' }}：</label>
105 {{ matchData.contactEmail }}</p> 105 {{ matchData.contactEmail }}</p>
106 </div> 106 </div>
107
108
109 <div style="height: 30px"></div> 107 <div style="height: 30px"></div>
110 <div class="ppl_pb"> 108 <div class="ppl_pb">
111 <el-link class="mr20" v-if="matchData.signKnowUrl" type="primary" 109 <el-link class="mr20" v-if="matchData.signKnowUrl&&JSON.parse(matchData.signKnowUrl)?.length>0" type="primary"
112 :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank"> 110 :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
113 <el-icon :size="20"> 111 <el-icon :size="20">
114 <Download/> 112 <Download/>
...@@ -116,14 +114,14 @@ ...@@ -116,14 +114,14 @@
116 {{ language == 0 ? '报名须知' : 'Notes' }} 114 {{ language == 0 ? '报名须知' : 'Notes' }}
117 </el-link> 115 </el-link>
118 116
119 <el-link class="mr20" v-if="matchData.disclaimerUrl" type="primary" 117 <el-link class="mr20" v-if="matchData.disclaimerUrl&&JSON.parse(matchData.disclaimerUrl)?.length>0" type="primary"
120 :href="fillImgUrl(JSON.parse(matchData.disclaimerUrl)[0]?.url)" target="_blank"> 118 :href="fillImgUrl(JSON.parse(matchData.disclaimerUrl)[0]?.url)" target="_blank">
121 <el-icon :size="20"> 119 <el-icon :size="20">
122 <Download/> 120 <Download/>
123 </el-icon> 121 </el-icon>
124 {{ language == 0 ? '免责声明' : 'Disclaimers' }} 122 {{ language == 0 ? '免责声明' : 'Disclaimers' }}
125 </el-link> 123 </el-link>
126 <el-link v-if="matchData.ruleUrl" type="primary" 124 <el-link v-if="matchData.ruleUrl&&JSON.parse(matchData.ruleUrl)?.length>0" type="primary"
127 :href="fillImgUrl(JSON.parse(matchData.ruleUrl)[0]?.url)" 125 :href="fillImgUrl(JSON.parse(matchData.ruleUrl)[0]?.url)"
128 target="_blank"> 126 target="_blank">
129 <el-icon :size="20"> 127 <el-icon :size="20">
...@@ -155,7 +153,7 @@ ...@@ -155,7 +153,7 @@
155 153
156 <div class="flexCenter"> 154 <div class="flexCenter">
157 <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" type="primary" round 155 <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" type="primary" round
158 class="btn-lineG mb20 mt20 w100" 156 class="btn-lineG mt10 w100"
159 @click="choseSignType" style="font-size: 16px"> 157 @click="choseSignType" style="font-size: 16px">
160 {{ language == 0 ? '我要报名' : 'Register' }} 158 {{ language == 0 ? '我要报名' : 'Register' }}
161 </el-button> 159 </el-button>
...@@ -165,8 +163,9 @@ ...@@ -165,8 +163,9 @@
165 <div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center"> 163 <div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">
166 {{ language == 0 ? '报名未开始' : 'Not started yet' }} 164 {{ language == 0 ? '报名未开始' : 'Not started yet' }}
167 </div> 165 </div>
168
169 </div> 166 </div>
167 <p class="text-gray text-center">{{ language==0?'报名截止':'Registration Deadline' }}：{{ matchData.signEndTime?.slice(0,10) }}</p>
168
170 </el-col> 169 </el-col>
171 </el-row> 170 </el-row>
172 </el-card> 171 </el-card>
...@@ -520,7 +519,7 @@ function goPersonalSign() { ...@@ -520,7 +519,7 @@ function goPersonalSign() {
520 } 519 }
521 520
522 function goLogin() { 521 function goLogin() {
523 useUserStore().setReLogin(true) 522 useUserStore().setReLogin()
524 } 523 }
525 524
526 function goGeren() { 525 function goGeren() {
......
src/viewsPc/match/index.vue
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
104 <a class="btn-lineG mb20 mauto" v-if="n.time>0" style="display: block;"> 104 <a class="btn-lineG mb20 mauto" v-if="n.time>0" style="display: block;">
105 {{ language==0?'我要报名':'Register' }}</a> 105 {{ language==0?'我要报名':'Register' }}</a>
106 <div v-else style="opacity: 0.5;" class="btn-lineG mb20 mauto">{{ language==0?'报名已结束':'Registration has ended' }}</div> 106 <div v-else style="opacity: 0.5;" class="btn-lineG mb20 mauto">{{ language==0?'报名已结束':'Registration has ended' }}</div>
107 <p class="text-gray">{{ language==0?'报名截止':'Registration Deadline' }}：{{ n.signEndTime?.slice(0,10) }}</p>
107 </div> 108 </div>
108 </el-col> 109 </el-col>
109 </el-row> 110 </el-row>
......
src/viewsPc/register/components/beauty-step.vue
1 <template> 1 <template>
2 <el-card> 2 <el-card>
3 <el-steps :active="activeStep" finish-status="success" align-center> 3 <el-steps :active="activeStep" finish-status="success" align-center>
4 <el-step :title="language==0?'创建账号':'Check WDSF ID'"/> 4 <el-step :title="language==0?'创建账号':'Check WDSF MIN'"/>
5 <el-step :title="language==0?'账号信息':'Participant Registration'" /> 5 <el-step :title="language==0?'账号信息':'Participant Registration'" />
6 <!-- <el-step :title="language==0?'提交审核':'Submit for review'" />--> 6 <!-- <el-step :title="language==0?'提交审核':'Submit for review'" />-->
7 <el-step :title="language==0?'注册完成':'stered successfully'" /> 7 <el-step :title="language==0?'注册完成':'stered successfully'" />
......
src/viewsPc/register/components/personal-step.vue
1 <template> 1 <template>
2 <el-card> 2 <el-card>
3 <el-steps :active="activeStep" finish-status="success" align-center> 3 <el-steps :active="activeStep" finish-status="success" align-center>
4 <el-step :title="language==0?'创建账号':'Check WDSF ID'"/> 4 <el-step :title="language==0?'创建账号':'Check WDSF MIN'"/>
5 <el-step :title="language==0?'选手报名':'Participant Registration'" /> 5 <el-step :title="language==0?'选手报名':'Participant Registration'" />
6 <el-step :title="language==0?'提交审核':'Submit for review'" /> 6 <el-step :title="language==0?'提交审核':'Submit for review'" />
7 <!-- <el-step :title="language==0?'注册完成':'stered successfully'" />--> 7 <!-- <el-step :title="language==0?'注册完成':'stered successfully'" />-->
......
src/viewsPc/register/personal.vue
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
20 </el-button> 20 </el-button>
21 </template> 21 </template>
22 </el-input> 22 </el-input>
23 <a class="text-primary text-sm mt10" href="https://www.worlddancesport.org/Athlete/List" target="_blank">
24 <el-icon><Link /></el-icon>
25 {{language==0?'去WDSF官网查询我的会员号':'Search my WSDF MIN on the WDSF official website'}}
26 </a>
27
23 </el-form-item> 28 </el-form-item>
24 <div class="h30"></div> 29 <div class="h30"></div>
25 <div class="leftboderTT">{{ language == 0 ? '个人信息' : 'Personal information' }} 30 <div class="leftboderTT">{{ language == 0 ? '个人信息' : 'Personal information' }}
...@@ -91,8 +96,14 @@ ...@@ -91,8 +96,14 @@
91 v-if="language==0">(登录时需要验证，保护账户信息)</span></div> 96 v-if="language==0">(登录时需要验证，保护账户信息)</span></div>
92 <div class="h20"></div> 97 <div class="h20"></div>
93 <el-form-item :label="language==0?'邮箱':'E-mail'" required> 98 <el-form-item :label="language==0?'邮箱':'E-mail'" required>
94 <el-input type="text" v-model="wdsfData.email" @change="resetCode(1)" autocomplete="false" 99 <div class="pvbox">
95 @blur="verifyCode" :disabled="wdsfData.personFlag=='1'"/> 100 <el-input type="text" v-model="wdsfData.email" @change="resetCode(1)" autocomplete="false"
101 @blur="verifyCode" :disabled="wdsfData.personFlag=='1'"/>
102
103 <span class="text-primary" v-if="wdsfData.personFlag=='1'" @click="forgetPassword(wdsfData.email)">忘记密码</span>
104 </div>
105
106
96 <div class="tip" v-if="wdsfData.personFlag=='0'"> 107 <div class="tip" v-if="wdsfData.personFlag=='0'">
97 <div v-if="language==0"> 108 <div v-if="language==0">
98 （请填写正确的邮箱信息，邮箱信息在注册完成后无法修改。 109 （请填写正确的邮箱信息，邮箱信息在注册完成后无法修改。
...@@ -138,7 +149,7 @@ ...@@ -138,7 +149,7 @@
138 <el-button class="primary-kx" round @click="goBack"> {{ language == 0 ? '取消' : 'Cancel' }}</el-button> 149 <el-button class="primary-kx" round @click="goBack"> {{ language == 0 ? '取消' : 'Cancel' }}</el-button>
139 <el-button type="primary" class="btn-lineG w200px" round @click="next" v-if="wdsfData.wdsfFlag=='1'"> 150 <el-button type="primary" class="btn-lineG w200px" round @click="next" v-if="wdsfData.wdsfFlag=='1'">
140 <span v-if="matchId=='0'">{{ language == 0 ? '立即注册' : 'Register Now' }}</span> 151 <span v-if="matchId=='0'">{{ language == 0 ? '立即注册' : 'Register Now' }}</span>
141 <span>{{ language == 0 ? '下一步' : 'Next' }}</span> 152 <span v-else>{{ language == 0 ? '下一步' : 'Next' }}</span>
142 </el-button> 153 </el-button>
143 </div> 154 </div>
144 </el-card> 155 </el-card>
...@@ -163,6 +174,7 @@ import PersonalStep from "@/viewsPc/register/components/personal-step"; ...@@ -163,6 +174,7 @@ import PersonalStep from "@/viewsPc/register/components/personal-step";
163 import FileUpload from "@/components/FileUpload"; 174 import FileUpload from "@/components/FileUpload";
164 import {useRouter, useRoute} from "vue-router"; 175 import {useRouter, useRoute} from "vue-router";
165 import {useStorage} from "@vueuse/core/index"; 176 import {useStorage} from "@vueuse/core/index";
177 import useUserStore from "@/store/modules/user";
166 178
167 const language= useStorage('language',0) 179 const language= useStorage('language',0)
168 const router = useRouter() 180 const router = useRouter()
...@@ -275,6 +287,7 @@ function codeSuccess(msg) { ...@@ -275,6 +287,7 @@ function codeSuccess(msg) {
275 counting.value = true 287 counting.value = true
276 getCaptchaSms({account: wdsfData.value.email}).then(res => { 288 getCaptchaSms({account: wdsfData.value.email}).then(res => {
277 isCodeTrue.value = 1 289 isCodeTrue.value = 1
290 ElMessage.success(language.value == 0 ? '发送成功,请关注邮箱邮件' :'Send success, please check your email')
278 }).catch(err => { 291 }).catch(err => {
279 isCodeTrue.value = 1 292 isCodeTrue.value = 1
280 }) 293 })
...@@ -306,6 +319,7 @@ function next() { ...@@ -306,6 +319,7 @@ function next() {
306 ElMessage.warning(language.value == 0 ? '请上传护照文件' :'Please upload your passport file') 319 ElMessage.warning(language.value == 0 ? '请上传护照文件' :'Please upload your passport file')
307 return 320 return
308 } 321 }
322 console.log(wdsfData.value.personFlag)
309 if (wdsfData.value.personFlag == '0') { 323 if (wdsfData.value.personFlag == '0') {
310 let obj = { 324 let obj = {
311 card: form.value.card, 325 card: form.value.card,
...@@ -383,9 +397,15 @@ function afterR() { ...@@ -383,9 +397,15 @@ function afterR() {
383 }) 397 })
384 } 398 }
385 } 399 }
400 function forgetPassword(account) {
401 useUserStore().setReLogin({account: account,active:2})
402 }
386 </script> 403 </script>
387 404
388 <style scoped lang="scss"> 405 <style scoped lang="scss">
406 .pvbox{position: relative;width: 100%;
407 .text-primary{position: absolute;right: -5em;cursor: pointer;text-decoration: underline;}
408 }
389 .tip { 409 .tip {
390 line-height: 1.6; 410 line-height: 1.6;
391 font-size: 12px; 411 font-size: 12px;
......
src/viewsPc/register/team/step1.vue
...@@ -115,6 +115,7 @@ function codeSuccess(msg) { ...@@ -115,6 +115,7 @@ function codeSuccess(msg) {
115 getCaptchaSms({account: form.value.account}).then(res => { 115 getCaptchaSms({account: form.value.account}).then(res => {
116 counting.value = true 116 counting.value = true
117 isCodeTrue.value = true 117 isCodeTrue.value = true
118 ElMessage.success(language.value == 0 ? '发送成功,请关注邮箱邮件' :'Send success, please check your email')
118 }) 119 })
119 } 120 }
120 121
......
src/viewsPc/register/team/step2.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-form class="d-form" size="large" :model="form" ref="registerRef" 25 <el-form class="d-form" size="large" :model="form" ref="registerRef"
26 :rules="form.is=='0'?registerRules:registerRulesEn" label-width="120" :label-position="language==0?'left':'top'" 26 :rules="form.is=='0'?registerRules:registerRulesEn" label-width="120" :label-position="language==0?'left':'top'"
27 style="max-width: 500px;margin: auto"> 27 style="max-width: 500px;margin: auto">
28 <el-form-item :label="language==0?'是否国家队':'National Team'" required> 28 <el-form-item :label="language==0?'是否国家队':'National Team'" required v-show="language==0">
29 <el-select filterable v-model="form.is" @change="changeIs"> 29 <el-select filterable v-model="form.is" @change="changeIs">
30 <el-option :label="language==0?'是':'Yes'" value="1"></el-option> 30 <el-option :label="language==0?'是':'Yes'" value="1"></el-option>
31 <el-option :label="language==0?'否':'No'" value="0"></el-option> 31 <el-option :label="language==0?'否':'No'" value="0"></el-option>
......
src/viewsPc/register/team/step3.vue
...@@ -19,10 +19,7 @@ ...@@ -19,10 +19,7 @@
19 <script setup> 19 <script setup>
20 import {reactive,toRefs} from "@vue/runtime-core"; 20 import {reactive,toRefs} from "@vue/runtime-core";
21 const router = useRouter() 21 const router = useRouter()
22 import Vcode from "vue3-puzzle-vcode"
23 import {ElMessage} from 'element-plus' 22 import {ElMessage} from 'element-plus'
24 import CountDown from '@chenfengyuan/vue-countdown'
25 import {getCaptchaSms, checkRegisterCode} from "@/apiPc/match"
26 import {useRouter} from "vue-router"; 23 import {useRouter} from "vue-router";
27 import {useStorage} from "@vueuse/core/index"; 24 import {useStorage} from "@vueuse/core/index";
28 const language= useStorage('language',0) 25 const language= useStorage('language',0)
......
src/viewsPc/register/team/team.vue
...@@ -33,7 +33,7 @@ const data = reactive({ ...@@ -33,7 +33,7 @@ const data = reactive({
33 isCodeTrue:false, 33 isCodeTrue:false,
34 counting:false, 34 counting:false,
35 form:{ 35 form:{
36 userName:'1111' 36 userName:''
37 }, 37 },
38 activeStep: 0 38 activeStep: 0
39 }) 39 })
......
src/viewsPc/saiC/index.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <table class="table table-striped"> 40 <table class="table table-striped">
41 <thead> 41 <thead>
42 <tr class="bg-lineg"> 42 <tr class="bg-lineg">
43 <td class="text-center">{{ language==0?'名次':'RANK' }}</td> 43 <td class="text-center" style="width: 120px;">{{ language==0?'名次':'RANK' }}</td>
44 <td class="text-center">{{ language==0?'组合':'COUPLE' }}</td> 44 <td class="text-center">{{ language==0?'组合':'COUPLE' }}</td>
45 <td class="text-center w15">{{ language==0?'国家':'COUNTRY' }}</td> 45 <td class="text-center w15">{{ language==0?'国家':'COUNTRY' }}</td>
46 <td class="text-center w15">START #</td> 46 <td class="text-center w15">START #</td>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!