Skip to content

jijin / dance-pc

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

no message

1 parent b73dad45
Expand all
Inline Side-by-side
Showing 19 changed files with 234 additions and 124 deletions
src/apiPc/match.js
......@@ -547,6 +547,13 @@ export function getProjectPageByPerIds(query) {
params: query
})
}
export function getMatchNewslistByCode(query) {
return request({
url: `/ztx/notesort/listByCode`,
method: 'get',
params: query
})
}
export function createWePay(data) {
return request({
......@@ -571,3 +578,10 @@ export function callbackPalPay(tradeNo) {
}
})
}
export function upReceipt(data) {
return request({
url: `/league/signOrder/offlinePay`,
method: 'post',
data:data
})
}
......
src/components/FileImport/index.vue
......@@ -17,7 +17,7 @@
:accept="accept"
>
<!-- 上传按钮 -->
<el-button type="primary">选取文件</el-button>
<el-button type="primary">{{ text }}</el-button>
</el-upload>
<!-- 上传提示 -->
<div v-if="showTip" class="el-upload__tip">
......@@ -88,6 +88,10 @@ const props = defineProps({
type: String,
default: 'file'
},
text: {
type: String,
default: '选取文件'
},
action: {
type: String,
default: '/upload/uploadFile'
......
src/components/FileUpload/index.vue
......@@ -18,7 +18,13 @@
:accept="accept"
>
<!-- 上传按钮 -->
<el-button type="primary" :disabled="props.disabled">{{ buttonText }}</el-button>
<el-button type="primary" v-if="buttonType=0" :disabled="props.disabled">{{ buttonText }}</el-button>
<el-link class="mr10" type="primary" v-else>
<el-icon>
<Upload/>
</el-icon>
{{ buttonText }}
</el-link>
</el-upload>
<!-- 上传提示 -->
<div v-if="showTip && !disabled" class="el-upload__tip">
......@@ -75,7 +81,7 @@ const props = defineProps({
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'zip', 'rar']
default: () => ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'zip', 'rar','png', 'jpg', 'jpeg']
},
// 是否显示提示
isShowTip: {
......@@ -93,6 +99,10 @@ const props = defineProps({
buttonText:{
type: String,
default: '上传文件'
},
buttonType:{
type: Number,
default: 0
}
})
const accept = computed(() => {
......
src/viewsPc/center/index.vue
......@@ -227,4 +227,5 @@ li img {
height: calc(100vh - 80px);overflow: auto;top: 80px;
}
}
.app-container{min-height: 80vh;}
</style>
......
src/viewsPc/center/myMatch.vue
......@@ -22,12 +22,12 @@
<p class="ppl"><label v-if="n.groupName">{{ language==0?'参赛队':'Name of participating team' }}：</label>{{n.groupName}}</p>
</el-col>
<el-col :lg="8">
<p class="ppl"><label>{{ language==0?'比赛时间':'Event Date' }}：</label>{{ n.signBeginTime }}~{{n.signEndTime}}
<p class="ppl"><label>{{ language==0?'比赛时间':'Event Date' }}：</label>{{ n.signBeginTime?.substring(0,10) }}~{{n.signEndTime.substring(0,10)}}
</p>
<p class="ppl"><label>{{ language==0?'参赛运动员':'Participating athletes' }}：</label>{{ n.signSize }} 人</p>
</el-col>
<el-col :lg="8">
<p class="ppl"><label>{{ language==0?'报名时间':'Registration Period' }}：</label>{{ n.signBeginTime }}~{{n.signEndTime}}</p>
<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'">
{{ language==0?'详情':'Detail' }}</el-button>
......
src/viewsPc/index.vue
......@@ -390,13 +390,6 @@ const rankList = ref([
{ index: '6', code: 'tn', score: '170' ,gj:'中国'},
{ index: '7', code: 'gw', score: '170' ,gj:'中国'}
])
const rankTabs = ref([
{ name: '拉丁舞' },
{ name: '标准舞' },
{ name: '摇滚舞' },
{ name: '莎莎舞' },
{ name: '街舞' }
])
const personList = ref([
{ name: '张晋', pp:'欧洲舞团团长、艺术总监',src:r01 },
{ name: '王晓敏', pp:'欧洲舞团团长、艺术总监',src:r02 },
......
src/viewsPc/index_en.vue
......@@ -124,32 +124,58 @@
</el-col>
<el-col :sm="24" :lg="12">
<div class="indexTitle">
<h3 class="leftboderTT">RESULT</h3>
<a class="more" @click="gosaiC">MORE</a>
<h3 class="leftboderTT">MEDAL TALLY</h3>
<a class="more" href="#/saiC">MORE</a>
</div>
<!--历史排名-->
<el-card :body-style="{'padding':'10px 20px 18px'}">
<el-tabs v-model="activeRankName" @tab-click="rankTabClick">
<el-tab-pane v-for="(p,index) in rankTabs" :label="p.name" :name="index">
<el-table stripe :data="rankList">
<el-table-column label="Ranking" align="center" width="100" type="index">
<template #default="scope">
<span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 3" style="color:#7F2D00">{{ scope.row.index }}</span>
<span v-else>{{ scope.row.index }}</span>
</template>
</el-table-column>
<el-table-column label="Name" prop="name" />
<el-table-column label="Country" prop="gj" />
<el-table-column label="Score" align="center">
<template #default="scope">
<div class="text-primary">{{ scope.row.score }}</div>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<el-table stripe :data="rankList">
<el-table-column label="Ranking" align="center" width="80" type="index">
<template #default="scope">
<span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 3" style="color:#7F2D00">{{ scope.row.index }}</span>
<span v-else>{{ scope.row.index }}</span>
</template>
</el-table-column>
<el-table-column label="Country/Region" prop="name" min-width="100" align="center">
<template #default="scope">
<div>
<span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
{{ scope.row.gj }}</div>
</template>
</el-table-column>
<el-table-column prop="score">
<template #header>
<img src="@/assets/dance/1.png">
</template>
<template #default="scope">
<div class="text-warning">{{ scope.row.score }}</div>
</template>
</el-table-column>
<el-table-column prop="score">
<template #header>
<img src="@/assets/dance/2.png">
</template>
<template #default="scope">
<div class="text-blue">{{ scope.row.score }}</div>
</template>
</el-table-column>
<el-table-column prop="score">
<template #header>
<img src="@/assets/dance/3.png">
</template>
<template #default="scope">
<div class="text-primary">{{ scope.row.score }}</div>
</template>
</el-table-column>
<el-table-column label="Total" align="center">
<template #default="scope">
<div class="text-primary">{{ scope.row.score }}</div>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
......@@ -366,22 +392,15 @@ const navigationPic = ref({
})
const router = useRouter()
const { proxy } = getCurrentInstance()
const activeRankName = ref(0)
const time = ref(0)
const rankList = ref([
{ index: '1', name: 'Chen Shasha', score: '170',gj:'CHINA' },
{ index: '2', name: 'Chen Shasha', score: '170' ,gj:'CHINA'},
{ index: '3', name: 'Chen Shasha', score: '170',gj:'CHINA' },
{ index: '4', name: 'Chen Shasha', score: '170',gj:'CHINA' },
{ index: '5', name: 'Chen Shasha', score: '170' ,gj:'CHINA'},
{ index: '6', name: 'Chen Shasha', score: '170' ,gj:'CHINA'}
])
const rankTabs = ref([
{ name: 'Latin' },
{ name: 'Standard' },
{ name: 'Rock and roll' },
{ name: 'Sharsa' },
{ name: 'Breaking' }
{ index: '1', code: 'cn', score: '170',gj:'China' },
{ index: '2', code: 'us', score: '170' ,gj:'China'},
{ index: '3', code: 'de', score: '170',gj:'China' },
{ index: '4', code: 'eg', score: '170',gj:'China' },
{ index: '5', code: 'ly', score: '170' ,gj:'China'},
{ index: '6', code: 'tn', score: '170' ,gj:'China'},
{ index: '7', code: 'gw', score: '170' ,gj:'China'}
])
const personList = ref([
{ name: 'Zhang Jin', pp: 'artistic director', src: r01 },
......@@ -606,9 +625,9 @@ const goList = (query, name) => {
}
}
.calendarList{border: 1px solid #F0F0F0;padding:12px 20px;overflow: auto;height: 220px;
.calendarList{border: 1px solid #F0F0F0;padding:12px 20px;overflow: auto;height: 233px;
ul{
li{background: #F6F9FE;margin:7px 0 7px 20px;position: relative;padding: 13px;
li{background: #F6F9FE;margin:7px 0 7px 0;position: relative;padding: 13px;
border-radius: 10px;
font-weight: 500;
font-size: 15px;
......
src/viewsPc/match/commitDone.vue
......@@ -33,7 +33,7 @@
</div>
<div class="text-center mt30 mb20">
<el-button class="primary-kx w200px" round @click="goHome">{{ language == 0 ? '返回首页' : 'Homepage' }}</el-button>
<el-button class="primary-kx w200px" round @click="goHome">{{ language == 0 ? '返回首页' : 'Return to Homepage' }}</el-button>
<el-button type="primary" class="btn-lineG w200px" round @click="goSign">
{{ language == 0 ? '返回赛事报名模块' : 'Return to Event Registration Module' }}</el-button>
</div>
......
src/viewsPc/match/components/addCoach.vue
......@@ -39,6 +39,9 @@
<el-form-item :label="language==0?'手机号码':'Phone'" prop="phone" required>
<el-input v-model="form.phone" type="number"/>
</el-form-item>
<el-form-item :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin">
<el-input v-model="form.wdsfMin" type="number"/>
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item :label="language==0?'所属国家':'Nationality'" prop="countryId" required>
......
src/viewsPc/match/components/import.vue
<template>
<el-dialog v-model="show" :title="title" width="500px" close-icon="CircleClose"
append-to-body :close-on-click-modal="false" class="pcloginpop" center>
<el-form ref="dialogRef" label-width="100px">
<el-form ref="dialogRef" :label-width="language==0?'100px':'160px'">
<el-form-item :label="language==0?'下载模板':'Download template'">
<el-link href="/file/UserImport-ch.xlsx" v-if="language==0" type="primary" target="_blank">人员模板</el-link>
<el-link href="/file/UserImport-en.xlsx" v-else type="primary" target="_blank">Personnel template</el-link>
</el-form-item>
<el-form-item :label="language==0?'上传模板':'Upload template'" prop="discount">
<fileImport ref="upload" name="excel" :action="action" @uploadSuccess="uploadSuccess" />
<fileImport :text="language==0?'选取文件':'Select File'" ref="upload" name="excel" :action="action" @uploadSuccess="uploadSuccess" />
</el-form-item>
</el-form>
......@@ -45,23 +45,23 @@ function uploadSuccess(res) {
confirmButtonText: '好的'
})
} else {
if(res.data.repeatInSystemColumn){
proxy.$modal.msgError(`${res.data.repeatInSystemColumn}系统中已存在`)
if(res.data.repeatInSystemColumn.length>0){
proxy.$modal.msgError(`${res.data.repeatInSystemColumn}${language.value==0?'系统中已存在':'is in system'}`)
}
if(res.data.errCountryColumn){
proxy.$modal.msgError(`${res.data.errCountryColumn}所属国家有误`)
if(res.data.errCountryColumn.length>0){
proxy.$modal.msgError(`${res.data.errCountryColumn}${language.value==0?'所属国家有误':'error Country'}`)
}
if(res.data.errIdcTypeColumn){
proxy.$modal.msgError(`${res.data.errIdcTypeColumn}证件号错误`)
if(res.data.errIdcTypeColumn.length>0){
proxy.$modal.msgError(`${res.data.errIdcTypeColumn}${language.value==0?'证件号错误':'error ID type'}`)
}
if(res.data.errSexColumn){
proxy.$modal.msgError(`${res.data.errSexColumn}性别错误`)
if(res.data.errSexColumn.length>0){
proxy.$modal.msgError(`${res.data.errSexColumn}${language.value == 0? '性别错误' : 'error sex'}`)
}
if(res.data.incompleteColumn){
proxy.$modal.msgError(`${res.data.incompleteColumn}必填项未完成`)
if(res.data.incompleteColumn.length>0){
proxy.$modal.msgError(`${res.data.incompleteColumn}${language.value == 0? '必填项未完成' : 'incomplete'}`)
}
if(res.data.repeatInFileColumn){
proxy.$modal.msgError(`${res.data.repeatInFileColumn}文件内重复`)
if(res.data.repeatInFileColumn.length>0){
proxy.$modal.msgError(`${res.data.repeatInFileColumn}${language.value == 0? '文件内重复' : 'Repeat In File'}`)
}
}
......
src/viewsPc/match/components/matchInfo.vue
......@@ -7,11 +7,26 @@
<div class="xzbox" v-html="form.ocOrganizer">
</div>
<div class="indexTitle"><h3 class="leftboderTT">报名须知</h3></div>
<div class="xzbox" v-html="form.signKnow">
<div class="xzbox">
<div v-html="form.signKnow"></div>
<el-link v-if="form.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank">
<el-icon :size="20">
<Download />
</el-icon>
{{ JSON.parse(form.signKnowUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle" v-if="form.type==0"><h3 class="leftboderTT">赛事规程</h3></div>
<div class="xzbox" v-if="form.type==0">
<div class="indexTitle"><h3 class="leftboderTT">免责声明</h3></div>
<div class="xzbox">
<el-link v-if="form.disclaimerUrl" type="primary" :href="fillImgUrl(JSON.parse(form.disclaimerUrl)[0]?.url)" target="_blank">
<el-icon :size="20">
<Download />
</el-icon>
{{ JSON.parse(form.disclaimerUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle"><h3 class="leftboderTT">赛事规程</h3></div>
<div class="xzbox">
<el-link v-if="form.ruleUrl" type="primary" :href="fillImgUrl(JSON.parse(form.ruleUrl)[0]?.url)" target="_blank">
<el-icon :size="20">
......@@ -20,8 +35,8 @@
{{ JSON.parse(form.ruleUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle" v-if="form.type==1"><h3 class="leftboderTT">竞赛项目</h3></div>
<div class="collapsebox" v-if="form.type==1">
<div class="indexTitle" v-if="form.type==1&&form.cptProjectList?.length > 0"><h3 class="leftboderTT">竞赛项目</h3></div>
<div class="collapsebox" v-if="form.type==1&&form.cptProjectList?.length > 0">
<div class="pd20">
<table class="table" cellspacing="0" cellpadding="0" v-if="form.cptProjectList?.length > 0">
<tr>
......@@ -33,7 +48,7 @@
<th>参赛年龄</th>
<th>服务费（元）</th>
</tr>
<tr v-for="(p,index) in matchData.cptProjectList" :key="index">
<tr v-for="(p,index) in form.cptProjectList" :key="index">
<td>{{ p.code }}</td>
<td>{{ p.name }}</td>
<td>{{ p.danceType }}</td>
......@@ -55,11 +70,27 @@
<div class="xzbox" v-html="form.ocOrganizer">
</div>
<div class="indexTitle"><h3 class="leftboderTT">Notes</h3></div>
<div class="xzbox" v-html="form.signKnow">
<div class="xzbox">
<div v-html="form.signKnow"></div>
<el-link v-if="form.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank">
<el-icon :size="20">
<Download />
</el-icon>
{{ JSON.parse(form.signKnowUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle"><h3 class="leftboderTT">Disclaimers</h3></div>
<div class="xzbox">
<el-link v-if="form.disclaimerUrl" type="primary" :href="fillImgUrl(JSON.parse(form.disclaimerUrl)[0]?.url)" target="_blank">
<el-icon :size="20">
<Download />
</el-icon>
{{ JSON.parse(form.disclaimerUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle" v-if="form.type==0"><h3 class="leftboderTT">Competition Regulations</h3></div>
<div class="xzbox" v-if="form.type==0">
<div class="indexTitle"><h3 class="leftboderTT">Competition Regulations</h3></div>
<div class="xzbox">
<div v-html="form.ruleContent">
</div>
......@@ -70,8 +101,8 @@
{{ JSON.parse(form.ruleUrl)[0]?.name }}
</el-link>
</div>
<div class="indexTitle" v-if="form.type==1"><h3 class="leftboderTT">Event settings</h3></div>
<div class="collapsebox" v-if="form.type==1">
<div class="indexTitle" v-if="form.type==1 && form.cptProjectList?.length > 0"><h3 class="leftboderTT">Event settings</h3></div>
<div class="collapsebox" v-if="form.type==1 && form.cptProjectList?.length > 0">
<div class="pd20">
<table class="table" cellspacing="0" cellpadding="0" v-if="form.cptProjectList?.length > 0">
......@@ -84,7 +115,7 @@
<th>Age</th>
<th>Registration Fee</th>
</tr>
<tr v-for="(p,index) in matchData.cptProjectList" :key="index">
<tr v-for="(p,index) in form.cptProjectList" :key="index">
<td>{{ p.code }}</td>
<td>{{ p.name }}</td>
<td>{{ p.danceType }}</td>
......
src/viewsPc/match/components/matchNews.vue
......@@ -12,7 +12,7 @@
<!-- <a class="more" @click="goList(query2.sortId,'专题报道')">MORE</a>-->
</div>
<div>
<div class="item" v-for="n in newsList" :key="n.id">
<div class="item" v-for="n in newsList" :key="n.id" @click="goDetail(n)">
<p class="esp">{{ n.name }}</p>
</div>
</div>
......@@ -20,25 +20,28 @@
<div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'赛事视频':'Event Videos' }}</h3>
<!-- <a class="more" @click="goList(10000006,'赛事视频')">MORE</a>-->
</div>
<div class="item" v-for="n in newsList2" :key="n.id">
<div class="item" v-for="n in newsList2" :key="n.id" @click="goDetail(n)">
<div class="videoImgbox" @click="goDetail(n)">
<img :src="fillImgUrl_webSite(n.picUrl)">
<img :src="fillImgUrl(n.picUrl)">
</div>
</div>
<div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'赛事图片':'Event Photos' }}</h3>
<!-- <a class="more" @click="goList(10000007,'赛事图片')">MORE</a>-->
</div>
<div v-for="n in newsList3" :key="n.id">
<div class="picbox" @click="goDetail(n)"><img :src="fillImgUrl_webSite(n.picUrl)"/></div>
<div v-for="n in newsList3" :key="n.id" @click="goDetail(n)">
<div class="picbox"><img :src="fillImgUrl(n.picUrl)"/></div>
</div>
</el-card>
</template>
<script setup>
import {getNewsListById} from "@/apiPc/webSite";
import {onMounted, ref} from "vue";
import cache from '@/plugins/cache'
import {getMatchNewslistByCode} from "@/apiPc/match";
import {useRouter} from "vue-router";
import {getNewsListById} from "@/apiPc/webSite";
const language = ref(cache.local.get('language') || 0)
const router = useRouter()
const props = defineProps({
matchId: {
type: String,
......@@ -91,6 +94,15 @@ const goList = (sortId,name) => {
}
})
}
const goDetail = (n) => {
if (n.isOut == '1') {
window.open(n.jumpUrl)
} else {
window.open(router.resolve({
path: `/news/detail/${n.noteId}`
}).href)
}
}
</script>
<style scoped lang="scss">
......
src/viewsPc/match/components/matchScheduleList.vue
......@@ -2,18 +2,18 @@
<div style="padding: 30px 20px 20px">
<!--日程-->
<el-timeline>
<el-timeline-item
<el-timeline-item color="#453DEA" size="large" hollow="true"
v-for="s in matchData.cptScheduleList"
:key="s.id" hide-timestamp
placement="top"
>
<p style="font-size: 16px;margin: 0">
<p style="font-size: 16px;margin: 0;color: var(--el-color-primary);">
{{ s.timeRange?.split(',')[0].substring(0, 16) }}
~
{{ s.timeRange?.split(',')[1].substring(0, 16) }}
</p>
<p style="font-size: 16px;">{{ s.name }}</p>
<p style="font-size: 18px;color: #000;">{{ s.name }}</p>
<p v-if="s.introduction" v-html="s.introduction"></p>
<div class="time-address">
<el-icon>
......@@ -39,6 +39,7 @@ const props = defineProps({
</script>
<style scoped lang="scss">
.time-address{color: #666;}
.indexTitle{margin: 20px 0 12px;
h3{
font-size: 20px;
......
src/viewsPc/match/components/personTable.vue
......@@ -11,8 +11,9 @@
<el-table-column :label="language==0?'出生日期':'Birth'" prop="birth" width="110"/>
<el-table-column :label="language==0?'手机号码':'Phone Number'" prop="phone" width="120"/>
<el-table-column :label="language==0?'邮箱':'E-mail'" prop="email" width="150"/>
<el-table-column :label="language==0?'证件类型':'ID Type'" prop="idcTypeStr"/>
<el-table-column :label="language==0?'证件类型':'ID Type'" prop="idcTypeStr" :min-width="language==0?'60':'160'"/>
<el-table-column :label="language==0?'证件号码':'ID NO.'" prop="idcCode" width="200"/>
<el-table-column :label="language==0?'WDSF会员号':'WDSF code'" prop="wdsfMin" width="200"/>
<el-table-column :label="language==0?'会员角色':'Role'" width="150">
<template #default="scope">
<div class="esp">
......
src/viewsPc/match/components/substation-list.vue
......@@ -38,7 +38,7 @@
<div class="text-center mt30">
<a class="btn-lineG mb20 mauto" style="display: block;">
{{ language==0?'我要报名':'Application' }}</a>
{{ language==0?'我要报名':'Register' }}</a>
</div>
</el-col>
</el-row>
......
src/viewsPc/match/detail_en.vue
......@@ -4,7 +4,7 @@
<div class="box mb20 ">
<el-card class="mb20">
<el-row :gutter="20">
<el-col :lg="7" :md="24" :xl="6" >
<el-col :lg="7" :md="12" :xl="6" >
<img class="mauto w100" :src="fillImgUrl(matchData.coverUrl)" >
</el-col>
<el-col :lg="9" :md="12" :xl="10">
......@@ -31,45 +31,46 @@
</template>
</van-count-down>
<div>
<a class="btn-lineG mb20" @click="choseSignType" style="display: block;text-align: center;">Register</a>
<div class="flexCenter">
<el-button type="primary" round size="large" class="btn-lineG mb20 mt30 w100"
@click="choseSignType" style="font-size: 16px">Register</el-button>
</div>
</el-col>
</el-row>
</el-card>
<el-row gutter="14">
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn04.png"/>
<h4>Ticket Booking</h4>
</div>
</el-col>
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn01.png"/>
<h4>Hotel Reservation</h4>
</div>
</el-col>
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn02.png"/>
<h4>Vehicle Reservation</h4>
</div>
</el-col>
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn03.png"/>
<h4>Dining Reservation</h4>
</div>
</el-col>
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn05.png"/>
<h4>Makeup appointment</h4>
<h4>Makeup Appointment</h4>
</div>
</el-col>
<el-col :lg="4">
<el-col :lg="4" :md="8" :xs="12">
<div class="funcBtn" @click="building">
<img src="@/assets/dance/btn06.png"/>
<h4>Photography Appointment</h4>
......@@ -119,7 +120,7 @@
<el-row :gutter="20" v-if="matchData.signType == '0'">
<el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">
<div class="teamItem">
<el-avatar :size="60" :src="t.imgUrl||t.avatar" />
<el-avatar :size="60" :src="fillImgUrl(t.imgUrl||t.avatar)" />
<span class="name">{{ t.name }}</span>
</div>
</el-col>
......@@ -128,7 +129,7 @@
<el-col :span="24" v-for="(t,index) in signDoneGroupList" :key="t.id">
<div class="nowteamItem">
<span>{{index+1}}.</span>
<el-avatar :size="80" :src="t.imgUrl||t.avatar" :fit="cover"/>
<el-avatar :size="80" :src="fillImgUrl(t.imgUrl||t.avatar)" :fit="cover"/>
<div class="info">
<h3 class="name">{{ t.name }}</h3>
<p v-if="t.extraInfo">
......
src/viewsPc/match/pay.vue
......@@ -9,19 +9,21 @@
<div v-if="isLogin">
<group-info-row v-if="groupId" :group-id="groupId"/>
<coach-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
<div class="pd20">
<div class="pd20" v-if="signInfoList?.length>0">
<div class="leftboderTT">{{ language == 0 ? '参赛人员保险费' : 'Participant Insurance Fee' }}</div>
<!-- 人员列表-->
<sign-info-table class="mt20" v-if="matchId" :match-id="matchId" :list="signInfoList" :hasAction="false"/>
</div>
<div class="pd20">
<div class="pd20" v-if="zuTableList?.length>0">
<div class="leftboderTT">{{ language == 0 ? '参赛设项报名费' : 'Registration Fee for Event Entry' }}</div>
<zu-table class="mt20" :list="zuTableList" :hasAction="false"/>
</div>
</div>
<div v-else class="pd20 skeletonBox">
<el-skeleton :rows="8"/>
<el-button type="primary" class="w200px btn-lineG" round @click="showLogin">登录后查看详细报项信息</el-button>
<el-button type="primary" class="w200px btn-lineG" round @click="showLogin">
{{ language == 0 ?'登录后查看详细报项信息':'View detailed report information after logging in' }}
</el-button>
</div>
</el-card>
......@@ -146,13 +148,13 @@
<th>{{ language==0?'付款金额':'Payment Amount' }}</th>
<td>
¥{{ totalFee }}
<div class="text-gray">请按照指定金额进行打款</div>
<div class="text-gray">{{ language==0?'请按照指定金额进行打款':'Please make the payment according to the specified amount' }}</div>
</td>
</tr>
<tr>
<th>{{ language==0?'收款账号':`Receiver's Account Number` }}</th>
<td>
{{ form.orgBankAccountNum }}
{{ form.payInformation?.receivingAccount }}
<span v-if="language==0" class="text-primary size12">复制25位账号</span>
<span v-else class="text-primary size12">Copy 25-digit Account Number</span>
<div v-if="language==0" class="text-gray">请勿重复打款</div>
......@@ -161,37 +163,32 @@
</tr>
<tr>
<th>{{ language==0?'收款公司名':'Name of the Payee Company' }}</th>
<td>{{ form.orgBankAccount }}</td>
<td>{{ form.payInformation?.receivingCompany }}</td>
</tr>
<tr>
<th>{{ language==0?'开户银行':'Bank Name' }}</th>
<td>{{ form.orgBankName }}</td>
<td>{{ form.payInformation?.openingBank }}</td>
</tr>
<tr>
<th>{{ language==0?'备注信息':'Remarks' }}</th>
<td>
体育舞蹈报名费保险费
{{ form.payInformation?.remarks }}
</td>
</tr>
<tr>
<th>{{ language==0?'联系人':'Contacts' }}</th>
<td>
张译文
{{ form.payInformation?.contacts }}
</td>
</tr>
<tr>
<th>{{ language==0?'联系电话':'Telephone' }}</th>
<td>16882846767</td>
<td>{{ form.payInformation?.contactPhone }}</td>
</tr>
<tr>
<th>{{ language==0?'操作':'Actions' }}</th>
<td>
<el-link class="mr10" type="primary">
<el-icon>
<Upload/>
</el-icon>
{{ language==0?'上传汇款单':'Upload Remittance Receipt' }}
</el-link>
<file-upload :limit="1" v-model="voucherObj" :button-type="1" :is-show-tip="false" :button-text="language==0?'上传汇款单':'Upload Remittance Receipt'"/>
<span v-if="language==0" class="text-danger size12">*您可以在上传汇款单完成后，与联系人进行电话确认。具体缴费结果，可以在个人中心-我的报名中查看进度</span>
<span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
</td>
......@@ -199,7 +196,7 @@
</table>
<div class="text-center">
<el-button type="primary" round class="btn-lineG w200px">保存</el-button>
<el-button type="primary" @click="upRR" round class="btn-lineG w200px">{{ language==0?'保存':'Save' }}</el-button>
</div>
</div>
<div class="text-center mt20" v-else>
......@@ -217,14 +214,25 @@
<h3 class="wePrice">¥{{form.totalFee}}</h3>
</div>
</el-card>
<el-card class="mb60" v-if="form.payStatus == '1' && form.curPayType=='2'">
<!-- 线下支付待核销-->
<div class="text-center">
<el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon>
<p class="text-success">{{ language==0?'支付成功':'successful!' }}</p>
<h3 class="wePrice">¥{{form.totalFee}}</h3>
<span v-if="language==0" class="text-danger size12">*您可以在上传汇款单完成后，与联系人进行电话确认。具体缴费结果，可以在个人中心-我的报名中查看进度</span>
<span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
</div>
</el-card>
</div>
<div class="box" v-if="errorBox">
<el-result
icon="error"
title="未找到对应订单"
sub-title="请确认订单号是否正确"
:title="language==0?'未找到对应订单':'No corresponding order found'"
:sub-title="language==0?'请确认订单号是否正确':'Please confirm if the order number is correct'"
>
<template #extra>
<el-button type="primary" @click="goHome" class="btn-lineG w200px" round>{{ language==0?'返回首页':'Home' }}</el-button>
......@@ -256,6 +264,8 @@ import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row";
import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
import ZuTable from "@/viewsPc/match/components/zu-table";
import useUserStore from "@/store/modules/user";
import FileUpload from "@/components/FileUpload";
import {upReceipt} from "@/apiPc/match";
const isLogin = ref(false)
const language = ref(cache.local.get('language') || 0)
const signInfoList = ref([])
......@@ -263,6 +273,10 @@ const zuTableList = ref([])
const totalFee = ref('')
const wePayCodeUrl = ref('')
const form = ref({})
const voucherObj = ref({})
const upForm = ref({
orderId:orderId.value
})
const errorBox = ref(false)
const hideconfirmbtn = ref(false)
console.log(route.query.orderId)
......@@ -285,7 +299,12 @@ function getData() {
errorBox.value = true
})
}
function upRR() {
upForm.value.voucher = voucherObj.value[0].url
match.upReceipt(upForm.value).then(res=>{
getData()
})
}
function getSignList() {
match.getMySignInfoList({
cptId: matchId.value,
......@@ -300,6 +319,7 @@ function goHome() {
}
function changePaytype() {
hideconfirmbtn.value = false
wePayCodeUrl.value = ''
if(handle) {
clearTimeout(handle)
handle=null
......
src/viewsPc/register/team/step3.vue
......@@ -10,7 +10,7 @@
</div>
</div>
<div class="text-center mt30 mb20">
<el-button class="primary-kx w200px" round @click="goHome">{{ language == 0 ? '返回首页' : 'Homepage' }}</el-button>
<el-button class="primary-kx w200px" round @click="goHome">{{ language == 0 ? '返回首页' : 'Return to Homepage' }}</el-button>
<el-button type="primary" class="btn-lineG w200px" round @click="goSign">{{ language == 0 ? '去报名' : 'Sign Up' }}</el-button>
</div>
</el-card>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!