Skip to content

杨炀 / dance-pc

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

no message

1 parent f232b4f3
Inline Side-by-side
Showing 15 changed files with 75 additions and 47 deletions
src/apiPc/match.js
......@@ -77,6 +77,14 @@ export function getCaptchaSms(data) {
data: data
})
}
// 发送手机验证码
export function getCaptchaSms2(data) {
return request({
url: `/captchaByCheckCode2`,
method: 'post',
data: data
})
}
export function checkRegisterCode(data) {
return request({
url: `/checkRegisterCode`,
......
src/assets/file/ENTRY GUIDE.pdf 0 → 100644
This diff could not be displayed because it is too large.
src/layoutPc/components/AppBottom.vue
......@@ -39,17 +39,17 @@
<el-row style="align-items: center;" v-if="language==1">
<el-col :lg="12" :md="12" :xs="24">
<el-col :lg="14" :md="12" :xs="24">
<ul>
<li>Postal code：214000</li>
<li>100 meters northeast of the intersection of Hefeng Road and Qingshu, the Taihu Lake New Town, Wuxi, Jiangsu</li>
<li>Address：100 meters northeast of the intersection of Hefeng Road and Qingshu, the Taihu Lake New Town, Wuxi, Jiangsu</li>
</ul>
</el-col>
<el-col :lg="18" :md="12" :xs="24">
<el-col :lg="6" :md="12" :xs="24">
<ul style="text-align: right">
<li>telephone:15606190026</li>
<li>e-mail:info@wdsfwuxicenter.com</li>
<li>Telephone:15606190026</li>
<li>E-mail:info@wdsfwuxicenter.com</li>
<li>
<!-- <a class="ffoot" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010102004192">-->
......
src/viewsPc/center/myMatch.vue
<template>
<el-card class="mb20">
<div class="pd20">
<div class="">
<div class="matchItem" v-for="n in billList" :key="n.id">
<div class="status-po">
<span class="bg-pink" v-if="n.auditStatus=='0'">{{ language==0?'未提交':'Uncommitted' }}</span>
<span class="bg-primary" v-if="n.auditStatus=='1'">{{ language==0?'待审核':'Audit' }}</span>
<span class="bg-primary" v-if="n.auditStatus=='1'">{{ language==0?'待审核':'Auditing' }}</span>
<span class="bg-blue" v-if="n.auditStatus=='2'">{{ language==0?'审核通过':'Approved' }}</span>
<span class="bg-danger" v-if="n.auditStatus=='3'">{{ language==0?'审核驳回':'Reject' }}</span>
</div>
......@@ -28,8 +28,8 @@
</el-col>
<el-col :lg="8">
<p class="ppl"><label>{{ language==0?'报名时间':'Registration Period' }}：</label>{{ n.signBeginTime.substring(0,10) }}~{{n.signEndTime.substring(0,10)}}</p>
<div class="btnbox">
<el-button plain round type="primary" @click="goDetail(n)" v-if="n.auditStatus!='0'">
<div class="btnbox" style="display: flex">
<el-button class="mb10" plain round type="primary" @click="goDetail(n)" v-if="n.auditStatus!='0'">
{{ language==0?'详情':'Detail' }}</el-button>
<el-button plain round type="primary" @click="continueSign(n)" v-if="n.auditStatus=='0'">
{{ language==0?'继续报名':'Continue to register' }}</el-button>
......@@ -190,7 +190,7 @@ function getList() {
.matchItem {
cursor: pointer;
margin: 0 0 20px;
padding: 0 0 20px;background: #FBFCFD;
padding: 20px 15px;background: #FBFCFD;
border-radius: 2px;
position: relative;
.status-po{position: absolute;right: 0;top: 0;font-size: 12px;
......
src/viewsPc/index.vue
......@@ -31,7 +31,7 @@
</template>
</van-count-down>
</div>
<div class="banner-count" style="width: 580px;justify-content: center;height: 100px;font-size: 30px" v-else @click="goMatch(n)">
<div class="banner-count bb" v-else @click="goMatch(n)">
开始报名
<!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
</div>
......@@ -49,7 +49,7 @@
<el-col :sm="24" :lg="10">
<div class="bgbg">
<img src="@/assets/dance/text.png">
<a class="zn-btn">参赛指南
<a class="zn-btn" href="/file/GUIDE.pdf" target="_blank">参赛指南
<el-icon>
<download/>
</el-icon>
......@@ -590,7 +590,7 @@ const goMatch = (n) => {
background: #000;
position: relative;
.banner-count {
.banner-count {cursor: pointer;
position: absolute;
padding: 20px 40px;
font-size: 20px;
......@@ -633,7 +633,10 @@ const goMatch = (n) => {
font-size: 20px;
}
}
.bb{width: 580px;justify-content: center;height: 100px;font-size: 30px;}
.banner-count.bb:hover{box-shadow: 0 0 20px #453DEA;border-radius: 100px;
background: linear-gradient(-90deg, #8623FC, #453DEA)
}
.box {
position: absolute;
height: 100%;
......
src/viewsPc/index_en.vue
......@@ -28,7 +28,7 @@
</template>
</van-count-down>
</div>
<div class="banner-count" style="width: 580px;justify-content: center;height: 100px;font-size: 30px" v-else @click="goMatch(n)">
<div class="banner-count bb" v-else @click="goMatch(n)">
Register Now
<!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
</div>
......@@ -46,7 +46,7 @@
<el-col :sm="24" :lg="10">
<div class="bgbg">
<h1 style="color: #fff">WDSF ASIAN DANCESPORT FESTIVAL .WUXI 2024</h1>
<a class="zn-btn">ENTRY GUIDE
<a class="zn-btn" href="/file/GUIDE.pdf" target="_blank">ENTRY GUIDE
<el-icon><download /></el-icon>
</a>
</div>
......@@ -503,8 +503,10 @@ const goMatch = (n) => {
border-radius: 15px;}
.zn-Box{background-size: contain;position: relative;overflow: hidden;
.bbbg{position: absolute;width: 100%;height: 100%;object-fit: cover;}
.bgbg{
padding: 5%;
.bgbg{height: 100%;
padding: 5%;display: flex;
flex-direction: column;
justify-content: space-between;
img{margin: 5% 0}
}
.itemBox{
......@@ -513,12 +515,12 @@ const goMatch = (n) => {
}
border-radius: 15px;
.zn-btn{background: #FFFFFF;
font-size: 18px;
font-size: 18px; width: fit-content;
color: #453DEA;
border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
.item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 20px 0;
.item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0;
display: flex;align-items: center;text-align: center;
font-size: 18px; flex-direction: column;padding: 50px 10px 20px;
font-size: 18px; flex-direction: column;padding: 35px 10px 20px;
background:url("@/assets/dance/znbb.png") no-repeat left #FFFFFF;
background-size: cover;
position: relative;
......@@ -541,7 +543,8 @@ const goMatch = (n) => {
.bannerItem {
height: 450px;
background: #000;position: relative;
.banner-count{position: absolute;padding: 20px 40px;
.banner-count{position: absolute;padding: 20px 40px;
font-size: 20px;align-items: center;
overflow: hidden;
background: url("@/assets/dance/time_bg.png") no-repeat center;
......@@ -564,6 +567,10 @@ const goMatch = (n) => {
.colon{ color: #fff;display: block;margin: 20px 0 0;
font-size: 20px;}
}
.bb{width: 580px;justify-content: center;height: 100px;font-size: 30px;}
.banner-count.bb:hover{box-shadow: 0 0 20px #453DEA;border-radius: 100px;
background: linear-gradient(-90deg, #8623FC, #453DEA)
}
.box {
position: absolute;
height: 100%;
......
src/viewsPc/login.vue
......@@ -3,7 +3,7 @@
v-model="show" class="pcloginpop" width="450px" :append-to-body="true" :title="title"
destroy-on-close :show-close="showClose" :close-on-click-modal="false" @close="close"
>
<div class="pd10"></div>
<el-form ref="loginRef" :model="loginForm" :rules="language==0?loginRules:loginRules_en" class="login-form"
v-if="loginStatus==0">
<el-form-item prop="username">
......@@ -102,7 +102,7 @@
</el-input>
</el-form-item>
<el-form-item prop="code">
<el-form-item>
<el-input
v-model.trim="changePasswordForm.code"
size="large"
......@@ -111,12 +111,16 @@
@keyup.enter="handleLogin"
>
<template #append>
<el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
<count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
{{ totalSeconds }} {{ language == 0 ? '秒' : 's' }}
</count-down>
<el-button type="primary" plain style="width: 110px;" @click="sendsmsMsg">
<van-count-down v-if="counting" :time="60000" format="ss" @finish="counting=false">
<template #default="timeData">
<span class="text-primary">{{ timeData.seconds }}{{ language == 0 ? '秒' : 's' }}</span>
</template>
</van-count-down>
<!-- <count-down v-slot="{ totalSeconds }" :time="60000" @end="counting=false">-->
<!-- {{ totalSeconds }} {{ language == 0 ? '秒' : 's' }}-->
<!-- </count-down>-->
<span v-else>
<!-- Send verification code-->
{{ language == 0 ? '发送验证码' : 'Send' }}
</span>
</el-button>
......@@ -167,6 +171,7 @@
</template>
<script setup>
import {getCurrentInstance, ref, watch} from 'vue'
import Vcode from "vue3-puzzle-vcode"
import CountDown from '@chenfengyuan/vue-countdown'
import {forgetPassword, getCodeImg} from '@/api/login'
......@@ -176,10 +181,10 @@ import useUserStore from '@/store/modules/user'
const language = useStorage('language', 0)
import {useRouter} from 'vue-router'
import {getCurrentInstance, ref, watch} from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
import cache from "@/plugins/cache";
import {useStorage} from "@vueuse/core/index";
import {getCaptchaSms, getCaptchaSms2} from "@/apiPc/match";
const emit = defineEmits(['submitForm'])
const userStore = useUserStore()
......@@ -281,16 +286,13 @@ function handleLogin() {
function close() {
loginStatus.value = 0
title.value = '用户登录'
title.value = language.value == 0?'用户登录':'LOGIN'
}
function showChangePassword() {
loginStatus.value = 2
if (language.value == 0) {
title.value = '忘记密码/密码重置'
} else {
title.value = 'FORGET PASSWORD'
}
title.value = language.value == 0?'忘记密码/密码重置':'FORGET PASSWORD'
}
function showRegister() {
......@@ -340,6 +342,7 @@ function getCookie() {
}
function sendsmsMsg() {
// 忘记密码发信息
if (!changePasswordForm.value.username) {
if (language.value == 0) {
ElMessage.error('请填写手机/邮箱')
......@@ -349,16 +352,19 @@ function sendsmsMsg() {
return
}
if (counting.value) {
return
} else {
isShow.value = true
}
}
function codeSuccess() {
// 忘记密码验证成功
isShow.value = false
isCodeTrue.value = true
counting.value = true
getCaptchaSms2({account: changePasswordForm.value.username}).then(res => {
counting.value = true
})
}
function changePasswordFormUsername() {
......@@ -371,11 +377,11 @@ function handleChangePassword() {
if (isCodeTrue.value) {
delete changePasswordForm.value.confirmPassword
forgetPassword(changePasswordForm.value).then(res => {
ElMessage.success('操作成功，请登录')
ElMessage.success(language.value == 0 ? '操作成功，请登录' :'Operation successful, please log in')
close()
})
} else {
ElMessage.error('请发送验证码')
ElMessage.error(language.value == 0 ? '请发送验证码' :'Please send the verification code')
}
}
})
......
src/viewsPc/match/chooseProject.vue
......@@ -72,7 +72,7 @@
<div class="panel border">
<div class="panel-header ">
<h3 class="panel-title" v-if="language==0">可参与报名的项目</h3>
<h3 class="panel-title" v-else>Eligible Events for Registration</h3>
<h3 class="panel-title" v-else>Search Events</h3>
<div class="fr">
<el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" @change="getProjectList"
clearable/>
......
src/viewsPc/match/chooseSportsman.vue
......@@ -71,7 +71,7 @@
<div class="panel border">
<div class="panel-header ">
<h3 class="panel-title" v-if="language==0">可参与报名的项目</h3>
<h3 class="panel-title" v-else>Eligible Events for Registration</h3>
<h3 class="panel-title" v-else>Search Events</h3>
<div class="fr">
<el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
@change="getProjectList"
......
src/viewsPc/match/chooseSportsman2.vue
......@@ -43,7 +43,7 @@
<div class="panel border">
<div class="panel-header ">
<h3 class="panel-title" v-if="language==0">可参与报名的项目</h3>
<h3 class="panel-title" v-else>Eligible Events for Registration</h3>
<h3 class="panel-title" v-else>Search Events</h3>
<div class="fr">
<el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
@change="getProjectList"
......
src/viewsPc/match/components/addCoach.vue
......@@ -7,12 +7,16 @@
<el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="120px" inline>
<el-row :gutter="30" class="mt30">
<el-col :lg="12" class="touxiang">
<el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'">
<ImageUpload2
v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
:is-show-tip="false"
/>
</el-form-item>
<el-form-item v-if="language=='1'" :label="language==0?'WDSF会员号':'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>
<el-input v-model="form.xing"/>
</el-form-item>
......@@ -73,7 +77,7 @@
<el-input v-model="form.address" type="textarea" :rows="4"/>
</el-form-item>
<el-form-item :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin">
<el-form-item v-if="language=='0'" :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin">
<el-input v-model="form.wdsfMin" type="number"/>
</el-form-item>
......
src/viewsPc/match/components/allSportsmanList.vue
......@@ -196,7 +196,7 @@ function editPerson(row) {
function addMember() {
const params = {
title: '添加人员',
title: language.value == 0 ?'添加人员':'Add',
id: 0,
groupId: groupId
}
......
src/viewsPc/register/team/step1.vue
......@@ -23,7 +23,7 @@
{{ totalSeconds }} {{ language == 0 ? '秒' : 's' }}
</count-down>
<span v-else>
{{ language == 0 ? '发送验证码' : 'Send code' }}
{{ language == 0 ? '发送验证码' : 'Send' }}
</span>
</el-button>
</template>
......
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.131:8083/',
// target: 'http://192.168.1.96:9083/',
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!