Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
867a5b28 by 杨炀
Options

no message

1 parent e5bcf814
Expand all
Inline Side-by-side
Showing 38 changed files with 197 additions and 158 deletions
src/assets/styles/ruoyi.scss
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 color: inherit; 60 color: inherit;
61 } 61 }
62 img{display: block;} 62 img{display: block;}
63 63 .text-sm{font-size: 13px}
64 .el-tabs__active-bar{ 64 .el-tabs__active-bar{
65 &::before{ 65 &::before{
66 content: '';position: absolute;top: -4px; 66 content: '';position: absolute;top: -4px;
......
src/components/FileImport/index.vue
...@@ -117,10 +117,9 @@ const uploadList = ref([]) ...@@ -117,10 +117,9 @@ const uploadList = ref([])
117 // const baseUrl = import.meta.env.VITE_APP_BASE_API; 117 // const baseUrl = import.meta.env.VITE_APP_BASE_API;
118 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址 118 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址
119 const language = useStorage('language', 0) 119 const language = useStorage('language', 0)
120
121 const headers = ref({ 120 const headers = ref({
122 Authorization: 'Bearer ' + getToken(), 121 Authorization: 'Bearer ' + getToken(),
123 ['Content-Language'] : language==0? 'zh_CN':'en_US' , 122 ['Content-Language'] : language.value==0? 'zh_CN':'en_US' ,
124 }) 123 })
125 const fileList = ref([]) 124 const fileList = ref([])
126 const showTip = computed( 125 const showTip = computed(
......
src/layoutPc/components/AppHeader.vue
...@@ -179,6 +179,9 @@ onMounted(() => { ...@@ -179,6 +179,9 @@ onMounted(() => {
179 console.log(activeIndex.value) 179 console.log(activeIndex.value)
180 }) 180 })
181 function changeLanguage(n) { 181 function changeLanguage(n) {
182 if(language.value == n){
183 return
184 }
182 proxy.$modal.loading() 185 proxy.$modal.loading()
183 language.value = n 186 language.value = n
184 } 187 }
......
src/viewsPc/center/myInfo.vue
...@@ -178,7 +178,7 @@ function save() { ...@@ -178,7 +178,7 @@ function save() {
178 function checkCode() { 178 function checkCode() {
179 if (myform.value.idcType == 0 && myform.value.idcCode) { 179 if (myform.value.idcType == 0 && myform.value.idcCode) {
180 if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(myform.value.idcCode))) { 180 if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(myform.value.idcCode))) {
181 ElMessage.error('请输入正确的身份证号码') 181 ElMessage.warning('请输入正确的身份证号码')
182 } else { 182 } else {
183 let tmpStr = '' 183 let tmpStr = ''
184 if (myform.value.idcCode.length == 15) { 184 if (myform.value.idcCode.length == 15) {
......
src/viewsPc/center/myMatch.vue
...@@ -134,6 +134,13 @@ function reSign(n){ ...@@ -134,6 +134,13 @@ function reSign(n){
134 }) 134 })
135 } 135 }
136 function continueSign(n){ 136 function continueSign(n){
137 if(n.status=='0'){
138 ElMessage({
139 message: 'The current event is offline.',
140 type: 'warning'
141 })
142 return
143 }
137 if (user.utype == '1') { 144 if (user.utype == '1') {
138 // 个人报名 145 // 个人报名
139 router.push({ 146 router.push({
......
src/viewsPc/index.vue
...@@ -385,12 +385,6 @@ import {Swiper, SwiperSlide} from 'swiper/vue' ...@@ -385,12 +385,6 @@ import {Swiper, SwiperSlide} from 'swiper/vue'
385 import {Autoplay, Navigation} from 'swiper' 385 import {Autoplay, Navigation} from 'swiper'
386 import 'swiper/css' 386 import 'swiper/css'
387 import {dayjs} from 'element-plus' 387 import {dayjs} from 'element-plus'
388 import r01 from '@/assets/dance/r01.png'
389 import r02 from '@/assets/dance/r02.png'
390 import r03 from '@/assets/dance/r03.png'
391 import r04 from '@/assets/dance/r04.png'
392 import r05 from '@/assets/dance/r05.png'
393 import r06 from '@/assets/dance/r06.png'
394 import * as match from "@/apiPc/match"; 388 import * as match from "@/apiPc/match";
395 389
396 const modules = [Autoplay, Navigation] 390 const modules = [Autoplay, Navigation]
...@@ -407,12 +401,12 @@ const canNext = ref(false) ...@@ -407,12 +401,12 @@ const canNext = ref(false)
407 const activeRankName = ref(0) 401 const activeRankName = ref(0)
408 const time = ref(0) 402 const time = ref(0)
409 const personList = ref([ 403 const personList = ref([
410 {name: '张晋', pp: '欧洲舞团团长、艺术总监', src: r01}, 404 { name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' },
411 {name: '王晓敏', pp: '欧洲舞团团长、艺术总监', src: r02}, 405 { name: 'Nenad Jeftic', pp: '标准舞裁判长 塞尔维亚', src: '/img/2.png' },
412 {name: '徐徐', pp: '欧洲舞团团长、艺术总监', src: r03}, 406 { name: 'Dorel Bagiu', pp: '罗马尼亚', src: '/img/3.png' },
413 {name: '汪莉莉', pp: '欧洲舞团团长、艺术总监', src: r04}, 407 { name: 'Eduard Korotin', pp: ' 爱沙尼亚', src: '/img/4.png' },
414 {name: '蒋云澜', pp: '欧洲舞团团长、艺术总监', src: r05}, 408 { name: 'Ana Cristina Silva', pp: '葡萄牙', src: '/img/5.png'},
415 {name: '钱一帆', pp: '欧洲舞团团长、艺术总监', src: r06} 409 { name: 'Dallas Leslie Williams', pp: '记分长 澳大利亚', src: '/img/6.png' }
416 ]) 410 ])
417 const activeNews = ref(0) 411 const activeNews = ref(0)
418 const banners = ref([]) 412 const banners = ref([])
...@@ -493,9 +487,9 @@ const goDetail = (n) => { ...@@ -493,9 +487,9 @@ const goDetail = (n) => {
493 } 487 }
494 } 488 }
495 const goLeaderInfo = (n) => { 489 const goLeaderInfo = (n) => {
496 router.push({ 490 // router.push({
497 path: `/about/leaderInfo/${n.id || 0}` 491 // path: `/about/leaderInfo/${n.id || 0}`
498 }) 492 // })
499 } 493 }
500 const goList = (query, name) => { 494 const goList = (query, name) => {
501 query.sortName = name 495 query.sortName = name
...@@ -864,43 +858,44 @@ const goMatch = (n) => { ...@@ -864,43 +858,44 @@ const goMatch = (n) => {
864 } 858 }
865 } 859 }
866 860
867 .teacher { 861 .teacher{height: 410px;background: #fff;
868 height: 330px; 862 position: relative;border-radius: 10px;overflow: hidden;
869 background: #fff; 863 .imgbox{background: linear-gradient(0,#C8AAFC,#fff)}
870 position: relative; 864 img{height: 350px;width: 100%;object-fit: cover;}
871 border-radius: 10px; 865 h3{color: #fff;background: url("@/assets/dance/name_bg.png") no-repeat center;
872 overflow: hidden; 866 background-size:110% 100%;text-align: center;height: 30px;line-height: 30px;
873 867 font-size: 18px;position: absolute;width: 100%;bottom: 30px;}
874 .imgbox { 868 p{text-align: center;margin: 25px 0 0;
875 background: linear-gradient(0, #C8AAFC, #fff) 869 font-size: 14px;}
870 }
871 @media screen and (max-width: 1650px) {
872 .teacher{height: 320px;
873 .imgbox{
874 img{height: 260px}
875 }
876 } 876 }
877 877 }
878 img { 878 @media screen and (max-width: 1200px) {
879 height: 270px; 879 .teacher{height: 450px;margin: 0 0 20px;
880 width: 100%; 880 .imgbox{
881 object-fit: cover; 881 img{height: 390px}
882 }
882 } 883 }
883 884 }
884 h3 { 885 @media screen and (max-width: 900px) {
885 color: #fff; 886 .teacher{height: 400px;margin: 0 0 20px;
886 background: url("@/assets/dance/name_bg.png") no-repeat center; 887 .imgbox{
887 background-size: auto 100%; 888 img{height: 340px}
888 text-align: center; 889 }
889 height: 30px;
890 line-height: 30px;
891 font-size: 18px;
892 position: absolute;
893 width: 100%;
894 bottom: 30px;
895 } 890 }
896 891 }
897 p { 892 @media screen and (max-width: 800px) {
898 text-align: center; 893 .teacher{height: 400px;margin: 0 0 20px;
899 margin: 25px 0 0; 894 .imgbox{
900 font-size: 14px; 895 img{height: 260px}
896 }
901 } 897 }
902 } 898 }
903
904 .aboutBox { 899 .aboutBox {
905 background: url("@/assets/dance/about_bg.png") no-repeat center; 900 background: url("@/assets/dance/about_bg.png") no-repeat center;
906 height: 375px; 901 height: 375px;
......
src/viewsPc/index_en.vue
...@@ -282,13 +282,13 @@ ...@@ -282,13 +282,13 @@
282 </div> 282 </div>
283 <el-row :gutter="20"> 283 <el-row :gutter="20">
284 <el-col 284 <el-col
285 v-for="n in personList" :key="n.name" :sm="12" :xl="4" :xs="12" 285 v-for="n in personList" :key="n.name" :sm="8" :xl="4" :xs="12"
286 :lg="4" 286 :lg="4"
287 > 287 >
288 <div class="teacher"> 288 <div class="teacher">
289 <div class="imgbox"><img :src="n.src"></div> 289 <div class="imgbox"><img :src="n.src"></div>
290 <h3 class="esp">{{ n.name }}</h3> 290 <h3 class="esp">{{ n.name }}</h3>
291 <p class="esp text-primary">{{ n.pp }}</p> 291 <p class="esp_2 text-primary">{{ n.pp }}</p>
292 </div> 292 </div>
293 </el-col> 293 </el-col>
294 </el-row> 294 </el-row>
...@@ -384,12 +384,6 @@ import { Swiper, SwiperSlide } from 'swiper/vue' ...@@ -384,12 +384,6 @@ import { Swiper, SwiperSlide } from 'swiper/vue'
384 import { Autoplay, Navigation } from 'swiper' 384 import { Autoplay, Navigation } from 'swiper'
385 import 'swiper/css' 385 import 'swiper/css'
386 import { dayjs } from 'element-plus' 386 import { dayjs } from 'element-plus'
387 import r01 from '@/assets/dance/r01.png'
388 import r02 from '@/assets/dance/r02.png'
389 import r03 from '@/assets/dance/r03.png'
390 import r04 from '@/assets/dance/r04.png'
391 import r05 from '@/assets/dance/r05.png'
392 import r06 from '@/assets/dance/r06.png'
393 import * as match from "@/apiPc/match"; 387 import * as match from "@/apiPc/match";
394 import {rankList} from '@/assets/js/data' 388 import {rankList} from '@/assets/js/data'
395 const modules = [Autoplay, Navigation] 389 const modules = [Autoplay, Navigation]
...@@ -401,12 +395,12 @@ const router = useRouter() ...@@ -401,12 +395,12 @@ const router = useRouter()
401 const { proxy } = getCurrentInstance() 395 const { proxy } = getCurrentInstance()
402 const time = ref(0) 396 const time = ref(0)
403 const personList = ref([ 397 const personList = ref([
404 { name: 'Zhang Jin', pp: 'artistic director', src: r01 }, 398 { name: 'Wolfgang Eliasch', pp: 'Chairperson for Latin AUT', src: '/img/1.png' },
405 { name: 'Wang min', pp: 'regimental commander', src: r02 }, 399 { name: 'Nenad Jeftic', pp: 'Chairperson for Standard SRB', src: '/img/2.png' },
406 { name: 'Xuxu', pp: 'artistic director', src: r03 }, 400 { name: 'Dorel Bagiu', pp: 'ROU', src: '/img/3.png' },
407 { name: 'Wang Li', pp: 'regimental commander ', src: r04 }, 401 { name: 'Eduard Korotin', pp: ' EST', src: '/img/4.png' },
408 { name: 'Yunlan', pp: 'artistic director', src: r05}, 402 { name: 'Ana Cristina Silva', pp: 'POR', src: '/img/5.png'},
409 { name: 'Qian Yifan', pp: 'artistic director', src: r06 } 403 { name: 'Dallas Leslie Williams', pp: 'Scrutineer AUS', src: '/img/6.png' }
410 ]) 404 ])
411 const activeNews = ref(0) 405 const activeNews = ref(0)
412 const banners = ref([]) 406 const banners = ref([])
...@@ -543,7 +537,6 @@ const goMatch = (n) => { ...@@ -543,7 +537,6 @@ const goMatch = (n) => {
543 .bannerItem { 537 .bannerItem {
544 height: 450px; 538 height: 450px;
545 background: #000;position: relative; 539 background: #000;position: relative;
546
547 .banner-count{position: absolute;padding: 20px 40px; 540 .banner-count{position: absolute;padding: 20px 40px;
548 font-size: 20px;align-items: center; 541 font-size: 20px;align-items: center;
549 overflow: hidden; 542 overflow: hidden;
...@@ -701,16 +694,44 @@ const goMatch = (n) => { ...@@ -701,16 +694,44 @@ const goMatch = (n) => {
701 } 694 }
702 } 695 }
703 696
704 .teacher{height: 330px;background: #fff; 697 .teacher{height: 410px;background: #fff;
705 position: relative;border-radius: 10px;overflow: hidden; 698 position: relative;border-radius: 10px;overflow: hidden;
706 .imgbox{background: linear-gradient(0,#C8AAFC,#fff)} 699 .imgbox{background: linear-gradient(0,#C8AAFC,#fff)}
707 img{height: 270px;width: 100%;object-fit: cover;} 700 img{height: 350px;width: 100%;object-fit: cover;}
708 h3{color: #fff;background: url("@/assets/dance/name_bg.png") no-repeat center; 701 h3{color: #fff;background: url("@/assets/dance/name_bg.png") no-repeat center;
709 background-size:auto 100%;text-align: center;height: 30px;line-height: 30px; 702 background-size:110% 100%;text-align: center;height: 30px;line-height: 30px;
710 font-size: 18px;position: absolute;width: 100%;bottom: 30px;} 703 font-size: 18px;position: absolute;width: 100%;bottom: 30px;}
711 p{text-align: center;margin: 25px 0 0; 704 p{text-align: center;margin: 25px 0 0;
712 font-size: 14px;} 705 font-size: 14px;}
713 } 706 }
707 @media screen and (max-width: 1650px) {
708 .teacher{height: 320px;
709 .imgbox{
710 img{height: 260px}
711 }
712 }
713 }
714 @media screen and (max-width: 1200px) {
715 .teacher{height: 450px;margin: 0 0 20px;
716 .imgbox{
717 img{height: 390px}
718 }
719 }
720 }
721 @media screen and (max-width: 900px) {
722 .teacher{height: 400px;margin: 0 0 20px;
723 .imgbox{
724 img{height: 340px}
725 }
726 }
727 }
728 @media screen and (max-width: 800px) {
729 .teacher{height: 400px;margin: 0 0 20px;
730 .imgbox{
731 img{height: 260px}
732 }
733 }
734 }
714 .aboutBox{background: url("@/assets/dance/about_bg.png") no-repeat center;height: 375px; 735 .aboutBox{background: url("@/assets/dance/about_bg.png") no-repeat center;height: 375px;
715 background-size: cover;padding: 40px 60px; position: relative; 736 background-size: cover;padding: 40px 60px; position: relative;
716 .content{font-size: 18px;line-height: 2.2;height: 240px;overflow: hidden; 737 .content{font-size: 18px;line-height: 2.2;height: 240px;overflow: hidden;
......
src/viewsPc/login.vue
...@@ -345,9 +345,9 @@ function sendsmsMsg() { ...@@ -345,9 +345,9 @@ function sendsmsMsg() {
345 // 忘记密码发信息 345 // 忘记密码发信息
346 if (!changePasswordForm.value.username) { 346 if (!changePasswordForm.value.username) {
347 if (language.value == 0) { 347 if (language.value == 0) {
348 ElMessage.error('请填写手机/邮箱') 348 ElMessage.warning('请填写手机/邮箱')
349 } else { 349 } else {
350 ElMessage.error('Please fill in your phone/email address') 350 ElMessage.warning('Please fill in your phone/email address')
351 } 351 }
352 return 352 return
353 } 353 }
...@@ -381,7 +381,7 @@ function handleChangePassword() { ...@@ -381,7 +381,7 @@ function handleChangePassword() {
381 close() 381 close()
382 }) 382 })
383 } else { 383 } else {
384 ElMessage.error(language.value == 0 ? '请发送验证码' :'Please send the verification code') 384 ElMessage.warning(language.value == 0 ? '请发送验证码' :'Please send the verification code')
385 } 385 }
386 } 386 }
387 }) 387 })
......
src/viewsPc/match/chooseCoach.vue
...@@ -300,7 +300,7 @@ function chooseDone() { ...@@ -300,7 +300,7 @@ function chooseDone() {
300 function goNext() { 300 function goNext() {
301 console.log(form.value) 301 console.log(form.value)
302 if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) { 302 if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
303 ElMessage.error(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one') 303 ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
304 return 304 return
305 } 305 }
306 var obj = { 306 var obj = {
......
src/viewsPc/match/chooseProject.vue
...@@ -55,9 +55,10 @@ ...@@ -55,9 +55,10 @@
55 </el-checkbox> 55 </el-checkbox>
56 </el-checkbox-group> 56 </el-checkbox-group>
57 </div> 57 </div>
58 <div v-else @click="addMate"> 58 <div style="width:50%;" v-else @click="addMate">
59 <div class="addBttn">+</div> 59 <div class="addBttn" style="margin: 0 auto">+</div>
60 <div class="text-center mt10"> 60 <div class="text-center mt10 text-primary text-sm">
61 Please add your partner
61 <el-icon> 62 <el-icon>
62 <Edit/> 63 <Edit/>
63 </el-icon> 64 </el-icon>
...@@ -361,9 +362,9 @@ function getSignInfoList() { ...@@ -361,9 +362,9 @@ function getSignInfoList() {
361 function submitForm(n) { 362 function submitForm(n) {
362 if (signInfoList.value.length == 0) { 363 if (signInfoList.value.length == 0) {
363 if (language.value == 0) { 364 if (language.value == 0) {
364 ElMessage.error('请至少选择一个项目') 365 ElMessage.warning('请至少选择一个项目')
365 } else { 366 } else {
366 ElMessage.error('select at least one project') 367 ElMessage.warning('select at least one project')
367 } 368 }
368 return 369 return
369 } 370 }
...@@ -388,7 +389,7 @@ function submitForm(n) { ...@@ -388,7 +389,7 @@ function submitForm(n) {
388 } 389 }
389 for (const s of signInfoList.value) { 390 for (const s of signInfoList.value) {
390 if (s.extraPersonInfo == null && needBuchong) { 391 if (s.extraPersonInfo == null && needBuchong) {
391 ElMessage.error(language.value == 0 ? '请完善运动员补充信息' : 'Complete Supplementary Information') 392 ElMessage.warning(language.value == 0 ? '请完善运动员补充信息' : 'Complete Supplementary Information')
392 tableType.value = 0 393 tableType.value = 0
393 return 394 return
394 } 395 }
...@@ -490,7 +491,7 @@ function getProjectList() { ...@@ -490,7 +491,7 @@ function getProjectList() {
490 loadingProject.value = false 491 loadingProject.value = false
491 }).catch(err => { 492 }).catch(err => {
492 loadingProject.value = false 493 loadingProject.value = false
493 ElMessage.error(err.msg) 494 ElMessage.warning(err.msg)
494 }) 495 })
495 } 496 }
496 497
......
src/viewsPc/match/chooseSportsman.vue
...@@ -296,7 +296,7 @@ function submitForm() { ...@@ -296,7 +296,7 @@ function submitForm() {
296 } 296 }
297 for (const s of signInfoList.value) { 297 for (const s of signInfoList.value) {
298 if (s.extraPersonInfo == null && needBuchong) { 298 if (s.extraPersonInfo == null && needBuchong) {
299 ElMessage.error(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information') 299 ElMessage.warning(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
300 tableType.value = 0 300 tableType.value = 0
301 return 301 return
302 } 302 }
...@@ -304,9 +304,9 @@ function submitForm() { ...@@ -304,9 +304,9 @@ function submitForm() {
304 } 304 }
305 if (signInfoList.value.length == 0) { 305 if (signInfoList.value.length == 0) {
306 if (language.value == 0) { 306 if (language.value == 0) {
307 ElMessage.error('请至少选择一个项目') 307 ElMessage.warning('请至少选择一个项目')
308 } else { 308 } else {
309 ElMessage.error('select at least one project') 309 ElMessage.warning('select at least one project')
310 } 310 }
311 return 311 return
312 } 312 }
...@@ -358,7 +358,6 @@ function changechoosed(e) { ...@@ -358,7 +358,6 @@ function changechoosed(e) {
358 function getProjectList() { 358 function getProjectList() {
359 projectIds.value = [] 359 projectIds.value = []
360 if (choosedchoosed.value.length == 0) { 360 if (choosedchoosed.value.length == 0) {
361 // ElMessage.error('请先选择运动员')
362 projectList.value = [] 361 projectList.value = []
363 return 362 return
364 } 363 }
...@@ -376,7 +375,7 @@ function getProjectList() { ...@@ -376,7 +375,7 @@ function getProjectList() {
376 } 375 }
377 }).catch(err => { 376 }).catch(err => {
378 loadingProject.value = false 377 loadingProject.value = false
379 ElMessage.error(err.msg) 378 ElMessage.warning(err.msg)
380 }) 379 })
381 } 380 }
382 381
...@@ -584,7 +583,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -584,7 +583,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
584 groupId: groupId.value 583 groupId: groupId.value
585 }).then(res => { 584 }).then(res => {
586 if(!res.data){ 585 if(!res.data){
587 ElMessage.error(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again') 586 ElMessage.warning(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
588 choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal)) 587 choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal))
589 588
590 for(var c of choosed2List.value){ 589 for(var c of choosed2List.value){
......
src/viewsPc/match/chooseSportsman2.vue
...@@ -276,7 +276,7 @@ function submitForm() { ...@@ -276,7 +276,7 @@ function submitForm() {
276 } 276 }
277 for (const s of signInfoList.value) { 277 for (const s of signInfoList.value) {
278 if (s.extraPersonInfo == null && needBuchong) { 278 if (s.extraPersonInfo == null && needBuchong) {
279 ElMessage.error(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information') 279 ElMessage.warning(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
280 tableType.value = 0 280 tableType.value = 0
281 return 281 return
282 } 282 }
...@@ -284,9 +284,9 @@ function submitForm() { ...@@ -284,9 +284,9 @@ function submitForm() {
284 } 284 }
285 if (signInfoList.value.length == 0) { 285 if (signInfoList.value.length == 0) {
286 if (language.value == 0) { 286 if (language.value == 0) {
287 ElMessage.error('请至少选择一个项目') 287 ElMessage.warning('请至少选择一个项目')
288 } else { 288 } else {
289 ElMessage.error('select at least one project') 289 ElMessage.warning('select at least one project')
290 } 290 }
291 return 291 return
292 } 292 }
...@@ -340,7 +340,6 @@ function changechoosed(e) { ...@@ -340,7 +340,6 @@ function changechoosed(e) {
340 function getProjectList() { 340 function getProjectList() {
341 projectIds.value = [] 341 projectIds.value = []
342 if (choosedchoosed.value.length == 0) { 342 if (choosedchoosed.value.length == 0) {
343 // ElMessage.error('请先选择运动员')
344 projectList.value = [] 343 projectList.value = []
345 return 344 return
346 } 345 }
...@@ -358,7 +357,7 @@ function getProjectList() { ...@@ -358,7 +357,7 @@ function getProjectList() {
358 } 357 }
359 }).catch(err => { 358 }).catch(err => {
360 loadingProject.value = false 359 loadingProject.value = false
361 ElMessage.error(err.msg) 360 ElMessage.warning(err.msg)
362 }) 361 })
363 } 362 }
364 363
...@@ -544,7 +543,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -544,7 +543,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
544 groupId: groupId.value 543 groupId: groupId.value
545 }).then(res => { 544 }).then(res => {
546 if(!res.data){ 545 if(!res.data){
547 ElMessage.error(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again') 546 ElMessage.warning(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
548 choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal)) 547 choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal))
549 548
550 for(var c of choosed2List.value){ 549 for(var c of choosed2List.value){
......
src/viewsPc/match/components/addAccompany.vue
...@@ -169,7 +169,7 @@ watch(show, (value) => { ...@@ -169,7 +169,7 @@ watch(show, (value) => {
169 169
170 function submitForm() { 170 function submitForm() {
171 if (!form.value.passportUrl) { 171 if (!form.value.passportUrl) {
172 ElMessage.error('Please upload your passport file') 172 ElMessage.warning('Please upload your passport file')
173 return 173 return
174 } 174 }
175 if(Array.isArray(form.value.passportUrl)){ 175 if(Array.isArray(form.value.passportUrl)){
......
src/viewsPc/match/components/addCoach.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 :is-show-tip="false" 14 :is-show-tip="false"
15 /> 15 />
16 </el-form-item> 16 </el-form-item>
17 <el-form-item v-if="language=='1'" :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin"> 17 <el-form-item v-if="language!=0" label="WDSF code" prop="wdsfMin">
18 <el-input v-model="form.wdsfMin" type="number"/> 18 <el-input v-model="form.wdsfMin" type="number"/>
19 </el-form-item> 19 </el-form-item>
20 <el-form-item :label="language==0?'姓氏':'surname'" prop="xing" required> 20 <el-form-item :label="language==0?'姓氏':'surname'" prop="xing" required>
...@@ -275,7 +275,7 @@ function giveBirthDay() { ...@@ -275,7 +275,7 @@ function giveBirthDay() {
275 // 判断身份证正确性/赋值生日 275 // 判断身份证正确性/赋值生日
276 if (form.value.idcType == 0) { 276 if (form.value.idcType == 0) {
277 if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) { 277 if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
278 ElMessage.error('请输入正确的身份证号码') 278 ElMessage.warning('请输入正确的身份证号码')
279 } else { 279 } else {
280 let tmpStr = '' 280 let tmpStr = ''
281 if (form.value.idcCode.length == 15) { 281 if (form.value.idcCode.length == 15) {
...@@ -306,14 +306,14 @@ function submitForm() { ...@@ -306,14 +306,14 @@ function submitForm() {
306 if (valid) { 306 if (valid) {
307 // 验证身份证号 307 // 验证身份证号
308 if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) { 308 if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
309 ElMessage.error('请输入正确的身份证号码') 309 ElMessage.warning('请输入正确的身份证号码')
310 return 310 return
311 } 311 }
312 // 验证手机号 312 // 验证手机号
313 if (showRequire.value) { 313 if (showRequire.value) {
314 var pattern = /^1[3456789]\d{9}$/ 314 var pattern = /^1[3456789]\d{9}$/
315 if (!pattern.test(form.value.phone)) { 315 if (!pattern.test(form.value.phone)) {
316 ElMessage.error(language.value == 0 ?'请输入正确的手机号':'Please enter the correct mobile phone number') 316 ElMessage.warning(language.value == 0 ?'请输入正确的手机号':'Please enter the correct mobile phone number')
317 return 317 return
318 } 318 }
319 } 319 }
......
src/viewsPc/match/components/addWdsf.vue
...@@ -186,15 +186,15 @@ watch(show, (value) => { ...@@ -186,15 +186,15 @@ watch(show, (value) => {
186 186
187 function submitForm() { 187 function submitForm() {
188 if (!form.value.passportNumber) { 188 if (!form.value.passportNumber) {
189 ElMessage.error('Please fill in your passport number') 189 ElMessage.warning('Please fill in your passport number')
190 return 190 return
191 } 191 }
192 if (!form.value.picUrl) { 192 if (!form.value.picUrl) {
193 ElMessage.error('Please upload your photo') 193 ElMessage.warning('Please upload your photo')
194 return 194 return
195 } 195 }
196 if (!form.value.passportUrl) { 196 if (!form.value.passportUrl) {
197 ElMessage.error('Please upload your passport file') 197 ElMessage.warning('Please upload your passport file')
198 return 198 return
199 } 199 }
200 if (editgay) { 200 if (editgay) {
...@@ -213,7 +213,7 @@ function submitForm() { ...@@ -213,7 +213,7 @@ function submitForm() {
213 }) 213 })
214 } else { 214 } else {
215 if (!form.value.birth) { 215 if (!form.value.birth) {
216 ElMessage.error('Please fill in your birthday') 216 ElMessage.warning('Please fill in your birthday')
217 return 217 return
218 } 218 }
219 if(Array.isArray(form.value.passportUrl)){ 219 if(Array.isArray(form.value.passportUrl)){
...@@ -260,9 +260,9 @@ function checkCard() { ...@@ -260,9 +260,9 @@ function checkCard() {
260 } 260 }
261 if (!card.value) { 261 if (!card.value) {
262 if (language.value == 0) { 262 if (language.value == 0) {
263 ElMessage.error('请填写WDSF卡号') 263 ElMessage.warning('请填写WDSF卡号')
264 } else { 264 } else {
265 ElMessage.error('Please fill in your WDSF code') 265 ElMessage.warning('Please fill in your WDSF code')
266 } 266 }
267 return 267 return
268 } 268 }
...@@ -283,9 +283,9 @@ function codeSuccess(msg) { ...@@ -283,9 +283,9 @@ function codeSuccess(msg) {
283 if (form.value.wdsfFlag == '0') { 283 if (form.value.wdsfFlag == '0') {
284 isCodeTrue.value = false 284 isCodeTrue.value = false
285 if (language.value == 0) { 285 if (language.value == 0) {
286 ElMessage.error('WDSF卡号错误') 286 ElMessage.warning('WDSF卡号错误')
287 } else { 287 } else {
288 ElMessage.error('WDSF ID is Error') 288 ElMessage.warning('WDSF ID is Error')
289 } 289 }
290 } 290 }
291 }) 291 })
......
src/viewsPc/match/components/allSportsmanList.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </el-form-item> 34 </el-form-item>
35 </el-form> 35 </el-form>
36 </div> 36 </div>
37 <p v-if="noPhotoCanSign == 0" class="text-danger">*需上传照片才可报名</p> 37 <p v-if="noPhotoCanSign == 0" class="text-danger">{{ language==0?'*需上传照片才可报名':'*Please upload photo before sign up' }}</p>
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"/>
......
src/viewsPc/match/components/dialogMates.vue
...@@ -244,23 +244,23 @@ const mateClose = () => { ...@@ -244,23 +244,23 @@ const mateClose = () => {
244 244
245 function chooseMateDone() { 245 function chooseMateDone() {
246 if (mateConfig.value.minMaleCount != '-1' && manNum < mateConfig.value.minMaleCount) { 246 if (mateConfig.value.minMaleCount != '-1' && manNum < mateConfig.value.minMaleCount) {
247 ElMessage.error(`至少选择${mateConfig.value.minMaleCount}个男队友`) 247 ElMessage.warning(`至少选择${mateConfig.value.minMaleCount}个男队友`)
248 return 248 return
249 } 249 }
250 if (mateConfig.value.maxMaleCount != '-1' && manNum > mateConfig.value.maxMaleCount) { 250 if (mateConfig.value.maxMaleCount != '-1' && manNum > mateConfig.value.maxMaleCount) {
251 ElMessage.error(`最多选择${mateConfig.value.maxMaleCount}个男队友`) 251 ElMessage.warning(`最多选择${mateConfig.value.maxMaleCount}个男队友`)
252 return 252 return
253 } 253 }
254 if (mateConfig.value.minFemaleCount != '-1' && femaleNum < mateConfig.value.minFemaleCount) { 254 if (mateConfig.value.minFemaleCount != '-1' && femaleNum < mateConfig.value.minFemaleCount) {
255 ElMessage.error(`至少选择${mateConfig.value.minFemaleCount}个女队友`) 255 ElMessage.warning(`至少选择${mateConfig.value.minFemaleCount}个女队友`)
256 return 256 return
257 } 257 }
258 if (mateConfig.value.maxFemaleCount != '-1' && femaleNum > mateConfig.value.maxFemaleCount) { 258 if (mateConfig.value.maxFemaleCount != '-1' && femaleNum > mateConfig.value.maxFemaleCount) {
259 ElMessage.error(`最多选择${mateConfig.value.maxFemaleCount}个女队友`) 259 ElMessage.warning(`最多选择${mateConfig.value.maxFemaleCount}个女队友`)
260 return 260 return
261 } 261 }
262 if ((mates.length < mateConfig.value.minCount) && mateConfig.value.minCount > 0) { 262 if ((mates.length < mateConfig.value.minCount) && mateConfig.value.minCount > 0) {
263 ElMessage.error(`至少选择${mateConfig.value.minCount}个队友`) 263 ElMessage.warning(`至少选择${mateConfig.value.minCount}个队友`)
264 return 264 return
265 } 265 }
266 const athleteIds = [] 266 const athleteIds = []
...@@ -268,7 +268,7 @@ function chooseMateDone() { ...@@ -268,7 +268,7 @@ function chooseMateDone() {
268 for (const p of teammateList.value) { 268 for (const p of teammateList.value) {
269 if (mates.indexOf(p.id) != -1) { 269 if (mates.indexOf(p.id) != -1) {
270 if (sonLevelList.value.length > 0 && !p.sonlevel) { 270 if (sonLevelList.value.length > 0 && !p.sonlevel) {
271 ElMessage.error(`请分配级别`) 271 ElMessage.warning(`请分配级别`)
272 return 272 return
273 } 273 }
274 sonLevelIds.push(p.sonlevel) 274 sonLevelIds.push(p.sonlevel)
...@@ -276,7 +276,7 @@ function chooseMateDone() { ...@@ -276,7 +276,7 @@ function chooseMateDone() {
276 } 276 }
277 } 277 }
278 if (sonLevelList.value.length > 0 && !personal.value.sonlevel) { 278 if (sonLevelList.value.length > 0 && !personal.value.sonlevel) {
279 ElMessage.error(`请分配级别`) 279 ElMessage.warning(`请分配级别`)
280 return 280 return
281 } 281 }
282 sonLevelIds.push(personal.value.sonlevel) 282 sonLevelIds.push(personal.value.sonlevel)
......
src/viewsPc/match/components/extraForm.vue
...@@ -139,7 +139,7 @@ function submitForm() { ...@@ -139,7 +139,7 @@ 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.warning(`请完善${n.name}信息`)
143 return 143 return
144 } 144 }
145 if (n.type == '2' && n.fixWxFile) { 145 if (n.type == '2' && n.fixWxFile) {
......
src/viewsPc/match/components/substation-list.vue
...@@ -37,8 +37,10 @@ ...@@ -37,8 +37,10 @@
37 </van-count-down> 37 </van-count-down>
38 38
39 <div class="text-center mt30"> 39 <div class="text-center mt30">
40 <a class="btn-lineG mb20 mauto" style="display: block;"> 40 <a class="btn-lineG mb20 mauto" style="display: block;" v-if="n.time>0">
41 {{ language==0?'我要报名':'Register' }}</a> 41 <span v-if="n.time>0 && n.startSign<=0"> {{ language==0?'我要报名':'Register' }}</span>
42 <span v-if="n.startSign>0"> {{ language==0?'报名未开始':'Not started yet' }}</span>
43 </a>
42 </div> 44 </div>
43 </el-col> 45 </el-col>
44 </el-row> 46 </el-row>
...@@ -67,6 +69,7 @@ onMounted(()=>{ ...@@ -67,6 +69,7 @@ onMounted(()=>{
67 for(let n of props.list){ 69 for(let n of props.list){
68 var today = dayjs().format('YYYY-MM-DD HH:mm:ss') 70 var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
69 n.time = dayjs(n.signEndTime).diff(today, 'millisecond') 71 n.time = dayjs(n.signEndTime).diff(today, 'millisecond')
72 n.startSign = dayjs(n.signBeginTime).diff(today, 'millisecond')
70 } 73 }
71 }) 74 })
72 function goDetail(id) { 75 function goDetail(id) {
......
src/viewsPc/match/components/wdsfForm.vue
...@@ -81,9 +81,9 @@ function init() { ...@@ -81,9 +81,9 @@ function init() {
81 function checkCode(item) { 81 function checkCode(item) {
82 if (!item.wdsfMin) { 82 if (!item.wdsfMin) {
83 if (language.value == 0) { 83 if (language.value == 0) {
84 ElMessage.error('请填写WDSF卡号') 84 ElMessage.warning('请填写WDSF卡号')
85 } else { 85 } else {
86 ElMessage.error('Please fill in your WDSF code') 86 ElMessage.warning('Please fill in your WDSF code')
87 } 87 }
88 return 88 return
89 } 89 }
...@@ -91,9 +91,9 @@ function checkCode(item) { ...@@ -91,9 +91,9 @@ function checkCode(item) {
91 match.checkWdsf({card: item.wdsfMin}).then(res => { 91 match.checkWdsf({card: item.wdsfMin}).then(res => {
92 if(res.data.wdsfFlag=='0'){ 92 if(res.data.wdsfFlag=='0'){
93 if (language.value == 0) { 93 if (language.value == 0) {
94 ElMessage.error('验证失败,卡号不存在') 94 ElMessage.warning('验证失败,卡号不存在')
95 } else { 95 } else {
96 ElMessage.error('Verification failed, card number does not exist') 96 ElMessage.warning('Verification failed, card number does not exist')
97 } 97 }
98 return 98 return
99 } 99 }
......
src/viewsPc/match/detail.vue
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
79 <div class="mt30"> 79 <div class="mt30">
80 <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>
81 <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>
82 <div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名未开始</div>
82 </div> 83 </div>
83 </el-col> 84 </el-col>
84 </el-row> 85 </el-row>
...@@ -213,9 +214,10 @@ const data = reactive({ ...@@ -213,9 +214,10 @@ const data = reactive({
213 }, {name: '成绩', active: 0}, {name: '报名须知', active: 0}], 214 }, {name: '成绩', active: 0}, {name: '报名须知', active: 0}],
214 menu1: [{name: '分站赛', active: 1}, {name: '赛事详情', active: 0}, {name: '日程', active: 0}], 215 menu1: [{name: '分站赛', active: 1}, {name: '赛事详情', active: 0}, {name: '日程', active: 0}],
215 signDoneGroupList: [], 216 signDoneGroupList: [],
216 time: '' 217 time: '',
218 startSign: ''
217 }) 219 })
218 const {loading,error,time, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data) 220 const {loading,error,time,startSign, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data)
219 const group = useUserStore().group 221 const group = useUserStore().group
220 const user = useUserStore().user 222 const user = useUserStore().user
221 onMounted(() => { 223 onMounted(() => {
...@@ -247,6 +249,7 @@ function getMatch(id) { ...@@ -247,6 +249,7 @@ function getMatch(id) {
247 loading.value = false 249 loading.value = false
248 var today = dayjs().format('YYYY-MM-DD HH:mm:ss') 250 var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
249 time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond') 251 time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
252 startSign.value = dayjs(res.data.signBeginTime).diff(today, 'millisecond')
250 }).catch(res=>{ 253 }).catch(res=>{
251 error.value = true 254 error.value = true
252 loading.value = false 255 loading.value = false
......
src/viewsPc/match/pay.vue
...@@ -123,7 +123,8 @@ ...@@ -123,7 +123,8 @@
123 <!-- <el-radio label="1" border>--> 123 <!-- <el-radio label="1" border>-->
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 <!-- <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>-->
125 <!-- </el-radio>--> 125 <!-- </el-radio>-->
126 <el-radio label="2" v-if="form.payTypeArr.indexOf('0')>-1" border> 126 <el-radio label="2" v-if="form.payTypeArr.indexOf('2')>-1" border>
127 <!-- 微信-->
127 <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1" 128 <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
128 xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40"> 129 xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40">
129 <path 130 <path
...@@ -134,7 +135,8 @@ ...@@ -134,7 +135,8 @@
134 fill="#595757" p-id="24749"></path> 135 fill="#595757" p-id="24749"></path>
135 </svg> 136 </svg>
136 </el-radio> 137 </el-radio>
137 <el-radio label="3" v-if="form.payTypeArr.indexOf('2')>-1" border> 138 <el-radio label="3" v-if="form.payTypeArr.indexOf('0')>-1" border>
139 <!-- 线下-->
138 <svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1" 140 <svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1"
139 xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40"> 141 xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40">
140 <path 142 <path
...@@ -164,6 +166,7 @@ ...@@ -164,6 +166,7 @@
164 </svg> 166 </svg>
165 </el-radio> 167 </el-radio>
166 <el-radio label="4" v-if="form.payTypeArr.indexOf('3')>-1" border> 168 <el-radio label="4" v-if="form.payTypeArr.indexOf('3')>-1" border>
169 <!-- paypal-->
167 <svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1" 170 <svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1"
168 xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40"> 171 xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40">
169 <path 172 <path
......
src/viewsPc/match/payOk.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="box"> 3 <div class="box">
4 <el-card class="mb60 mt30"> 4 <el-card class="mb60 mt30" v-loading="loading">
5 <div class="text-center mt30"> 5 <div class="text-center mt30">
6 <el-icon color="#32B16C" size="80"> 6 <el-icon color="#32B16C" size="80">
7 <SuccessFilled/> 7 <SuccessFilled/>
...@@ -28,10 +28,14 @@ const route = useRoute() ...@@ -28,10 +28,14 @@ const route = useRoute()
28 const router = useRouter() 28 const router = useRouter()
29 const language= useStorage('language',0) 29 const language= useStorage('language',0)
30 const orderId = ref(route.query.orderId) 30 const orderId = ref(route.query.orderId)
31 const loading = ref(false)
31 32
32 onMounted(() => { 33 onMounted(() => {
33 callbackPalPay(route.query.orderId).then(res => { 34 var code = decodeURIComponent(orderId.value)
34 35 console.log(code)
36 loading.value = true
37 callbackPalPay(code).then(res => {
38 loading.value = false
35 }) 39 })
36 }) 40 })
37 41
......
src/viewsPc/match/signPreview.vue
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
17 </div> 17 </div>
18 <div v-if="user.utype=='1'&&myMemberTable.length>0"> 18 <div v-if="user.utype=='1'&&myMemberTable.length>0">
19 <el-table class="mt20" :data="myMemberTable" border> 19 <el-table class="mt20" :data="myMemberTable" border>
20 <el-table-column type="index" label="Index" width="70" align="center"/> 20 <el-table-column type="index" :label="language==0?'序号':'Index'" width="70" align="center"/>
21 <el-table-column :label="language==0?'姓氏':'surname'" prop="xing" min-width="100"/> 21 <el-table-column :label="language==0?'姓氏':'surname'" prop="xing" min-width="100"/>
22 <el-table-column :label="language==0?'名':'name'" prop="ming" min-width="100"/> 22 <el-table-column :label="language==0?'名':'name'" prop="ming" min-width="100"/>
23 <el-table-column label="Passport number" prop="idcCode" min-width="120"/> 23 <el-table-column :label="language==0?'护照号':'Passport number'" prop="idcCode" min-width="120"/>
24 <el-table-column label="Birthday" prop="birth"/> 24 <el-table-column :label="language==0?'出生日期':'Birthday'" prop="birth"/>
25 <el-table-column label="Sex" prop="sexStr"/> 25 <el-table-column :label="language==0?'性别':'Sex'" prop="sexStr"/>
26 <el-table-column label="Role" min-width="160"> 26 <el-table-column :label="language==0?'角色':'Role'" min-width="160">
27 <template #default="scope"> 27 <template #default="scope">
28 <div class="roletd"> 28 <div class="roletd">
29 <span v-for="item in scope.row.label?.split(',')" :key="item.id" class="text-primary"> 29 <span v-for="item in scope.row.label?.split(',')" :key="item.id" class="text-primary">
......
src/viewsPc/match/teamSign.vue
...@@ -242,7 +242,7 @@ function submitForm() { ...@@ -242,7 +242,7 @@ function submitForm() {
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.warning(language.value==0?`请完善${n.name}信息`:`Please complete ${n.name} information`)
246 return 246 return
247 } 247 }
248 } 248 }
......
src/viewsPc/news/detail.vue
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
36 <div class="content" v-html="form.content" /> 36 <div class="content" v-html="form.content" />
37 37
38 <!-- 视频--> 38 <!-- 视频-->
39 <div v-if="hasMp4"> 39 <div v-if="hasMp4" class="mt20">
40 <video-player v-for="(f,index) in fileList" :key="index" class="videoPlay mb20" controls :src="fillImgUrl_webSite(f.url)" /> 40 <div v-for="(f,index) in fileList" style="aspect-ratio: 16/9">
41 <video-player :key="index" class="videoPlay mb20" controls :src="fillImgUrl_webSite(f.url)" />
42 </div>
41 </div> 43 </div>
42 <div v-if="!hasMp4 && fileList.length>0" class="mt20"> 44 <div v-if="!hasMp4 && fileList.length>0" class="mt20">
43 <!-- 附件--> 45 <!-- 附件-->
...@@ -155,7 +157,7 @@ const goDetail = (n) => { ...@@ -155,7 +157,7 @@ const goDetail = (n) => {
155 } 157 }
156 </script> 158 </script>
157 <style lang="scss" scoped> 159 <style lang="scss" scoped>
158 .videoPlay{width: 100%;aspect-ratio: 16/9;height: 400px;} 160 .videoPlay{width: 100%;aspect-ratio: 16/9;height:100%;}
159 .title { 161 .title {
160 text-align: center; 162 text-align: center;
161 font-size: 24px; 163 font-size: 24px;
......
src/viewsPc/register/personal.vue
...@@ -199,9 +199,9 @@ onMounted(() => { ...@@ -199,9 +199,9 @@ onMounted(() => {
199 function sendsmsMsg() { 199 function sendsmsMsg() {
200 if (!wdsfData.value.email) { 200 if (!wdsfData.value.email) {
201 if (language.value == 0) { 201 if (language.value == 0) {
202 ElMessage.error('请填写邮箱') 202 ElMessage.warning('请填写邮箱')
203 } else { 203 } else {
204 ElMessage.error('Please fill in your email address') 204 ElMessage.warning('Please fill in your email address')
205 } 205 }
206 return 206 return
207 } 207 }
...@@ -216,9 +216,9 @@ function sendsmsMsg() { ...@@ -216,9 +216,9 @@ function sendsmsMsg() {
216 function checkCard() { 216 function checkCard() {
217 if (!form.value.card) { 217 if (!form.value.card) {
218 if (language.value == 0) { 218 if (language.value == 0) {
219 ElMessage.error('请填写WDSF卡号') 219 ElMessage.warning('请填写WDSF卡号')
220 } else { 220 } else {
221 ElMessage.error('Please fill in your WDSF code') 221 ElMessage.warning('Please fill in your WDSF code')
222 } 222 }
223 return 223 return
224 } 224 }
...@@ -250,9 +250,9 @@ function codeSuccess(msg) { ...@@ -250,9 +250,9 @@ function codeSuccess(msg) {
250 if (wdsfData.value.wdsfFlag == '0') { 250 if (wdsfData.value.wdsfFlag == '0') {
251 isCodeTrue.value = 0 251 isCodeTrue.value = 0
252 if (language.value == 0) { 252 if (language.value == 0) {
253 ElMessage.error('WDSF卡号错误') 253 ElMessage.warning('WDSF卡号错误')
254 } else { 254 } else {
255 ElMessage.error('WDSF ID is Error') 255 ElMessage.warning('WDSF ID is Error')
256 } 256 }
257 } 257 }
258 }).catch(err => { 258 }).catch(err => {
...@@ -290,15 +290,15 @@ function next() { ...@@ -290,15 +290,15 @@ function next() {
290 // proxy.$refs['wdsfDataRef'].validate((valid) => { 290 // proxy.$refs['wdsfDataRef'].validate((valid) => {
291 // if (valid) 291 // if (valid)
292 if (!wdsfData.value.passportNumber) { 292 if (!wdsfData.value.passportNumber) {
293 ElMessage.error('Please fill in your passport number') 293 ElMessage.warning('Please fill in your passport number')
294 return 294 return
295 } 295 }
296 if (!wdsfData.value.birthday) { 296 if (!wdsfData.value.birthday) {
297 ElMessage.error('Please fill in your birthday') 297 ElMessage.warning('Please fill in your birthday')
298 return 298 return
299 } 299 }
300 if (!wdsfData.value.passportUrl) { 300 if (!wdsfData.value.passportUrl) {
301 ElMessage.error('Please upload your passport file') 301 ElMessage.warning('Please upload your passport file')
302 return 302 return
303 } 303 }
304 if (wdsfData.value.personFlag == '0') { 304 if (wdsfData.value.personFlag == '0') {
...@@ -326,7 +326,7 @@ function next() { ...@@ -326,7 +326,7 @@ function next() {
326 } 326 }
327 if (wdsfData.value.personFlag == '1') { 327 if (wdsfData.value.personFlag == '1') {
328 if(!form.value.password){ 328 if(!form.value.password){
329 ElMessage.error('Please fill in your password') 329 ElMessage.warning('Please fill in your password')
330 return 330 return
331 } 331 }
332 let obj = { 332 let obj = {
......
src/viewsPc/register/team/step1.vue
...@@ -79,17 +79,17 @@ onMounted(() => { ...@@ -79,17 +79,17 @@ onMounted(() => {
79 function sendsmsMsg() { 79 function sendsmsMsg() {
80 if (!form.value.account) { 80 if (!form.value.account) {
81 if (language.value == 0) { 81 if (language.value == 0) {
82 ElMessage.error('请填写手机/邮箱') 82 ElMessage.warning('请填写手机/邮箱')
83 } else { 83 } else {
84 ElMessage.error('Please fill in your phone/email address') 84 ElMessage.warning('Please fill in your phone/email address')
85 } 85 }
86 return 86 return
87 } 87 }
88 if (form.value.account.indexOf('@') == -1) { 88 if (form.value.account.indexOf('@') == -1) {
89 if (language.value == 0) { 89 if (language.value == 0) {
90 ElMessage.error('请填写正确的邮箱') 90 ElMessage.warning('请填写正确的邮箱')
91 } else { 91 } else {
92 ElMessage.error('Please fill in the correct email') 92 ElMessage.warning('Please fill in the correct email')
93 } 93 }
94 return 94 return
95 } 95 }
...@@ -129,17 +129,17 @@ const goBack = () => { ...@@ -129,17 +129,17 @@ const goBack = () => {
129 const next = () => { 129 const next = () => {
130 if (!form.value.account) { 130 if (!form.value.account) {
131 if (language.value == 0) { 131 if (language.value == 0) {
132 ElMessage.error('请填写邮箱') 132 ElMessage.warning('请填写邮箱')
133 } else { 133 } else {
134 ElMessage.error('Please fill in your phone/email address') 134 ElMessage.warning('Please fill in your phone/email address')
135 } 135 }
136 return 136 return
137 } 137 }
138 if (!form.value.code) { 138 if (!form.value.code) {
139 if (language.value == 0) { 139 if (language.value == 0) {
140 ElMessage.error('请填写验证码') 140 ElMessage.warning('请填写验证码')
141 } else { 141 } else {
142 ElMessage.error('Please fill in Code') 142 ElMessage.warning('Please fill in Code')
143 } 143 }
144 return 144 return
145 } 145 }
......
src/viewsPc/register/team/step2.vue
...@@ -148,7 +148,7 @@ const registerRules = ref( ...@@ -148,7 +148,7 @@ const registerRules = ref(
148 }) 148 })
149 const vconfirmPassword = () => { 149 const vconfirmPassword = () => {
150 if (form.value.password !== form.value.confirmPassword) { 150 if (form.value.password !== form.value.confirmPassword) {
151 ElMessage.error('两次输入的密码不一致') 151 ElMessage.warning(language.value == 0 ? '两次输入的密码不一致' :'The two passwords entered are inconsistent')
152 } 152 }
153 } 153 }
154 onMounted(() => { 154 onMounted(() => {
...@@ -175,7 +175,7 @@ const goStep3 = () => { ...@@ -175,7 +175,7 @@ const goStep3 = () => {
175 proxy.$refs.registerRef.validate(valid => { 175 proxy.$refs.registerRef.validate(valid => {
176 if (valid) { 176 if (valid) {
177 if (!isAgree.value) { 177 if (!isAgree.value) {
178 ElMessage.error('请勾选接受') 178 ElMessage.warning(language.value == 0?'请勾选接受':'Please check the acceptance')
179 return 179 return
180 } 180 }
181 181
......
src/viewsPc/saiC/index.vue
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </el-card> 46 </el-card>
47 47
48 <el-card class="mt20 mb20" v-for="(n,index) in cjList"> 48 <el-card class="mt20 mb20" v-for="(n,index) in cjList">
49 <div class="leftboderTT">{{ n.title }}</div> 49 <div class="leftboderTT">{{ language==0?n.title:n.en_title }}</div>
50 <div v-for="(m,jndex) in n.list"> 50 <div v-for="(m,jndex) in n.list">
51 <h3 class="text-center">{{ m.title }}</h3> 51 <h3 class="text-center">{{ m.title }}</h3>
52 <div class="tablebody"> 52 <div class="tablebody">
......
vite.config.js
...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.96:9083/', 85 // target: 'http://192.168.1.118:8081/',
86 target: 'https://dance.itechtop.cn/stage-api', 86 target: 'https://dance.itechtop.cn/stage-api',
87 changeOrigin: true, 87 changeOrigin: true,
88 rewrite: (p) => p.replace(/^\/dev-api/, '') 88 rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!