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 @@
color: inherit;
}
img{display: block;}
.text-sm{font-size: 13px}
.el-tabs__active-bar{
&::before{
content: '';position: absolute;top: -4px;
......
src/components/FileImport/index.vue
......@@ -117,10 +117,9 @@ const uploadList = ref([])
// const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址
const language = useStorage('language', 0)
const headers = ref({
Authorization: 'Bearer ' + getToken(),
['Content-Language'] : language==0? 'zh_CN':'en_US' ,
['Content-Language'] : language.value==0? 'zh_CN':'en_US' ,
})
const fileList = ref([])
const showTip = computed(
......
src/layoutPc/components/AppHeader.vue
......@@ -179,6 +179,9 @@ onMounted(() => {
console.log(activeIndex.value)
})
function changeLanguage(n) {
if(language.value == n){
return
}
proxy.$modal.loading()
language.value = n
}
......
src/viewsPc/center/myInfo.vue
......@@ -178,7 +178,7 @@ function save() {
function checkCode() {
if (myform.value.idcType == 0 && myform.value.idcCode) {
if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(myform.value.idcCode))) {
ElMessage.error('请输入正确的身份证号码')
ElMessage.warning('请输入正确的身份证号码')
} else {
let tmpStr = ''
if (myform.value.idcCode.length == 15) {
......
src/viewsPc/center/myMatch.vue
......@@ -134,6 +134,13 @@ function reSign(n){
})
}
function continueSign(n){
if(n.status=='0'){
ElMessage({
message: 'The current event is offline.',
type: 'warning'
})
return
}
if (user.utype == '1') {
// 个人报名
router.push({
......
src/viewsPc/index.vue
......@@ -385,12 +385,6 @@ import {Swiper, SwiperSlide} from 'swiper/vue'
import {Autoplay, Navigation} from 'swiper'
import 'swiper/css'
import {dayjs} from 'element-plus'
import r01 from '@/assets/dance/r01.png'
import r02 from '@/assets/dance/r02.png'
import r03 from '@/assets/dance/r03.png'
import r04 from '@/assets/dance/r04.png'
import r05 from '@/assets/dance/r05.png'
import r06 from '@/assets/dance/r06.png'
import * as match from "@/apiPc/match";
const modules = [Autoplay, Navigation]
......@@ -407,12 +401,12 @@ const canNext = ref(false)
const activeRankName = ref(0)
const time = ref(0)
const personList = ref([
{name: '张晋', pp: '欧洲舞团团长、艺术总监', src: r01},
{name: '王晓敏', pp: '欧洲舞团团长、艺术总监', src: r02},
{name: '徐徐', pp: '欧洲舞团团长、艺术总监', src: r03},
{name: '汪莉莉', pp: '欧洲舞团团长、艺术总监', src: r04},
{name: '蒋云澜', pp: '欧洲舞团团长、艺术总监', src: r05},
{name: '钱一帆', pp: '欧洲舞团团长、艺术总监', src: r06}
{ name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' },
{ name: 'Nenad Jeftic', pp: '标准舞裁判长 塞尔维亚', src: '/img/2.png' },
{ name: 'Dorel Bagiu', pp: '罗马尼亚', src: '/img/3.png' },
{ name: 'Eduard Korotin', pp: ' 爱沙尼亚', src: '/img/4.png' },
{ name: 'Ana Cristina Silva', pp: '葡萄牙', src: '/img/5.png'},
{ name: 'Dallas Leslie Williams', pp: '记分长 澳大利亚', src: '/img/6.png' }
])
const activeNews = ref(0)
const banners = ref([])
......@@ -493,9 +487,9 @@ const goDetail = (n) => {
}
}
const goLeaderInfo = (n) => {
router.push({
path: `/about/leaderInfo/${n.id || 0}`
})
// router.push({
// path: `/about/leaderInfo/${n.id || 0}`
// })
}
const goList = (query, name) => {
query.sortName = name
......@@ -864,43 +858,44 @@ const goMatch = (n) => {
}
}
.teacher {
height: 330px;
background: #fff;
position: relative;
border-radius: 10px;
overflow: hidden;
.imgbox {
background: linear-gradient(0, #C8AAFC, #fff)
.teacher{height: 410px;background: #fff;
position: relative;border-radius: 10px;overflow: hidden;
.imgbox{background: linear-gradient(0,#C8AAFC,#fff)}
img{height: 350px;width: 100%;object-fit: cover;}
h3{color: #fff;background: url("@/assets/dance/name_bg.png") no-repeat center;
background-size:110% 100%;text-align: center;height: 30px;line-height: 30px;
font-size: 18px;position: absolute;width: 100%;bottom: 30px;}
p{text-align: center;margin: 25px 0 0;
font-size: 14px;}
}
@media screen and (max-width: 1650px) {
.teacher{height: 320px;
.imgbox{
img{height: 260px}
}
}
img {
height: 270px;
width: 100%;
object-fit: cover;
}
@media screen and (max-width: 1200px) {
.teacher{height: 450px;margin: 0 0 20px;
.imgbox{
img{height: 390px}
}
}
h3 {
color: #fff;
background: url("@/assets/dance/name_bg.png") no-repeat center;
background-size: auto 100%;
text-align: center;
height: 30px;
line-height: 30px;
font-size: 18px;
position: absolute;
width: 100%;
bottom: 30px;
}
@media screen and (max-width: 900px) {
.teacher{height: 400px;margin: 0 0 20px;
.imgbox{
img{height: 340px}
}
}
p {
text-align: center;
margin: 25px 0 0;
font-size: 14px;
}
@media screen and (max-width: 800px) {
.teacher{height: 400px;margin: 0 0 20px;
.imgbox{
img{height: 260px}
}
}
}
.aboutBox {
background: url("@/assets/dance/about_bg.png") no-repeat center;
height: 375px;
......
src/viewsPc/index_en.vue
......@@ -282,13 +282,13 @@
</div>
<el-row :gutter="20">
<el-col
v-for="n in personList" :key="n.name" :sm="12" :xl="4" :xs="12"
v-for="n in personList" :key="n.name" :sm="8" :xl="4" :xs="12"
:lg="4"
>
<div class="teacher">
<div class="imgbox"><img :src="n.src"></div>
<h3 class="esp">{{ n.name }}</h3>
<p class="esp text-primary">{{ n.pp }}</p>
<p class="esp_2 text-primary">{{ n.pp }}</p>
</div>
</el-col>
</el-row>
......@@ -384,12 +384,6 @@ import { Swiper, SwiperSlide } from 'swiper/vue'
import { Autoplay, Navigation } from 'swiper'
import 'swiper/css'
import { dayjs } from 'element-plus'
import r01 from '@/assets/dance/r01.png'
import r02 from '@/assets/dance/r02.png'
import r03 from '@/assets/dance/r03.png'
import r04 from '@/assets/dance/r04.png'
import r05 from '@/assets/dance/r05.png'
import r06 from '@/assets/dance/r06.png'
import * as match from "@/apiPc/match";
import {rankList} from '@/assets/js/data'
const modules = [Autoplay, Navigation]
......@@ -401,12 +395,12 @@ const router = useRouter()
const { proxy } = getCurrentInstance()
const time = ref(0)
const personList = ref([
{ name: 'Zhang Jin', pp: 'artistic director', src: r01 },
{ name: 'Wang min', pp: 'regimental commander', src: r02 },
{ name: 'Xuxu', pp: 'artistic director', src: r03 },
{ name: 'Wang Li', pp: 'regimental commander ', src: r04 },
{ name: 'Yunlan', pp: 'artistic director', src: r05},
{ name: 'Qian Yifan', pp: 'artistic director', src: r06 }
{ name: 'Wolfgang Eliasch', pp: 'Chairperson for Latin AUT', src: '/img/1.png' },
{ name: 'Nenad Jeftic', pp: 'Chairperson for Standard SRB', src: '/img/2.png' },
{ name: 'Dorel Bagiu', pp: 'ROU', src: '/img/3.png' },
{ name: 'Eduard Korotin', pp: ' EST', src: '/img/4.png' },
{ name: 'Ana Cristina Silva', pp: 'POR', src: '/img/5.png'},
{ name: 'Dallas Leslie Williams', pp: 'Scrutineer AUS', src: '/img/6.png' }
])
const activeNews = ref(0)
const banners = ref([])
......@@ -543,7 +537,6 @@ const goMatch = (n) => {
.bannerItem {
height: 450px;
background: #000;position: relative;
.banner-count{position: absolute;padding: 20px 40px;
font-size: 20px;align-items: center;
overflow: hidden;
......@@ -701,16 +694,44 @@ const goMatch = (n) => {
}
}
.teacher{height: 330px;background: #fff;
.teacher{height: 410px;background: #fff;
position: relative;border-radius: 10px;overflow: hidden;
.imgbox{background: linear-gradient(0,#C8AAFC,#fff)}
img{height: 270px;width: 100%;object-fit: cover;}
img{height: 350px;width: 100%;object-fit: cover;}
h3{color: #fff;background: url("@/assets/dance/name_bg.png") no-repeat center;
background-size:auto 100%;text-align: center;height: 30px;line-height: 30px;
background-size:110% 100%;text-align: center;height: 30px;line-height: 30px;
font-size: 18px;position: absolute;width: 100%;bottom: 30px;}
p{text-align: center;margin: 25px 0 0;
font-size: 14px;}
}
@media screen and (max-width: 1650px) {
.teacher{height: 320px;
.imgbox{
img{height: 260px}
}
}
}
@media screen and (max-width: 1200px) {
.teacher{height: 450px;margin: 0 0 20px;
.imgbox{
img{height: 390px}
}
}
}
@media screen and (max-width: 900px) {
.teacher{height: 400px;margin: 0 0 20px;
.imgbox{
img{height: 340px}
}
}
}
@media screen and (max-width: 800px) {
.teacher{height: 400px;margin: 0 0 20px;
.imgbox{
img{height: 260px}
}
}
}
.aboutBox{background: url("@/assets/dance/about_bg.png") no-repeat center;height: 375px;
background-size: cover;padding: 40px 60px; position: relative;
.content{font-size: 18px;line-height: 2.2;height: 240px;overflow: hidden;
......
src/viewsPc/login.vue
......@@ -345,9 +345,9 @@ function sendsmsMsg() {
// 忘记密码发信息
if (!changePasswordForm.value.username) {
if (language.value == 0) {
ElMessage.error('请填写手机/邮箱')
ElMessage.warning('请填写手机/邮箱')
} else {
ElMessage.error('Please fill in your phone/email address')
ElMessage.warning('Please fill in your phone/email address')
}
return
}
......@@ -381,7 +381,7 @@ function handleChangePassword() {
close()
})
} else {
ElMessage.error(language.value == 0 ? '请发送验证码' :'Please send the verification code')
ElMessage.warning(language.value == 0 ? '请发送验证码' :'Please send the verification code')
}
}
})
......
src/viewsPc/match/chooseCoach.vue
......@@ -300,7 +300,7 @@ function chooseDone() {
function goNext() {
console.log(form.value)
if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
ElMessage.error(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
return
}
var obj = {
......
src/viewsPc/match/chooseProject.vue
......@@ -55,9 +55,10 @@
</el-checkbox>
</el-checkbox-group>
</div>
<div v-else @click="addMate">
<div class="addBttn">+</div>
<div class="text-center mt10">
<div style="width:50%;" v-else @click="addMate">
<div class="addBttn" style="margin: 0 auto">+</div>
<div class="text-center mt10 text-primary text-sm">
Please add your partner
<el-icon>
<Edit/>
</el-icon>
......@@ -361,9 +362,9 @@ function getSignInfoList() {
function submitForm(n) {
if (signInfoList.value.length == 0) {
if (language.value == 0) {
ElMessage.error('请至少选择一个项目')
ElMessage.warning('请至少选择一个项目')
} else {
ElMessage.error('select at least one project')
ElMessage.warning('select at least one project')
}
return
}
......@@ -388,7 +389,7 @@ function submitForm(n) {
}
for (const s of signInfoList.value) {
if (s.extraPersonInfo == null && needBuchong) {
ElMessage.error(language.value == 0 ? '请完善运动员补充信息' : 'Complete Supplementary Information')
ElMessage.warning(language.value == 0 ? '请完善运动员补充信息' : 'Complete Supplementary Information')
tableType.value = 0
return
}
......@@ -490,7 +491,7 @@ function getProjectList() {
loadingProject.value = false
}).catch(err => {
loadingProject.value = false
ElMessage.error(err.msg)
ElMessage.warning(err.msg)
})
}
......
src/viewsPc/match/chooseSportsman.vue
......@@ -296,7 +296,7 @@ function submitForm() {
}
for (const s of signInfoList.value) {
if (s.extraPersonInfo == null && needBuchong) {
ElMessage.error(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
ElMessage.warning(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
tableType.value = 0
return
}
......@@ -304,9 +304,9 @@ function submitForm() {
}
if (signInfoList.value.length == 0) {
if (language.value == 0) {
ElMessage.error('请至少选择一个项目')
ElMessage.warning('请至少选择一个项目')
} else {
ElMessage.error('select at least one project')
ElMessage.warning('select at least one project')
}
return
}
......@@ -358,7 +358,6 @@ function changechoosed(e) {
function getProjectList() {
projectIds.value = []
if (choosedchoosed.value.length == 0) {
// ElMessage.error('请先选择运动员')
projectList.value = []
return
}
......@@ -376,7 +375,7 @@ function getProjectList() {
}
}).catch(err => {
loadingProject.value = false
ElMessage.error(err.msg)
ElMessage.warning(err.msg)
})
}
......@@ -584,7 +583,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
groupId: groupId.value
}).then(res => {
if(!res.data){
ElMessage.error(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
ElMessage.warning(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal))
for(var c of choosed2List.value){
......
src/viewsPc/match/chooseSportsman2.vue
......@@ -276,7 +276,7 @@ function submitForm() {
}
for (const s of signInfoList.value) {
if (s.extraPersonInfo == null && needBuchong) {
ElMessage.error(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
ElMessage.warning(language.value == 0 ? '请完善补充信息' : 'Please fill in the supplementary information')
tableType.value = 0
return
}
......@@ -284,9 +284,9 @@ function submitForm() {
}
if (signInfoList.value.length == 0) {
if (language.value == 0) {
ElMessage.error('请至少选择一个项目')
ElMessage.warning('请至少选择一个项目')
} else {
ElMessage.error('select at least one project')
ElMessage.warning('select at least one project')
}
return
}
......@@ -340,7 +340,6 @@ function changechoosed(e) {
function getProjectList() {
projectIds.value = []
if (choosedchoosed.value.length == 0) {
// ElMessage.error('请先选择运动员')
projectList.value = []
return
}
......@@ -358,7 +357,7 @@ function getProjectList() {
}
}).catch(err => {
loadingProject.value = false
ElMessage.error(err.msg)
ElMessage.warning(err.msg)
})
}
......@@ -544,7 +543,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
groupId: groupId.value
}).then(res => {
if(!res.data){
ElMessage.error(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
ElMessage.warning(language.value==0?'该人员已在其他团队中报名，请重新选择':'This person has already registered in another team, please select again')
choosedchoosed.value = _.without(choosedchoosed.value,_.last(newVal))
for(var c of choosed2List.value){
......
src/viewsPc/match/components/addAccompany.vue
......@@ -169,7 +169,7 @@ watch(show, (value) => {
function submitForm() {
if (!form.value.passportUrl) {
ElMessage.error('Please upload your passport file')
ElMessage.warning('Please upload your passport file')
return
}
if(Array.isArray(form.value.passportUrl)){
......
src/viewsPc/match/components/addCoach.vue
......@@ -14,7 +14,7 @@
:is-show-tip="false"
/>
</el-form-item>
<el-form-item v-if="language=='1'" :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin">
<el-form-item v-if="language!=0" label="WDSF code" prop="wdsfMin">
<el-input v-model="form.wdsfMin" type="number"/>
</el-form-item>
<el-form-item :label="language==0?'姓氏':'surname'" prop="xing" required>
......@@ -275,7 +275,7 @@ function giveBirthDay() {
// 判断身份证正确性/赋值生日
if (form.value.idcType == 0) {
if (!(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
ElMessage.error('请输入正确的身份证号码')
ElMessage.warning('请输入正确的身份证号码')
} else {
let tmpStr = ''
if (form.value.idcCode.length == 15) {
......@@ -306,14 +306,14 @@ function submitForm() {
if (valid) {
// 验证身份证号
if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
ElMessage.error('请输入正确的身份证号码')
ElMessage.warning('请输入正确的身份证号码')
return
}
// 验证手机号
if (showRequire.value) {
var pattern = /^1[3456789]\d{9}$/
if (!pattern.test(form.value.phone)) {
ElMessage.error(language.value == 0 ?'请输入正确的手机号':'Please enter the correct mobile phone number')
ElMessage.warning(language.value == 0 ?'请输入正确的手机号':'Please enter the correct mobile phone number')
return
}
}
......
src/viewsPc/match/components/addWdsf.vue
......@@ -186,15 +186,15 @@ watch(show, (value) => {
function submitForm() {
if (!form.value.passportNumber) {
ElMessage.error('Please fill in your passport number')
ElMessage.warning('Please fill in your passport number')
return
}
if (!form.value.picUrl) {
ElMessage.error('Please upload your photo')
ElMessage.warning('Please upload your photo')
return
}
if (!form.value.passportUrl) {
ElMessage.error('Please upload your passport file')
ElMessage.warning('Please upload your passport file')
return
}
if (editgay) {
......@@ -213,7 +213,7 @@ function submitForm() {
})
} else {
if (!form.value.birth) {
ElMessage.error('Please fill in your birthday')
ElMessage.warning('Please fill in your birthday')
return
}
if(Array.isArray(form.value.passportUrl)){
......@@ -260,9 +260,9 @@ function checkCard() {
}
if (!card.value) {
if (language.value == 0) {
ElMessage.error('请填写WDSF卡号')
ElMessage.warning('请填写WDSF卡号')
} else {
ElMessage.error('Please fill in your WDSF code')
ElMessage.warning('Please fill in your WDSF code')
}
return
}
......@@ -283,9 +283,9 @@ function codeSuccess(msg) {
if (form.value.wdsfFlag == '0') {
isCodeTrue.value = false
if (language.value == 0) {
ElMessage.error('WDSF卡号错误')
ElMessage.warning('WDSF卡号错误')
} else {
ElMessage.error('WDSF ID is Error')
ElMessage.warning('WDSF ID is Error')
}
}
})
......
src/viewsPc/match/components/allSportsmanList.vue
......@@ -34,7 +34,7 @@
</el-form-item>
</el-form>
</div>
<p v-if="noPhotoCanSign == 0" class="text-danger">*需上传照片才可报名</p>
<p v-if="noPhotoCanSign == 0" class="text-danger">{{ language==0?'*需上传照片才可报名':'*Please upload photo before sign up' }}</p>
<el-table ref="allSportmenTable" v-loading="loading" :data="tableData" height="60vh"
@selection-change="handleSelectionChange">
<el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>
......
src/viewsPc/match/components/dialogMates.vue
......@@ -244,23 +244,23 @@ const mateClose = () => {
function chooseMateDone() {
if (mateConfig.value.minMaleCount != '-1' && manNum < mateConfig.value.minMaleCount) {
ElMessage.error(`至少选择${mateConfig.value.minMaleCount}个男队友`)
ElMessage.warning(`至少选择${mateConfig.value.minMaleCount}个男队友`)
return
}
if (mateConfig.value.maxMaleCount != '-1' && manNum > mateConfig.value.maxMaleCount) {
ElMessage.error(`最多选择${mateConfig.value.maxMaleCount}个男队友`)
ElMessage.warning(`最多选择${mateConfig.value.maxMaleCount}个男队友`)
return
}
if (mateConfig.value.minFemaleCount != '-1' && femaleNum < mateConfig.value.minFemaleCount) {
ElMessage.error(`至少选择${mateConfig.value.minFemaleCount}个女队友`)
ElMessage.warning(`至少选择${mateConfig.value.minFemaleCount}个女队友`)
return
}
if (mateConfig.value.maxFemaleCount != '-1' && femaleNum > mateConfig.value.maxFemaleCount) {
ElMessage.error(`最多选择${mateConfig.value.maxFemaleCount}个女队友`)
ElMessage.warning(`最多选择${mateConfig.value.maxFemaleCount}个女队友`)
return
}
if ((mates.length < mateConfig.value.minCount) && mateConfig.value.minCount > 0) {
ElMessage.error(`至少选择${mateConfig.value.minCount}个队友`)
ElMessage.warning(`至少选择${mateConfig.value.minCount}个队友`)
return
}
const athleteIds = []
......@@ -268,7 +268,7 @@ function chooseMateDone() {
for (const p of teammateList.value) {
if (mates.indexOf(p.id) != -1) {
if (sonLevelList.value.length > 0 && !p.sonlevel) {
ElMessage.error(`请分配级别`)
ElMessage.warning(`请分配级别`)
return
}
sonLevelIds.push(p.sonlevel)
......@@ -276,7 +276,7 @@ function chooseMateDone() {
}
}
if (sonLevelList.value.length > 0 && !personal.value.sonlevel) {
ElMessage.error(`请分配级别`)
ElMessage.warning(`请分配级别`)
return
}
sonLevelIds.push(personal.value.sonlevel)
......
src/viewsPc/match/components/extraForm.vue
......@@ -139,7 +139,7 @@ function submitForm() {
let fileInfo = {}
for (const n of participantsInfoArr.value) {
if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {
ElMessage.error(`请完善${n.name}信息`)
ElMessage.warning(`请完善${n.name}信息`)
return
}
if (n.type == '2' && n.fixWxFile) {
......
src/viewsPc/match/components/substation-list.vue
......@@ -37,8 +37,10 @@
</van-count-down>
<div class="text-center mt30">
<a class="btn-lineG mb20 mauto" style="display: block;">
{{ language==0?'我要报名':'Register' }}</a>
<a class="btn-lineG mb20 mauto" style="display: block;" v-if="n.time>0">
<span v-if="n.time>0 && n.startSign<=0"> {{ language==0?'我要报名':'Register' }}</span>
<span v-if="n.startSign>0"> {{ language==0?'报名未开始':'Not started yet' }}</span>
</a>
</div>
</el-col>
</el-row>
......@@ -67,6 +69,7 @@ onMounted(()=>{
for(let n of props.list){
var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
n.time = dayjs(n.signEndTime).diff(today, 'millisecond')
n.startSign = dayjs(n.signBeginTime).diff(today, 'millisecond')
}
})
function goDetail(id) {
......
src/viewsPc/match/components/wdsfForm.vue
......@@ -81,9 +81,9 @@ function init() {
function checkCode(item) {
if (!item.wdsfMin) {
if (language.value == 0) {
ElMessage.error('请填写WDSF卡号')
ElMessage.warning('请填写WDSF卡号')
} else {
ElMessage.error('Please fill in your WDSF code')
ElMessage.warning('Please fill in your WDSF code')
}
return
}
......@@ -91,9 +91,9 @@ function checkCode(item) {
match.checkWdsf({card: item.wdsfMin}).then(res => {
if(res.data.wdsfFlag=='0'){
if (language.value == 0) {
ElMessage.error('验证失败,卡号不存在')
ElMessage.warning('验证失败,卡号不存在')
} else {
ElMessage.error('Verification failed, card number does not exist')
ElMessage.warning('Verification failed, card number does not exist')
}
return
}
......
src/viewsPc/match/detail.vue
......@@ -79,6 +79,7 @@
<div class="mt30">
<a class="btn-lineG mb20" v-if="matchData.progressStatusCode=='2'" @click="choseSignType" style="display: block;text-align: center;">我要报名</a>
<div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名已结束</div>
<div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名未开始</div>
</div>
</el-col>
</el-row>
......@@ -213,9 +214,10 @@ const data = reactive({
}, {name: '成绩', active: 0}, {name: '报名须知', active: 0}],
menu1: [{name: '分站赛', active: 1}, {name: '赛事详情', active: 0}, {name: '日程', active: 0}],
signDoneGroupList: [],
time: ''
time: '',
startSign: ''
})
const {loading,error,time, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data)
const {loading,error,time,startSign, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data)
const group = useUserStore().group
const user = useUserStore().user
onMounted(() => {
......@@ -247,6 +249,7 @@ function getMatch(id) {
loading.value = false
var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
startSign.value = dayjs(res.data.signBeginTime).diff(today, 'millisecond')
}).catch(res=>{
error.value = true
loading.value = false
......
src/viewsPc/match/pay.vue
......@@ -123,7 +123,8 @@
<!-- <el-radio label="1" border>-->
<!-- <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>-->
<!-- </el-radio>-->
<el-radio label="2" v-if="form.payTypeArr.indexOf('0')>-1" border>
<el-radio label="2" v-if="form.payTypeArr.indexOf('2')>-1" border>
<!-- 微信-->
<svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40">
<path
......@@ -134,7 +135,8 @@
fill="#595757" p-id="24749"></path>
</svg>
</el-radio>
<el-radio label="3" v-if="form.payTypeArr.indexOf('2')>-1" border>
<el-radio label="3" v-if="form.payTypeArr.indexOf('0')>-1" border>
<!-- 线下-->
<svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40">
<path
......@@ -164,6 +166,7 @@
</svg>
</el-radio>
<el-radio label="4" v-if="form.payTypeArr.indexOf('3')>-1" border>
<!-- paypal-->
<svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40">
<path
......
src/viewsPc/match/payOk.vue
<template>
<div>
<div class="box">
<el-card class="mb60 mt30">
<el-card class="mb60 mt30" v-loading="loading">
<div class="text-center mt30">
<el-icon color="#32B16C" size="80">
<SuccessFilled/>
......@@ -28,10 +28,14 @@ const route = useRoute()
const router = useRouter()
const language= useStorage('language',0)
const orderId = ref(route.query.orderId)
const loading = ref(false)
onMounted(() => {
callbackPalPay(route.query.orderId).then(res => {
var code = decodeURIComponent(orderId.value)
console.log(code)
loading.value = true
callbackPalPay(code).then(res => {
loading.value = false
})
})
......
src/viewsPc/match/signPreview.vue
......@@ -17,13 +17,13 @@
</div>
<div v-if="user.utype=='1'&&myMemberTable.length>0">
<el-table class="mt20" :data="myMemberTable" border>
<el-table-column type="index" label="Index" width="70" align="center"/>
<el-table-column type="index" :label="language==0?'序号':'Index'" width="70" align="center"/>
<el-table-column :label="language==0?'姓氏':'surname'" prop="xing" min-width="100"/>
<el-table-column :label="language==0?'名':'name'" prop="ming" min-width="100"/>
<el-table-column label="Passport number" prop="idcCode" min-width="120"/>
<el-table-column label="Birthday" prop="birth"/>
<el-table-column label="Sex" prop="sexStr"/>
<el-table-column label="Role" min-width="160">
<el-table-column :label="language==0?'护照号':'Passport number'" prop="idcCode" min-width="120"/>
<el-table-column :label="language==0?'出生日期':'Birthday'" prop="birth"/>
<el-table-column :label="language==0?'性别':'Sex'" prop="sexStr"/>
<el-table-column :label="language==0?'角色':'Role'" min-width="160">
<template #default="scope">
<div class="roletd">
<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() {
console.log(form.value)
for (const n of participantsInfoArr.value) {
if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {
ElMessage.error(language.value==0?`请完善${n.name}信息`:`Please complete ${n.name} information`)
ElMessage.warning(language.value==0?`请完善${n.name}信息`:`Please complete ${n.name} information`)
return
}
}
......
src/viewsPc/news/detail.vue
......@@ -36,8 +36,10 @@
<div class="content" v-html="form.content" />
<!-- 视频-->
<div v-if="hasMp4">
<video-player v-for="(f,index) in fileList" :key="index" class="videoPlay mb20" controls :src="fillImgUrl_webSite(f.url)" />
<div v-if="hasMp4" class="mt20">
<div v-for="(f,index) in fileList" style="aspect-ratio: 16/9">
<video-player :key="index" class="videoPlay mb20" controls :src="fillImgUrl_webSite(f.url)" />
</div>
</div>
<div v-if="!hasMp4 && fileList.length>0" class="mt20">
<!-- 附件-->
......@@ -155,7 +157,7 @@ const goDetail = (n) => {
}
</script>
<style lang="scss" scoped>
.videoPlay{width: 100%;aspect-ratio: 16/9;height: 400px;}
.videoPlay{width: 100%;aspect-ratio: 16/9;height:100%;}
.title {
text-align: center;
font-size: 24px;
......
src/viewsPc/register/personal.vue
......@@ -199,9 +199,9 @@ onMounted(() => {
function sendsmsMsg() {
if (!wdsfData.value.email) {
if (language.value == 0) {
ElMessage.error('请填写邮箱')
ElMessage.warning('请填写邮箱')
} else {
ElMessage.error('Please fill in your email address')
ElMessage.warning('Please fill in your email address')
}
return
}
......@@ -216,9 +216,9 @@ function sendsmsMsg() {
function checkCard() {
if (!form.value.card) {
if (language.value == 0) {
ElMessage.error('请填写WDSF卡号')
ElMessage.warning('请填写WDSF卡号')
} else {
ElMessage.error('Please fill in your WDSF code')
ElMessage.warning('Please fill in your WDSF code')
}
return
}
......@@ -250,9 +250,9 @@ function codeSuccess(msg) {
if (wdsfData.value.wdsfFlag == '0') {
isCodeTrue.value = 0
if (language.value == 0) {
ElMessage.error('WDSF卡号错误')
ElMessage.warning('WDSF卡号错误')
} else {
ElMessage.error('WDSF ID is Error')
ElMessage.warning('WDSF ID is Error')
}
}
}).catch(err => {
......@@ -290,15 +290,15 @@ function next() {
// proxy.$refs['wdsfDataRef'].validate((valid) => {
// if (valid)
if (!wdsfData.value.passportNumber) {
ElMessage.error('Please fill in your passport number')
ElMessage.warning('Please fill in your passport number')
return
}
if (!wdsfData.value.birthday) {
ElMessage.error('Please fill in your birthday')
ElMessage.warning('Please fill in your birthday')
return
}
if (!wdsfData.value.passportUrl) {
ElMessage.error('Please upload your passport file')
ElMessage.warning('Please upload your passport file')
return
}
if (wdsfData.value.personFlag == '0') {
......@@ -326,7 +326,7 @@ function next() {
}
if (wdsfData.value.personFlag == '1') {
if(!form.value.password){
ElMessage.error('Please fill in your password')
ElMessage.warning('Please fill in your password')
return
}
let obj = {
......
src/viewsPc/register/team/step1.vue
......@@ -79,17 +79,17 @@ onMounted(() => {
function sendsmsMsg() {
if (!form.value.account) {
if (language.value == 0) {
ElMessage.error('请填写手机/邮箱')
ElMessage.warning('请填写手机/邮箱')
} else {
ElMessage.error('Please fill in your phone/email address')
ElMessage.warning('Please fill in your phone/email address')
}
return
}
if (form.value.account.indexOf('@') == -1) {
if (language.value == 0) {
ElMessage.error('请填写正确的邮箱')
ElMessage.warning('请填写正确的邮箱')
} else {
ElMessage.error('Please fill in the correct email')
ElMessage.warning('Please fill in the correct email')
}
return
}
......@@ -129,17 +129,17 @@ const goBack = () => {
const next = () => {
if (!form.value.account) {
if (language.value == 0) {
ElMessage.error('请填写邮箱')
ElMessage.warning('请填写邮箱')
} else {
ElMessage.error('Please fill in your phone/email address')
ElMessage.warning('Please fill in your phone/email address')
}
return
}
if (!form.value.code) {
if (language.value == 0) {
ElMessage.error('请填写验证码')
ElMessage.warning('请填写验证码')
} else {
ElMessage.error('Please fill in Code')
ElMessage.warning('Please fill in Code')
}
return
}
......
src/viewsPc/register/team/step2.vue
......@@ -148,7 +148,7 @@ const registerRules = ref(
})
const vconfirmPassword = () => {
if (form.value.password !== form.value.confirmPassword) {
ElMessage.error('两次输入的密码不一致')
ElMessage.warning(language.value == 0 ? '两次输入的密码不一致' :'The two passwords entered are inconsistent')
}
}
onMounted(() => {
......@@ -175,7 +175,7 @@ const goStep3 = () => {
proxy.$refs.registerRef.validate(valid => {
if (valid) {
if (!isAgree.value) {
ElMessage.error('请勾选接受')
ElMessage.warning(language.value == 0?'请勾选接受':'Please check the acceptance')
return
}
......
src/viewsPc/saiC/index.vue
......@@ -46,7 +46,7 @@
</el-card>
<el-card class="mt20 mb20" v-for="(n,index) in cjList">
<div class="leftboderTT">{{ n.title }}</div>
<div class="leftboderTT">{{ language==0?n.title:n.en_title }}</div>
<div v-for="(m,jndex) in n.list">
<h3 class="text-center">{{ m.title }}</h3>
<div class="tablebody">
......
vite.config.js
......@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
// target: 'http://192.168.1.96:9083/',
// target: 'http://192.168.1.118:8081/',
target: 'https://dance.itechtop.cn/stage-api',
changeOrigin: true,
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!