e80e0f3a by 杨炀

no message

1 parent 690bff48
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
5 <el-carousel-item style="height: 450px;"> 5 <el-carousel-item style="height: 450px;">
6 <div class="bannerItem"> 6 <div class="bannerItem">
7 <div class="h100"> 7 <div class="h100">
8 <img class="bannerImg" src="@/assets/dance/banner.png"> 8 <img v-if="matchData.bgImgUrl" class="bannerImg" :src="fillImgUrl(matchData.bgImgUrl)">
9 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
9 <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;">
10 <div class="banner-count"> 11 <div class="banner-count">
11 Countdown 12 Countdown
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
35 36
36 <div class="box zn-bg"> 37 <div class="box zn-bg">
37 <div class="zn-Box"> 38 <div class="zn-Box">
39 <img class="bbbg" v-if="matchData.logoUrl" :src="fillImgUrl(matchData.logoUrl)"/>
38 <el-row> 40 <el-row>
39 <el-col :sm="24" :lg="10"> 41 <el-col :sm="24" :lg="10">
40 <div class="bgbg"> 42 <div class="bgbg">
...@@ -384,6 +386,7 @@ import r03 from '@/assets/dance/r03.png' ...@@ -384,6 +386,7 @@ import r03 from '@/assets/dance/r03.png'
384 import r04 from '@/assets/dance/r04.png' 386 import r04 from '@/assets/dance/r04.png'
385 import r05 from '@/assets/dance/r05.png' 387 import r05 from '@/assets/dance/r05.png'
386 import r06 from '@/assets/dance/r06.png' 388 import r06 from '@/assets/dance/r06.png'
389 import * as match from "@/apiPc/match";
387 390
388 const modules = [Autoplay, Navigation] 391 const modules = [Autoplay, Navigation]
389 const navigationPic = ref({ 392 const navigationPic = ref({
...@@ -425,6 +428,7 @@ const livelist = ref([]) ...@@ -425,6 +428,7 @@ const livelist = ref([])
425 const picList = ref([]) 428 const picList = ref([])
426 const calendarValue = ref('2024-07-22') 429 const calendarValue = ref('2024-07-22')
427 const showgg = ref(true) 430 const showgg = ref(true)
431 const matchData = ref({})
428 onMounted(() => { 432 onMounted(() => {
429 init() 433 init()
430 }) 434 })
...@@ -454,11 +458,13 @@ const init = () => { ...@@ -454,11 +458,13 @@ const init = () => {
454 ).then(res => { 458 ).then(res => {
455 newest2.value = res.rows 459 newest2.value = res.rows
456 }) 460 })
457 461 match.getMaList().then((res) => {
458 // getHotActivity({ pageSize: 4, pageNum: 1 }) 462 match.getMatchById({id: res.rows[0].id}).then(RR => {
459 // .then((res) => { 463 matchData.value = RR.data
460 // hotActivity.value = res.rows 464 // var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
461 // }) 465 // time.value = dayjs(RR.data.signEndTime).diff(today, 'millisecond')
466 })
467 })
462 } 468 }
463 469
464 470
...@@ -493,7 +499,8 @@ const goList = (query, name) => { ...@@ -493,7 +499,8 @@ const goList = (query, name) => {
493 <style scoped lang="scss"> 499 <style scoped lang="scss">
494 .zn-bg{background: linear-gradient(90deg, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #453DEA, #8623FC); 500 .zn-bg{background: linear-gradient(90deg, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #453DEA, #8623FC);
495 border-radius: 15px;} 501 border-radius: 15px;}
496 .zn-Box{background: url("@/assets/dance/cszn_bg.png") no-repeat top left;background-size: contain; 502 .zn-Box{background-size: contain;position: relative;overflow: hidden;
503 .bbbg{position: absolute;width: 100%;height: 100%;object-fit: cover;}
497 .bgbg{ 504 .bgbg{
498 padding: 5%; 505 padding: 5%;
499 img{margin: 5% 0} 506 img{margin: 5% 0}
......
...@@ -393,34 +393,33 @@ function submitForm(n) { ...@@ -393,34 +393,33 @@ function submitForm(n) {
393 return 393 return
394 } 394 }
395 } 395 }
396 396 }
397 if (showPersonList.value) { 397 if (showPersonList.value) {
398 if (myMemberTable.value.length == 0) { 398 if (myMemberTable.value.length == 0) {
399 ElMessageBox.confirm(language.value == 0 ? '是否继续添加随性人员?' : 'Do you want to add casual personnel?', 399 ElMessageBox.confirm(language.value == 0 ? '是否继续添加随性人员?' : 'Do you want to add casual personnel?',
400 language.value == 0 ? '提示' : 'Tip', {
401 confirmButtonText: language.value == 0 ? '确定' : 'Yes',
402 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
403 type: 'warning'
404 }).then(() => {
405
406 }).catch(() => {
407 commit()
408 })
409 } else {
410 commit()
411 }
412 } else {
413 ElMessageBox.confirm(language.value == 0 ? '是否添加随性人员?' : 'Do you want to add casual personnel?',
414 language.value == 0 ? '提示' : 'Tip', { 400 language.value == 0 ? '提示' : 'Tip', {
415 confirmButtonText: language.value == 0 ? '确定' : 'Yes', 401 confirmButtonText: language.value == 0 ? '确定' : 'Yes',
416 cancelButtonText: language.value == 0 ? '取消' : 'Cancel', 402 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
417 type: 'warning' 403 type: 'warning'
418 }).then(() => { 404 }).then(() => {
419 showPersonList.value = true 405
420 }).catch(() => { 406 }).catch(() => {
421 commit() 407 commit()
422 }) 408 })
409 } else {
410 commit()
423 } 411 }
412 } else {
413 ElMessageBox.confirm(language.value == 0 ? '是否添加随性人员?' : 'Do you want to add casual personnel?',
414 language.value == 0 ? '提示' : 'Tip', {
415 confirmButtonText: language.value == 0 ? '确定' : 'Yes',
416 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
417 type: 'warning'
418 }).then(() => {
419 showPersonList.value = true
420 }).catch(() => {
421 commit()
422 })
424 } 423 }
425 // if (n == 0) { 424 // if (n == 0) {
426 // ElMessageBox.confirm(language.value==0?`您当前的操作为暂存,并不是提交审核, 425 // ElMessageBox.confirm(language.value==0?`您当前的操作为暂存,并不是提交审核,
...@@ -620,7 +619,7 @@ const goPersonInfo = (row) => { ...@@ -620,7 +619,7 @@ const goPersonInfo = (row) => {
620 console.log(row) 619 console.log(row)
621 // debugger 620 // debugger
622 const params = { 621 const params = {
623 title: '完善补充信息', 622 title: language.value==0?'完善补充信息':'Complete the supplementary information',
624 participantsInfoArr: extraform.value, 623 participantsInfoArr: extraform.value,
625 personId: row.personInfo.id, 624 personId: row.personInfo.id,
626 extraId: row.extraPersonInfo?.id || 0 625 extraId: row.extraPersonInfo?.id || 0
......
...@@ -562,7 +562,7 @@ const goPersonInfo = (row) => { ...@@ -562,7 +562,7 @@ const goPersonInfo = (row) => {
562 console.log(row) 562 console.log(row)
563 // debugger 563 // debugger
564 const params = { 564 const params = {
565 title: '完善补充信息', 565 title: language.value==0?'完善补充信息':'Complete the supplementary information',
566 participantsInfoArr: extraform.value, 566 participantsInfoArr: extraform.value,
567 personId: row.personInfo.id, 567 personId: row.personInfo.id,
568 extraId: row.extraPersonInfo?.id || 0 568 extraId: row.extraPersonInfo?.id || 0
......
...@@ -302,6 +302,7 @@ function next() { ...@@ -302,6 +302,7 @@ function next() {
302 } 302 }
303 registerSingle(obj).then(res => { 303 registerSingle(obj).then(res => {
304 setToken(res.data.token) 304 setToken(res.data.token)
305
305 console.log(matchId.value) 306 console.log(matchId.value)
306 afterR() 307 afterR()
307 }) 308 })
...@@ -352,6 +353,10 @@ function afterR() { ...@@ -352,6 +353,10 @@ function afterR() {
352 } 353 }
353 }) 354 })
354 } 355 }
356
357 setTimeout(()=>{
358 location.reload()
359 },500)
355 } 360 }
356 </script> 361 </script>
357 362
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!