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 76 additions and 69 deletions
src/apiPc/match.js
...@@ -650,6 +650,13 @@ export function checkMate(query) { ...@@ -650,6 +650,13 @@ export function checkMate(query) {
650 params:query 650 params:query
651 }) 651 })
652 } 652 }
653 export function checkIdcCode(query) {
654 return request({
655 url: `/systemj/personInfo/extractInfo`,
656 method: 'get',
657 params:query
658 })
659 }
653 export function addInvitation(data) { 660 export function addInvitation(data) {
654 return request({ 661 return request({
655 url: `/league/person`, 662 url: `/league/person`,
......
src/layoutPc/components/AppBottom.vue
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 <div @click="goHelpZH"> 83 <div @click="goHelpZH">
84 <a target="_blank" href="/file/操作指引.zip"> 84 <a target="_blank" href="/file/操作指引.zip">
85 <img class="kf" src="@/assets/logo/btn02.png"/> 85 <img class="kf" src="@/assets/logo/btn02.png"/>
86 <div class="text-center mt10 gradient-text">操作指引</div> 86 <div class="text-center mt10 gradient-text">指南下载</div>
87 </a> 87 </a>
88 </div> 88 </div>
89 </div> 89 </div>
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
104 <script setup> 104 <script setup>
105 import {useStorage} from "@vueuse/core/index"; 105 import {useStorage} from "@vueuse/core/index";
106 import {useRouter} from "vue-router"; 106 import {useRouter} from "vue-router";
107 import {ElMessage} from "element-plus";
107 const router = useRouter() 108 const router = useRouter()
108 const language = useStorage('language', 0) 109 const language = useStorage('language', 0)
109 const goHelp = () => { 110 const goHelp = () => {
...@@ -115,7 +116,7 @@ const goHelp = () => { ...@@ -115,7 +116,7 @@ const goHelp = () => {
115 }) 116 })
116 } 117 }
117 const goHelpZH = () => { 118 const goHelpZH = () => {
118 119 ElMessage.success('已下载文件')
119 } 120 }
120 </script> 121 </script>
121 122
......
src/viewsPc/components/homeQuick.vue
...@@ -133,8 +133,6 @@ function goBooking(n) { ...@@ -133,8 +133,6 @@ function goBooking(n) {
133 break; 133 break;
134 case 4: 134 case 4:
135 //化妆 135 //化妆
136 building()
137
138 router.push({path: `/booking/makeup/${props.matchId}`}) 136 router.push({path: `/booking/makeup/${props.matchId}`})
139 break; 137 break;
140 case 5: 138 case 5:
......
src/viewsPc/match/chooseCoach.vue
...@@ -361,6 +361,7 @@ function goNext() { ...@@ -361,6 +361,7 @@ function goNext() {
361 } 361 }
362 362
363 function goPrev() { 363 function goPrev() {
364 console.log(languageSource.value)
364 if(languageSource.value=='100'){ 365 if(languageSource.value=='100'){
365 router.push({ 366 router.push({
366 name: `teamSignCn`, 367 name: `teamSignCn`,
...@@ -388,10 +389,10 @@ function editPerson(id) { ...@@ -388,10 +389,10 @@ function editPerson(id) {
388 id: id, 389 id: id,
389 groupId: groupId.value || 0 390 groupId: groupId.value || 0
390 } 391 }
391 if(language.value==0){ 392 if(isNational.value){
392 proxy.$refs['dialogAddCoachRef_En'].open(obj) 393 proxy.$refs['dialogAddCoachRef_En'].open(obj)
393 }else { 394 }else {
394 proxy.$refs['dialogAddCoachRef_En'].open(obj) 395 proxy.$refs['dialogAddCoachRef'].open(obj)
395 } 396 }
396 } 397 }
397 398
...@@ -402,11 +403,11 @@ function addCoach(n) { ...@@ -402,11 +403,11 @@ function addCoach(n) {
402 label: n, 403 label: n,
403 groupId: groupId.value 404 groupId: groupId.value
404 } 405 }
405 // if(language.value==0){ 406 if(isNational.value){
406 // proxy.$refs['dialogAddCoachRef'].open(obj)
407 // }else {
408 proxy.$refs['dialogAddCoachRef_En'].open(obj) 407 proxy.$refs['dialogAddCoachRef_En'].open(obj)
409 // } 408 }else {
409 proxy.$refs['dialogAddCoachRef'].open(obj)
410 }
410 } 411 }
411 </script> 412 </script>
412 413
......
src/viewsPc/match/chooseSportsman.vue
...@@ -18,9 +18,10 @@ ...@@ -18,9 +18,10 @@
18 </el-button> 18 </el-button>
19 </div> 19 </div>
20 <div class="panel-body" style="padding: 10px"> 20 <div class="panel-body" style="padding: 10px">
21 <div class="tip text-right">
22 *{{ language == 0?'可通过[选手管理]，增加和编辑运动员':'You can add and edit athletes through [Athlete Management]' }}
23 </div>
21 <div style="margin: 0 4px 10px;display: flex"> 24 <div style="margin: 0 4px 10px;display: flex">
22 <!-- 可通过选手管理，增加和编辑运动员-->
23
24 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable 25 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
25 @change="changechoosed"> 26 @change="changechoosed">
26 <el-option v-for="c in athletesList" :key="c.id" :label="c.xing + c.ming" :value="c.id"> 27 <el-option v-for="c in athletesList" :key="c.id" :label="c.xing + c.ming" :value="c.id">
...@@ -601,7 +602,7 @@ function removeCurproject() { ...@@ -601,7 +602,7 @@ function removeCurproject() {
601 projectIds.value = _.without(projectIds.value, currProjectId.value) 602 projectIds.value = _.without(projectIds.value, currProjectId.value)
602 } 603 }
603 function checkTwo(a,b) { 604 function checkTwo(a,b) {
604 match.checkMate({per1Id:a,per2Id:b}).then(res=>{ 605 match.checkMate({per1Id:a,per2Id:b,cptId:matchId.value}).then(res=>{
605 if(!res.data){ 606 if(!res.data){
606 ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple') 607 ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
607 } 608 }
......
src/viewsPc/match/components/addCoach.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row :gutter="30" class="mt30"> 8 <el-row :gutter="30" class="mt30">
9 <el-col :lg="12" class="touxiang"> 9 <el-col :lg="12" class="touxiang">
10 10
11 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'"> 11 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
12 <ImageUpload2 12 <ImageUpload2
13 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1" 13 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
14 :is-show-tip="false" 14 :is-show-tip="false"
...@@ -18,14 +18,11 @@ ...@@ -18,14 +18,11 @@
18 <span v-if="form.wdsfMin">{{form.wdsfMin}}</span> 18 <span v-if="form.wdsfMin">{{form.wdsfMin}}</span>
19 <el-input v-else v-model="form.wdsfMin" type="number"/> 19 <el-input v-else v-model="form.wdsfMin" type="number"/>
20 </el-form-item> 20 </el-form-item>
21 <el-form-item :label="language==0?'姓氏':'surname'" prop="xing" required> 21 <el-form-item :label="language==0?'姓名':'Name'" prop="realName" required>
22 <el-input v-model="form.xing"/> 22 <el-input v-model="form.realName"/>
23 </el-form-item>
24 <el-form-item :label="language==0?'名':'name'" prop="ming" required>
25 <el-input v-model="form.ming"/>
26 </el-form-item> 23 </el-form-item>
27 <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required> 24 <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required>
28 <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay"> 25 <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay&&form.idcType=='0'">
29 <el-option 26 <el-option
30 v-for="item in certificates" 27 v-for="item in certificates"
31 :key="item.value" 28 :key="item.value"
...@@ -35,10 +32,11 @@ ...@@ -35,10 +32,11 @@
35 </el-select> 32 </el-select>
36 </el-form-item> 33 </el-form-item>
37 <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required> 34 <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
38 <el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay"/> 35 <el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay&&form.idcType=='0'"/>
39 </el-form-item> 36 </el-form-item>
40 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required :required="form.idcType!='0'"> 37 <el-form-item :label="language==0?'有效证件':'Valid Passport'" :required="form.idcType!='0'">
41 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" /> 38 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" />
39 <span class="tip">*请上传有效证件扫描件</span>
42 </el-form-item> 40 </el-form-item>
43 <el-form-item :label="language==0?'性别':'Gender'" prop="sex"> 41 <el-form-item :label="language==0?'性别':'Gender'" prop="sex">
44 <el-radio-group v-model="form.sex" :disabled="form.idcType=='0'"> 42 <el-radio-group v-model="form.sex" :disabled="form.idcType=='0'">
...@@ -60,8 +58,9 @@ ...@@ -60,8 +58,9 @@
60 <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?l.label:l.enlabel"/> 58 <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?l.label:l.enlabel"/>
61 </el-select> 59 </el-select>
62 </el-form-item> 60 </el-form-item>
63 <el-form-item :label="language==0?'手机号码':'Phone'" prop="phone"> 61 <el-form-item :label="language==0?'手机号码':'Phone'" prop="phone" required>
64 <el-input v-model="form.phone" type="number"/> 62 <el-input v-model="form.phone" type="number"/>
63 <span class="tip">*若未成年人没有手机号，请填写家长号码</span>
65 </el-form-item> 64 </el-form-item>
66 65
67 66
...@@ -133,8 +132,7 @@ const data = reactive({ ...@@ -133,8 +132,7 @@ const data = reactive({
133 sex:'0' 132 sex:'0'
134 }, 133 },
135 rules: { 134 rules: {
136 xing: [{required: true, message: '必填', trigger: 'blur'}], 135 realName: [{required: true, message: '必填', trigger: 'blur'}],
137 ming: [{required: true, message: '必填', trigger: 'blur'}],
138 // countryId: [{required: true, message: '必填', trigger: 'change'}], 136 // countryId: [{required: true, message: '必填', trigger: 'change'}],
139 idcType: [{required: true, message: '必填', trigger: 'change'}], 137 idcType: [{required: true, message: '必填', trigger: 'change'}],
140 idcCode: [{required: true, message: '必填', trigger: 'blur'}], 138 idcCode: [{required: true, message: '必填', trigger: 'blur'}],
...@@ -142,13 +140,12 @@ const data = reactive({ ...@@ -142,13 +140,12 @@ const data = reactive({
142 // regionId: [{ required: true, message: '必填', trigger: 'change' }], 140 // regionId: [{ required: true, message: '必填', trigger: 'change' }],
143 birth: [{required: true, message: '必填', trigger: 'change'}], 141 birth: [{required: true, message: '必填', trigger: 'change'}],
144 // address: [{ required: true, message: '必填', trigger: 'blur' }], 142 // address: [{ required: true, message: '必填', trigger: 'blur' }],
145 // picUrl: [{required: true, message: '必填', trigger: 'blur'}], 143 picUrl: [{required: true, message: '必填', trigger: 'blur'}],
146 sex: [{required: true, message: '必填', trigger: 'change'}], 144 sex: [{required: true, message: '必填', trigger: 'change'}],
147 labelArr: [{required: true, message: '必填', trigger: 'change'}] 145 labelArr: [{required: true, message: '必填', trigger: 'change'}]
148 }, 146 },
149 rules_cn:{ 147 rules_cn:{
150 xing: [{required: true, message: 'required', trigger: 'blur'}], 148 realName: [{required: true, message: 'required', trigger: 'blur'}],
151 ming: [{required: true, message: 'required', trigger: 'blur'}],
152 // countryId: [{required: true, message: 'required', trigger: 'change'}], 149 // countryId: [{required: true, message: 'required', trigger: 'change'}],
153 idcType: [{required: true, message: 'required', trigger: 'change'}], 150 idcType: [{required: true, message: 'required', trigger: 'change'}],
154 idcCode: [{required: true, message: 'required', trigger: 'blur'}], 151 idcCode: [{required: true, message: 'required', trigger: 'blur'}],
...@@ -156,7 +153,7 @@ const data = reactive({ ...@@ -156,7 +153,7 @@ const data = reactive({
156 // regionId: [{ required: true, message: 'required', trigger: 'change' }], 153 // regionId: [{ required: true, message: 'required', trigger: 'change' }],
157 birth: [{required: true, message: 'required', trigger: 'change'}], 154 birth: [{required: true, message: 'required', trigger: 'change'}],
158 // address: [{ required: true, message: 'required', trigger: 'blur' }], 155 // address: [{ required: true, message: 'required', trigger: 'blur' }],
159 // picUrl: [{required: true, message: 'required', trigger: 'blur'}], 156 picUrl: [{required: true, message: 'required', trigger: 'blur'}],
160 sex: [{required: true, message: 'required', trigger: 'change'}], 157 sex: [{required: true, message: 'required', trigger: 'change'}],
161 labelArr: [{required: true, message: 'required', trigger: 'change'}] 158 labelArr: [{required: true, message: 'required', trigger: 'change'}]
162 }, 159 },
...@@ -185,13 +182,14 @@ onMounted(() => { ...@@ -185,13 +182,14 @@ onMounted(() => {
185 }) 182 })
186 const editgay = ref(false) 183 const editgay = ref(false)
187 const open = (params) => { 184 const open = (params) => {
188 console.log(params.label)
189 show.value = true 185 show.value = true
190 title.value = params.title 186 title.value = params.title
191 groupId.value = params.groupId || '0' 187 groupId.value = params.groupId || '0'
192 isMe.value = params.isMe 188 isMe.value = params.isMe
193 if(params.label){ 189 if(params.label){
194 form.value.labelArr= [params.label] 190 form.value.labelArr= [params.label]
191 } else {
192 form.value.labelArr = []
195 } 193 }
196 if(language.value == 0){ 194 if(language.value == 0){
197 form.value.countryId = 240 195 form.value.countryId = 240
...@@ -261,20 +259,17 @@ function getRegionsList() { ...@@ -261,20 +259,17 @@ function getRegionsList() {
261 function checkCode() { 259 function checkCode() {
262 260
263 if (form.value.idcType=='0' && form.value.idcCode) { 261 if (form.value.idcType=='0' && form.value.idcCode) {
264 giveBirthDay() 262 // giveBirthDay()
265 var obj = { 263 var obj = {
266 idcType: form.value.idcType, 264 idcCode: form.value.idcCode,
267 idcCode: form.value.idcCode 265 name: form.value.realName
268 } 266 }
269 // match.checkPerson(obj).then(res => { 267 match.checkIdcCode(obj).then(res => {
270 // if (res.data.idcCode != null) { 268 if (res.data) {
271 // form.value = res.data 269 form.value.birth = res.data.birth
272 // if (form.value.label != null) { 270 form.value.sex = res.data.sex
273 // form.value.labelArr = form.value.label.split(',') 271 }
274 // } 272 })
275 // form.value.groupId = groupId.value
276 // }
277 // })
278 } 273 }
279 } 274 }
280 275
...@@ -324,10 +319,10 @@ function submitForm() { ...@@ -324,10 +319,10 @@ function submitForm() {
324 return 319 return
325 } 320 }
326 } 321 }
327 if(!form.value.passportUrl){ 322 // if(!form.value.passportUrl){
328 ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file') 323 // ElMessage.warning(language.value == 0 ? '请上传有效证件' :'Please upload your passport file')
329 return 324 // return
330 } 325 // }
331 if (typeof (form.value.regionId) === 'object') { 326 if (typeof (form.value.regionId) === 'object') {
332 form.value.regionId = _.last(form.value.regionId) 327 form.value.regionId = _.last(form.value.regionId)
333 } 328 }
......
src/viewsPc/match/components/allSportsmanList.vue
...@@ -92,7 +92,9 @@ ...@@ -92,7 +92,9 @@
92 <!-- </template>--> 92 <!-- </template>-->
93 </el-dialog> 93 </el-dialog>
94 94
95 <!-- 国内赛运动员-->
95 <add-coach ref="dialogAddCoach" @submitForm="getList"/> 96 <add-coach ref="dialogAddCoach" @submitForm="getList"/>
97 <!-- 国际赛运动员-->
96 <add-wdsf ref="dialogAddWdsf" @submitForm="getList"/> 98 <add-wdsf ref="dialogAddWdsf" @submitForm="getList"/>
97 <Import ref="dialogImportProps" @submitForm="getList"/> 99 <Import ref="dialogImportProps" @submitForm="getList"/>
98 </template> 100 </template>
......
src/viewsPc/match/components/matchInfo-projectList.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <span v-else>{{ scope.row.playType }}</span> 14 <span v-else>{{ scope.row.playType }}</span>
15 </template> 15 </template>
16 </el-table-column> 16 </el-table-column>
17 <el-table-column :label="language==0?'参赛年龄':'Age'" align="center" min-width="100"> 17 <el-table-column :label="language==0?'参赛年龄':'Age'" align="center" :min-width="isNational?100:240">
18 <template #default="scope"> 18 <template #default="scope">
19 <div v-if="isNational"> 19 <div v-if="isNational">
20 <span v-if="scope.row.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span> 20 <span v-if="scope.row.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span>
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
34 <span v-if="scope.row.ageGroup == '14'" >Senior V</span> 34 <span v-if="scope.row.ageGroup == '14'" >Senior V</span>
35 </div> 35 </div>
36 <div v-else> 36 <div v-else>
37 <div>{{ scope.row.birthPeriod }}</div> 37 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
38 <div>{{scope.row.birthPeriodSecond}}</div> 38 <div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
39 </div> 39 </div>
40 </template> 40 </template>
41 </el-table-column> 41 </el-table-column>
......
src/viewsPc/match/detail_en.vue
...@@ -552,7 +552,7 @@ function checkIsSign() { ...@@ -552,7 +552,7 @@ function checkIsSign() {
552 ).then(() => { 552 ).then(() => {
553 withDraw(res.data.orderId) 553 withDraw(res.data.orderId)
554 }) 554 })
555 // return Promise.reject('rejected message') 555 return Promise.reject('rejected message')
556 break 556 break
557 case '2': 557 case '2':
558 ElMessageBox.confirm( 558 ElMessageBox.confirm(
......
src/viewsPc/match/teamSign.vue
...@@ -174,7 +174,8 @@ const data = reactive({ ...@@ -174,7 +174,8 @@ const data = reactive({
174 // address: { required: true, message: 'required', trigger: 'blur' } 174 // address: { required: true, message: 'required', trigger: 'blur' }
175 }, 175 },
176 coachOrLeaderFlag: '', 176 coachOrLeaderFlag: '',
177 matchInfo:{} 177 matchInfo:{},
178 languageSource:''
178 }) 179 })
179 const { 180 const {
180 isNational,matchData, 181 isNational,matchData,
...@@ -186,7 +187,7 @@ const { ...@@ -186,7 +187,7 @@ const {
186 cptId, 187 cptId,
187 rules,rules_en, 188 rules,rules_en,
188 regionsList,countryList,matchInfo, 189 regionsList,countryList,matchInfo,
189 coachOrLeaderFlag, accept,typeOptions 190 coachOrLeaderFlag, accept,typeOptions,languageSource
190 } = toRefs(data) 191 } = toRefs(data)
191 const uploadUrl = ref('/upload/upLoadToFileServer') 192 const uploadUrl = ref('/upload/upLoadToFileServer')
192 193
...@@ -196,6 +197,7 @@ onMounted(() => { ...@@ -196,6 +197,7 @@ onMounted(() => {
196 getGroupInfo() 197 getGroupInfo()
197 signType.value = route.query.signType 198 signType.value = route.query.signType
198 isNational.value = route.query.isNational 199 isNational.value = route.query.isNational
200 languageSource.value = route.query.languageSource
199 201
200 getRegionsList() 202 getRegionsList()
201 getCountryList() 203 getCountryList()
...@@ -325,7 +327,8 @@ function goNext() { ...@@ -325,7 +327,8 @@ function goNext() {
325 query: { 327 query: {
326 matchId: cptId.value, 328 matchId: cptId.value,
327 groupId: groupId.value, 329 groupId: groupId.value,
328 isNational: isNational.value 330 isNational: isNational.value,
331 languageSource:languageSource.value
329 } 332 }
330 }) 333 })
331 } 334 }
......
src/viewsPc/match/teamSign_Cn.vue
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
37 <el-form-item :label="language==0?'负责人姓名':'Contact Person'" prop="contactPerson"> 37 <el-form-item :label="language==0?'负责人姓名':'Contact Person'" prop="contactPerson">
38 <el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" /> 38 <el-input v-model="form.contactPerson" :placeholder="language==0?'请输入联系人':''" />
39 </el-form-item> 39 </el-form-item>
40 <el-form-item :label="language==0?'联系电话':'Contact Phone'" required prop="contactTelno">
41 <el-input v-model="form.contactTelno" type="phone" :placeholder="language==0?'请输入内容':''"/>
42 </el-form-item>
40 <el-form-item :label="language==0?'邮箱':'Email'" required prop="contactEmail"> 43 <el-form-item :label="language==0?'邮箱':'Email'" required prop="contactEmail">
41 <el-input v-model="form.contactEmail" type="email" :placeholder="language==0?'请输入内容':''"/> 44 <el-input v-model="form.contactEmail" type="email" :placeholder="language==0?'请输入内容':''"/>
42 </el-form-item> 45 </el-form-item>
...@@ -148,13 +151,13 @@ const data = reactive({ ...@@ -148,13 +151,13 @@ const data = reactive({
148 regionsList: [], 151 regionsList: [],
149 countryList: [], 152 countryList: [],
150 participantsInfoArr: [], 153 participantsInfoArr: [],
151 rankList: [],
152 accept: '.doc, .pdf, .docx, .zip', 154 accept: '.doc, .pdf, .docx, .zip',
153 rules: { 155 rules: {
154 imgUrl: { required: true, message: '请上传', trigger: 'blur' }, 156 imgUrl: { required: true, message: '请上传', trigger: 'blur' },
155 name: { required: true, message: '请填写', trigger: 'blur' }, 157 name: { required: true, message: '请填写', trigger: 'blur' },
156 type: { required: true, message: '请选择', trigger: 'change' }, 158 type: { required: true, message: '请选择', trigger: 'change' },
157 contactPerson: { required: true, message: '请填写内容', trigger: 'blur' }, 159 contactPerson: { required: true, message: '请填写内容', trigger: 'blur' },
160 contactTelno: { required: true, message: '请填写内容', trigger: 'blur' },
158 contactEmail: { required: true, message: '请填写内容', trigger: 'blur' }, 161 contactEmail: { required: true, message: '请填写内容', trigger: 'blur' },
159 abreviations: { required: true, message: '请填写内容', trigger: 'blur' }, 162 abreviations: { required: true, message: '请填写内容', trigger: 'blur' },
160 address: { required: true, message: '请填写内容', trigger: 'blur' } 163 address: { required: true, message: '请填写内容', trigger: 'blur' }
...@@ -169,11 +172,11 @@ const data = reactive({ ...@@ -169,11 +172,11 @@ const data = reactive({
169 address: { required: true, message: 'required', trigger: 'blur' } 172 address: { required: true, message: 'required', trigger: 'blur' }
170 }, 173 },
171 coachOrLeaderFlag: '', 174 coachOrLeaderFlag: '',
175 languageSource: '',
172 matchInfo:{} 176 matchInfo:{}
173 }) 177 })
174 const { 178 const {
175 isRanks,matchData, 179 matchData,
176 rankList,
177 form, 180 form,
178 groupId, 181 groupId,
179 signType, 182 signType,
...@@ -181,7 +184,7 @@ const { ...@@ -181,7 +184,7 @@ const {
181 cptId, 184 cptId,
182 rules,rules_en, 185 rules,rules_en,
183 regionsList,countryList,matchInfo, 186 regionsList,countryList,matchInfo,
184 coachOrLeaderFlag, accept,typeOptions 187 coachOrLeaderFlag, accept,typeOptions,languageSource
185 } = toRefs(data) 188 } = toRefs(data)
186 const uploadUrl = ref('/upload/upLoadToFileServer') 189 const uploadUrl = ref('/upload/upLoadToFileServer')
187 190
...@@ -190,7 +193,7 @@ onMounted(() => { ...@@ -190,7 +193,7 @@ onMounted(() => {
190 // 获取团体信息 193 // 获取团体信息
191 getGroupInfo() 194 getGroupInfo()
192 signType.value = route.query.signType 195 signType.value = route.query.signType
193 196 languageSource.value = route.query.languageSource
194 getRegionsList() 197 getRegionsList()
195 getCountryList() 198 getCountryList()
196 match.getMatchById({ id: cptId.value }).then(res => { 199 match.getMatchById({ id: cptId.value }).then(res => {
...@@ -249,11 +252,6 @@ function getGroupInfo() { ...@@ -249,11 +252,6 @@ function getGroupInfo() {
249 }) 252 })
250 } 253 }
251 254
252 function getTeamList() {
253 return match.getMyTeamList(cptId.value, groupId.value).then(response => {
254 rankList.value = response.data
255 })
256 }
257 255
258 function goPrev() { 256 function goPrev() {
259 router.go(-1) 257 router.go(-1)
...@@ -315,7 +313,8 @@ function goNext() { ...@@ -315,7 +313,8 @@ function goNext() {
315 query: { 313 query: {
316 matchId: cptId.value, 314 matchId: cptId.value,
317 groupId: groupId.value, 315 groupId: groupId.value,
318 signType: signType.value 316 signType: signType.value,
317 languageSource:languageSource.value
319 } 318 }
320 }) 319 })
321 } 320 }
......
vite.config.js
...@@ -76,15 +76,15 @@ export default defineConfig(({ mode, command }) => { ...@@ -76,15 +76,15 @@ export default defineConfig(({ mode, command }) => {
76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
77 }, 77 },
78 '/dev-api/ztx-webSite': { 78 '/dev-api/ztx-webSite': {
79 // target: 'https://dance.itechtop.cn/stage-api', 79 target: 'https://dance.itechtop.cn/stage-api',
80 target: 'http://192.168.1.118:8081/', 80 // target: 'http://192.168.1.118:8081/',
81 changeOrigin: true, 81 changeOrigin: true,
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 target: 'http://192.168.1.131:8081/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 // target: 'https://dance.itechtop.cn/stage-api',
87 target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 89 rewrite: (p) => p.replace(/^\/dev-api/, '')
90 } 90 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!