Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
0cb2e2e0 by 杨炀
Options

no message

1 parent c8bd032f
Inline Side-by-side
Showing 12 changed files with 75 additions and 68 deletions
src/apiPc/match.js
......@@ -650,6 +650,13 @@ export function checkMate(query) {
params:query
})
}
export function checkIdcCode(query) {
return request({
url: `/systemj/personInfo/extractInfo`,
method: 'get',
params:query
})
}
export function addInvitation(data) {
return request({
url: `/league/person`,
......
src/layoutPc/components/AppBottom.vue
......@@ -83,7 +83,7 @@
<div @click="goHelpZH">
<a target="_blank" href="/file/操作指引.zip">
<img class="kf" src="@/assets/logo/btn02.png"/>
<div class="text-center mt10 gradient-text">操作指引</div>
<div class="text-center mt10 gradient-text">指南下载</div>
</a>
</div>
</div>
......@@ -104,6 +104,7 @@
<script setup>
import {useStorage} from "@vueuse/core/index";
import {useRouter} from "vue-router";
import {ElMessage} from "element-plus";
const router = useRouter()
const language = useStorage('language', 0)
const goHelp = () => {
......@@ -115,7 +116,7 @@ const goHelp = () => {
})
}
const goHelpZH = () => {
ElMessage.success('已下载文件')
}
</script>
......
src/viewsPc/components/homeQuick.vue
......@@ -133,8 +133,6 @@ function goBooking(n) {
break;
case 4:
//化妆
building()
router.push({path: `/booking/makeup/${props.matchId}`})
break;
case 5:
......
src/viewsPc/match/chooseCoach.vue
......@@ -361,6 +361,7 @@ function goNext() {
}
function goPrev() {
console.log(languageSource.value)
if(languageSource.value=='100'){
router.push({
name: `teamSignCn`,
......@@ -388,10 +389,10 @@ function editPerson(id) {
id: id,
groupId: groupId.value || 0
}
if(language.value==0){
if(isNational.value){
proxy.$refs['dialogAddCoachRef_En'].open(obj)
}else {
proxy.$refs['dialogAddCoachRef_En'].open(obj)
proxy.$refs['dialogAddCoachRef'].open(obj)
}
}
......@@ -402,11 +403,11 @@ function addCoach(n) {
label: n,
groupId: groupId.value
}
// if(language.value==0){
// proxy.$refs['dialogAddCoachRef'].open(obj)
// }else {
if(isNational.value){
proxy.$refs['dialogAddCoachRef_En'].open(obj)
// }
}else {
proxy.$refs['dialogAddCoachRef'].open(obj)
}
}
</script>
......
src/viewsPc/match/chooseSportsman.vue
......@@ -18,9 +18,10 @@
</el-button>
</div>
<div class="panel-body" style="padding: 10px">
<div class="tip text-right">
*{{ language == 0?'可通过[选手管理]，增加和编辑运动员':'You can add and edit athletes through [Athlete Management]' }}
</div>
<div style="margin: 0 4px 10px;display: flex">
<!-- 可通过选手管理，增加和编辑运动员-->
<el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
@change="changechoosed">
<el-option v-for="c in athletesList" :key="c.id" :label="c.xing + c.ming" :value="c.id">
......@@ -601,7 +602,7 @@ function removeCurproject() {
projectIds.value = _.without(projectIds.value, currProjectId.value)
}
function checkTwo(a,b) {
match.checkMate({per1Id:a,per2Id:b}).then(res=>{
match.checkMate({per1Id:a,per2Id:b,cptId:matchId.value}).then(res=>{
if(!res.data){
ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
}
......
src/viewsPc/match/components/addCoach.vue
......@@ -8,7 +8,7 @@
<el-row :gutter="30" class="mt30">
<el-col :lg="12" class="touxiang">
<el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'">
<el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
<ImageUpload2
v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
:is-show-tip="false"
......@@ -18,14 +18,11 @@
<span v-if="form.wdsfMin">{{form.wdsfMin}}</span>
<el-input v-else 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>
<el-form-item :label="language==0?'名':'name'" prop="ming" required>
<el-input v-model="form.ming"/>
<el-form-item :label="language==0?'姓名':'Name'" prop="realName" required>
<el-input v-model="form.realName"/>
</el-form-item>
<el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required>
<el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay">
<el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay&&form.idcType=='0'">
<el-option
v-for="item in certificates"
:key="item.value"
......@@ -35,10 +32,11 @@
</el-select>
</el-form-item>
<el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
<el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay"/>
<el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay&&form.idcType=='0'"/>
</el-form-item>
<el-form-item :label="language==0?'有效证件':'Valid Passport'" required :required="form.idcType!='0'">
<el-form-item :label="language==0?'有效证件':'Valid Passport'" :required="form.idcType!='0'">
<file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" />
<span class="tip">*请上传有效证件扫描件</span>
</el-form-item>
<el-form-item :label="language==0?'性别':'Gender'" prop="sex">
<el-radio-group v-model="form.sex" :disabled="form.idcType=='0'">
......@@ -60,8 +58,9 @@
<el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?l.label:l.enlabel"/>
</el-select>
</el-form-item>
<el-form-item :label="language==0?'手机号码':'Phone'" prop="phone">
<el-form-item :label="language==0?'手机号码':'Phone'" prop="phone" required>
<el-input v-model="form.phone" type="number"/>
<span class="tip">*若未成年人没有手机号，请填写家长号码</span>
</el-form-item>
......@@ -133,8 +132,7 @@ const data = reactive({
sex:'0'
},
rules: {
xing: [{required: true, message: '必填', trigger: 'blur'}],
ming: [{required: true, message: '必填', trigger: 'blur'}],
realName: [{required: true, message: '必填', trigger: 'blur'}],
// countryId: [{required: true, message: '必填', trigger: 'change'}],
idcType: [{required: true, message: '必填', trigger: 'change'}],
idcCode: [{required: true, message: '必填', trigger: 'blur'}],
......@@ -142,13 +140,12 @@ const data = reactive({
// regionId: [{ required: true, message: '必填', trigger: 'change' }],
birth: [{required: true, message: '必填', trigger: 'change'}],
// address: [{ required: true, message: '必填', trigger: 'blur' }],
// picUrl: [{required: true, message: '必填', trigger: 'blur'}],
picUrl: [{required: true, message: '必填', trigger: 'blur'}],
sex: [{required: true, message: '必填', trigger: 'change'}],
labelArr: [{required: true, message: '必填', trigger: 'change'}]
},
rules_cn:{
xing: [{required: true, message: 'required', trigger: 'blur'}],
ming: [{required: true, message: 'required', trigger: 'blur'}],
realName: [{required: true, message: 'required', trigger: 'blur'}],
// countryId: [{required: true, message: 'required', trigger: 'change'}],
idcType: [{required: true, message: 'required', trigger: 'change'}],
idcCode: [{required: true, message: 'required', trigger: 'blur'}],
......@@ -156,7 +153,7 @@ const data = reactive({
// regionId: [{ required: true, message: 'required', trigger: 'change' }],
birth: [{required: true, message: 'required', trigger: 'change'}],
// address: [{ required: true, message: 'required', trigger: 'blur' }],
// picUrl: [{required: true, message: 'required', trigger: 'blur'}],
picUrl: [{required: true, message: 'required', trigger: 'blur'}],
sex: [{required: true, message: 'required', trigger: 'change'}],
labelArr: [{required: true, message: 'required', trigger: 'change'}]
},
......@@ -185,13 +182,14 @@ onMounted(() => {
})
const editgay = ref(false)
const open = (params) => {
console.log(params.label)
show.value = true
title.value = params.title
groupId.value = params.groupId || '0'
isMe.value = params.isMe
if(params.label){
form.value.labelArr= [params.label]
} else {
form.value.labelArr = []
}
if(language.value == 0){
form.value.countryId = 240
......@@ -261,20 +259,17 @@ function getRegionsList() {
function checkCode() {
if (form.value.idcType=='0' && form.value.idcCode) {
giveBirthDay()
// giveBirthDay()
var obj = {
idcType: form.value.idcType,
idcCode: form.value.idcCode
idcCode: form.value.idcCode,
name: form.value.realName
}
// match.checkPerson(obj).then(res => {
// if (res.data.idcCode != null) {
// form.value = res.data
// if (form.value.label != null) {
// form.value.labelArr = form.value.label.split(',')
// }
// form.value.groupId = groupId.value
// }
// })
match.checkIdcCode(obj).then(res => {
if (res.data) {
form.value.birth = res.data.birth
form.value.sex = res.data.sex
}
})
}
}
......@@ -324,10 +319,10 @@ function submitForm() {
return
}
}
if(!form.value.passportUrl){
ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file')
return
}
// if(!form.value.passportUrl){
// ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file')
// return
// }
if (typeof (form.value.regionId) === 'object') {
form.value.regionId = _.last(form.value.regionId)
}
......
src/viewsPc/match/components/allSportsmanList.vue
......@@ -92,7 +92,9 @@
<!-- </template>-->
</el-dialog>
<!-- 国内赛运动员-->
<add-coach ref="dialogAddCoach" @submitForm="getList"/>
<!-- 国际赛运动员-->
<add-wdsf ref="dialogAddWdsf" @submitForm="getList"/>
<Import ref="dialogImportProps" @submitForm="getList"/>
</template>
......
src/viewsPc/match/components/matchInfo-projectList.vue
......@@ -14,7 +14,7 @@
<span v-else>{{ scope.row.playType }}</span>
</template>
</el-table-column>
<el-table-column :label="language==0?'参赛年龄':'Age'" align="center" min-width="100">
<el-table-column :label="language==0?'参赛年龄':'Age'" align="center" :min-width="isNational?100:240">
<template #default="scope">
<div v-if="isNational">
<span v-if="scope.row.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span>
......@@ -34,8 +34,8 @@
<span v-if="scope.row.ageGroup == '14'" >Senior V</span>
</div>
<div v-else>
<div>{{ scope.row.birthPeriod }}</div>
<div>{{scope.row.birthPeriodSecond}}</div>
<div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
<div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
</div>
</template>
</el-table-column>
......
src/viewsPc/match/detail_en.vue
......@@ -552,7 +552,7 @@ function checkIsSign() {
).then(() => {
withDraw(res.data.orderId)
})
// return Promise.reject('rejected message')
return Promise.reject('rejected message')
break
case '2':
ElMessageBox.confirm(
......
src/viewsPc/match/teamSign.vue
......@@ -174,7 +174,8 @@ const data = reactive({
// address: { required: true, message: 'required', trigger: 'blur' }
},
coachOrLeaderFlag: '',
matchInfo:{}
matchInfo:{},
languageSource:''
})
const {
isNational,matchData,
......@@ -186,7 +187,7 @@ const {
cptId,
rules,rules_en,
regionsList,countryList,matchInfo,
coachOrLeaderFlag, accept,typeOptions
coachOrLeaderFlag, accept,typeOptions,languageSource
} = toRefs(data)
const uploadUrl = ref('/upload/upLoadToFileServer')
......@@ -196,6 +197,7 @@ onMounted(() => {
getGroupInfo()
signType.value = route.query.signType
isNational.value = route.query.isNational
languageSource.value = route.query.languageSource
getRegionsList()
getCountryList()
......@@ -325,7 +327,8 @@ function goNext() {
query: {
matchId: cptId.value,
groupId: groupId.value,
isNational: isNational.value
isNational: isNational.value,
languageSource:languageSource.value
}
})
}
......
src/viewsPc/match/teamSign_Cn.vue
......@@ -37,6 +37,9 @@
<el-form-item :label="language==0?'负责人姓名':'Contact Person'" prop="contactPerson">
<el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" />
</el-form-item>
<el-form-item :label="language==0?'联系电话':'Contact Phone'" required prop="contactTelno">
<el-input v-model="form.contactTelno" type="phone" :placeholder="language==0?'请输入内容':''"/>
</el-form-item>
<el-form-item :label="language==0?'邮箱':'Email'" required prop="contactEmail">
<el-input v-model="form.contactEmail" type="email" :placeholder="language==0?'请输入内容':''"/>
</el-form-item>
......@@ -148,13 +151,13 @@ const data = reactive({
regionsList: [],
countryList: [],
participantsInfoArr: [],
rankList: [],
accept: '.doc, .pdf, .docx, .zip',
rules: {
imgUrl: { required: true, message: '请上传', trigger: 'blur' },
name: { required: true, message: '请填写', trigger: 'blur' },
type: { required: true, message: '请选择', trigger: 'change' },
contactPerson: { required: true, message: '请填写内容', trigger: 'blur' },
contactTelno: { required: true, message: '请填写内容', trigger: 'blur' },
contactEmail: { required: true, message: '请填写内容', trigger: 'blur' },
abreviations: { required: true, message: '请填写内容', trigger: 'blur' },
address: { required: true, message: '请填写内容', trigger: 'blur' }
......@@ -169,11 +172,11 @@ const data = reactive({
address: { required: true, message: 'required', trigger: 'blur' }
},
coachOrLeaderFlag: '',
languageSource: '',
matchInfo:{}
})
const {
isRanks,matchData,
rankList,
matchData,
form,
groupId,
signType,
......@@ -181,7 +184,7 @@ const {
cptId,
rules,rules_en,
regionsList,countryList,matchInfo,
coachOrLeaderFlag, accept,typeOptions
coachOrLeaderFlag, accept,typeOptions,languageSource
} = toRefs(data)
const uploadUrl = ref('/upload/upLoadToFileServer')
......@@ -190,7 +193,7 @@ onMounted(() => {
// 获取团体信息
getGroupInfo()
signType.value = route.query.signType
languageSource.value = route.query.languageSource
getRegionsList()
getCountryList()
match.getMatchById({ id: cptId.value }).then(res => {
......@@ -249,11 +252,6 @@ function getGroupInfo() {
})
}
function getTeamList() {
return match.getMyTeamList(cptId.value, groupId.value).then(response => {
rankList.value = response.data
})
}
function goPrev() {
router.go(-1)
......@@ -315,7 +313,8 @@ function goNext() {
query: {
matchId: cptId.value,
groupId: groupId.value,
signType: signType.value
signType: signType.value,
languageSource:languageSource.value
}
})
}
......
vite.config.js
......@@ -76,15 +76,15 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
// target: 'https://dance.itechtop.cn/stage-api',
target: 'http://192.168.1.118:8081/',
target: 'https://dance.itechtop.cn/stage-api',
// target: 'http://192.168.1.118: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.131:8081/',
// target: 'https://dance.itechtop.cn/stage-api',
target: 'https://wdsfwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/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!