Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
b1908dcf by zhangmeng
Options

Merge branch '舞蹈修改' into dev

2 parents 5f6fdd28 88074c19
Expand all
Inline Side-by-side
Showing 12 changed files with 219 additions and 81 deletions
src/apiPc/match.js
......@@ -257,7 +257,7 @@ export function recoverMySignFromCancel(cptId) {
return request({
url: `/league/sign/recoverMySignFromCancel`,
method: 'post',
data: {cptId: cptId}
data: { cptId: cptId }
})
}
......@@ -402,7 +402,7 @@ export function delPerson(id) {
})
}
//个人账号
// 个人账号
export function delPersonForPersonal(id) {
return request({
url: `/systemj/personInfo/singleDelete/${id}`,
......@@ -506,7 +506,8 @@ export function commitSign(data) {
export function getTotalFee(data) {
return request({
url: `/league/expenseConfig/getTotalFee/${data.cptId}/${data.entryId}`,
method: 'get'
method: 'get',
params: data
})
}
......@@ -639,7 +640,7 @@ export function saveWdsfMin(obj, groupId) {
})
}
//todo
// todo
export function bindWdsf(perId, card) {
return request({
url: `/systemj/personInfo/bindWdsf/${perId}?card=${card}`,
......@@ -771,12 +772,14 @@ export function getAboutUs(params) {
params
})
}
export function getppInfo(params) {
return request({
url: `/portal/website/${params}`,
method: 'get'
})
}
export function getZNList(params) {
return request({
url: `/Portal/websiteInfo/list`,
......@@ -785,4 +788,21 @@ export function getZNList(params) {
})
}
// 团体报名校验
export function preCheckForGroup(groupId) {
return request({
url: `/systemj/personInfo/preCheckForGroup/${groupId}`,
method: 'get'
})
}
// 个人报名校验
export function preCheckForPerson(params) {
return request({
url: `/systemj/personInfo/preCheckForPerson`,
method: 'get',
params
})
}
......
src/viewsPc/match/components/insuranceView.vue 0 → 100644
<template>
<el-dialog
v-model="show" :close-on-click-modal="false" :title="language==0?'赛事购买协会':'Event Insurance Procurement Agreement'" append-to-body center
class="pcloginpop"
close-icon="CircleClose" destroy-on-close
width="1100px"
>
<div v-html="data" />
<template #footer>
<div class="dialog-footer text-center">
<el-button class="btn-lineG w200px" round type="primary" @click="submitForm">{{
language == 0 ? '确定' : 'Save'
}}
</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup>
import { getCurrentInstance, ref } from '@vue/runtime-core'
import { useStorage } from '@vueuse/core/index'
const language = useStorage('language', 0)
const { proxy } = getCurrentInstance()
const emit = defineEmits(['submitForm'])
const show = ref(false)
const data = ref()
const open = (row) => {
show.value = true
data.value = row
}
function submitForm() {
show.value = false
}
defineExpose({ open })
</script>
<style lang="scss">
.threeFour {
width: 100%;
.el-upload--picture-card {
width: 120px;
height: 160px;
}
.el-upload-list--picture-card .el-upload-list__item {
width: 120px;
height: 160px;
}
}
.tip {
font-size: 13px;
color: #999;
margin: 10px 0;
i {
color: red;
margin: 0 4px 0 0;
}
}
.shenfen {
.el-upload--picture-card {
width: 320px;
height: 200px;
}
.el-upload-list--picture-card .el-upload-list__item {
width: 320px;
height: 200px;
}
}
.touxiang {
:deep(.el-upload--picture-card ) {
width: 140px;
height: 200px;
}
}
.touxiang {
:deep(.el-upload-list__item ) {
width: 140px;
height: 200px;
}
}
.el-form--inline .el-form-item {
width: 100%
}
.boxDialog {
.el-dialog__header {
background: linear-gradient(#ed2c22, #fe6d45);
margin-right: 0;
height: 52px;
span {
color: #fff;
}
}
}
</style>
src/viewsPc/match/components/matchInfo.vue
<template>
<div style="padding: 0 20px 20px" v-if="language==0">
<div v-if="language==0" style="padding: 0 20px 20px">
<!--赛事详情-->
<div class="indexTitle">
<h3 class="leftboderTT">组织机构</h3>
</div>
<div class="xzbox" v-html="form.ocOrganizer">
</div>
<div class="indexTitle" v-if="form.languageSource!='100'"><h3 class="leftboderTT">报名须知</h3></div>
<div class="xzbox" v-if="form.languageSource!='100'">
<div v-html="form.signKnow"></div>
<div class="xzbox" v-html="form.ocOrganizer" />
<div v-if="form.languageSource!='100'" class="indexTitle"><h3 class="leftboderTT">报名须知</h3></div>
<div v-if="form.languageSource!='100'" class="xzbox">
<div v-html="form.signKnow" />
<div v-if="form.signKnowUrl">
<el-link v-for="(item,index) in JSON.parse(form.signKnowUrl)" type="primary"
:href="fillImgUrl(item.url)" target="_blank">
<el-link
v-for="(item,index) in JSON.parse(form.signKnowUrl)" :key="index" :href="fillImgUrl(item.url)"
target="_blank" type="primary"
>
<el-icon :size="20">
<Download />
</el-icon>
{{ item.name }}
</el-link>
</div>
</div>
<!-- <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" v-if="form.languageSource=='100'"><h3 class="leftboderTT">赛事规程</h3></div>
<div class="xzbox" v-if="form.languageSource=='100'">
<div v-html="form.ruleContent"></div>
<el-link v-if="form.ruleUrl" type="primary" :href="fillImgUrl(JSON.parse(form.ruleUrl)[0]?.url)" target="_blank">
<!-- <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 v-if="form.languageSource=='100'" class="indexTitle"><h3 class="leftboderTT">赛事规程</h3></div>
<div v-if="form.languageSource=='100'" class="xzbox">
<div v-html="form.ruleContent" />
<el-link v-if="form.ruleUrl" :href="fillImgUrl(JSON.parse(form.ruleUrl)[0]?.url)" target="_blank" type="primary">
<el-icon :size="20">
<Download />
</el-icon>
{{ JSON.parse(form.ruleUrl)[0]?.name }}
</el-link>
</div>
<!-- <div class="indexTitle" v-if="form.type==1&&form.cptProjectList?.length > 0"><h3 class="leftboderTT">竞赛项目</h3></div>-->
<!-- <div v-if="form.type==1&&form.cptProjectList?.length > 0">-->
<!-- </div>-->
<!-- <div class="indexTitle" v-if="form.type==1&&form.cptProjectList?.length > 0"><h3 class="leftboderTT">竞赛项目</h3></div>-->
<!-- <div v-if="form.type==1&&form.cptProjectList?.length > 0">-->
<!-- </div>-->
</div>
<div style="padding: 0 20px 20px" v-else>
<div v-else style="padding: 0 20px 20px">
<!--赛事详情-->
<div class="indexTitle">
<h3 class="leftboderTT">Organization</h3>
</div>
<div class="xzbox" v-html="form.ocOrganizer">
</div>
<div class="xzbox" v-html="form.ocOrganizer" />
<div class="indexTitle"><h3 class="leftboderTT">Notes</h3></div>
<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">
<div v-html="form.signKnow" />
<el-link
v-if="form.signKnowUrl" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank"
type="primary"
>
<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"><h3 class="leftboderTT">Competition Regulations</h3></div>-->
<!-- <div class="xzbox">-->
<!-- <div v-html="form.ruleContent">-->
<!-- </div>-->
<!-- <el-link v-if="form.ruleUrl" type="primary" :href="fillImgUrl(JSON.parse(form.ruleUrl)[0]?.url)" target="_blank">-->
<!-- <el-icon :size="20">-->
<!-- <Download />-->
<!-- </el-icon>-->
<!-- {{ JSON.parse(form.ruleUrl)[0]?.name }}-->
<!-- </el-link>-->
<!-- </div>-->
<div class="indexTitle" v-if="form.type==1 && form.cptProjectList?.length > 0"><h3 class="leftboderTT">Event settings</h3></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"><h3 class="leftboderTT">Competition Regulations</h3></div>-->
<!-- <div class="xzbox">-->
<!-- <div v-html="form.ruleContent">-->
<!-- </div>-->
<!-- <el-link v-if="form.ruleUrl" type="primary" :href="fillImgUrl(JSON.parse(form.ruleUrl)[0]?.url)" target="_blank">-->
<!-- <el-icon :size="20">-->
<!-- <Download />-->
<!-- </el-icon>-->
<!-- {{ JSON.parse(form.ruleUrl)[0]?.name }}-->
<!-- </el-link>-->
<!-- </div>-->
<div v-if="form.type==1 && form.cptProjectList?.length > 0" class="indexTitle"><h3 class="leftboderTT">Event
settings</h3></div>
<div v-if="form.type==1 && form.cptProjectList?.length > 0">
<match-info-project-list :match-id="form.id" :is-national="form.languageSource!='100'"/>
<match-info-project-list :is-national="form.languageSource!='100'" :match-id="form.id" />
</div>
</div>
</template>
<script setup>
import {ref} from "vue";
import MatchInfoProjectList from "@/viewsPc/match/components/matchInfo-projectList";
import {useStorage} from "@vueuse/core/index";
import {onMounted} from "@vue/runtime-core";
import { ref } from 'vue'
import MatchInfoProjectList from '@/viewsPc/match/components/matchInfo-projectList'
import { useStorage } from '@vueuse/core/index'
import { onMounted } from '@vue/runtime-core'
const language= useStorage('language',0)
const language = useStorage('language', 0)
const props = defineProps({
form:{
type:Object,
required:true
form: {
type: Object,
required: true
}
})
</script>
<style scoped lang="scss">
.indexTitle{margin: 20px 0 12px;
h3{
<style lang="scss" scoped>
.indexTitle {
margin: 20px 0 12px;
h3 {
font-size: 20px;
color:var(--el-color-primary);
color: var(--el-color-primary);
}
}
......
vite.config.js
......@@ -64,33 +64,33 @@ export default defineConfig(({ mode, command }) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api/ztx-train': {
// target: 'http://123.60.96.243:1896/stage-api',
target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.243:1896/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
},
'/dev-api/ztx-match': {
target: 'http://192.168.1.253:8081',
target: 'http://192.168.1.243:8081',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
target: 'http://192.168.1.253:8081',
target: 'http://192.168.1.243:8081',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.118:8081/',
// target: 'http://192.168.1.253:8081',
// target: 'http://192.168.1.118:8081/',
target: 'http://192.168.1.243:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
},
'/ticket': {
// target: 'http://192.168.1.131:8081/',
target: 'https://jijin.wtwuxicenter.com/h5/',
target: 'http://192.168.1.243:8081/',
// target: 'https://jijin.wtwuxicenter.com/h5/',
// target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/ticket/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!