Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
杨炀
/
dance-pc
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
8013fd1e
authored
2024-05-17 17:03:48 +0800
by
yyx
1
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'order' of
https://code.itechtop.cn/yangyang/dance-pc
into order
2 parents
1b65759b
4202d307
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/teamSign.vue
src/viewsPc/match/teamSign_Cn.vue
vite.config.js
src/viewsPc/match/chooseProject.vue
View file @
8013fd1
...
...
@@ -38,7 +38,10 @@
<div
class=
"text-center mt20"
>
<el-button
type=
"primary"
plain
@
click=
"switchPerson"
>
{{
language
==
0
?
'切换'
:
'Switch'
}}
</el-button>
</div>
<div
class=
"tip"
>
<span
v-if=
"language==0"
>
*如果您参加个人项目,或给其它组合/选手进行报名,请点击切换按钮重新选择人员
</span>
<span
v-else
>
*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.
</span>
</div>
</div>
</div>
</el-col>
...
...
src/viewsPc/match/teamSign.vue
View file @
8013fd1
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col
:lg=
"10"
>
<el-form-item
:label=
"language==0?'代表国家/地区':'Representing'"
>
<el-form-item
:label=
"language==0?'代表国家/地区':'Representing'"
required
>
<el-select
filterable
v-model=
"form.countryId"
@
change=
"changeCountryId"
:disabled=
"form.type!='4'"
>
<!--
<el-option
v-for=
"item in countryList"
:key=
"item.id"
:label=
"language==0?item.name:item.enName"
:value=
"item.id"
/>
-->
...
...
src/viewsPc/match/teamSign_Cn.vue
View file @
8013fd1
...
...
@@ -26,7 +26,7 @@
<el-form-item
:label=
"language==0?'参赛队名称':'Name of participating team'"
required
prop=
"abreviations"
>
<el-input
type=
"text"
v-model=
"form.abreviations"
:placeholder=
"language==0?'请输入内容':''"
/>
</el-form-item>
<el-form-item
:label=
"language==0?'团体名称':'Team Name'"
prop=
"name"
>
<el-form-item
:label=
"language==0?'团体名称':'Team Name'"
prop=
"name"
required
>
<el-input
v-model=
"form.name"
:placeholder=
"language==0?'请输入团体名称':''"
/>
</el-form-item>
<el-form-item
:label=
"language==0?'所属国家/地区':'Country'"
required
>
...
...
vite.config.js
View file @
8013fd1
...
...
@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
rewrite
:
(
p
)
=>
p
.
replace
(
/^
\/
dev-api
\/
ztx-webSite/
,
''
)
},
'/dev-api'
:
{
target
:
'http://192.168.1.1
31
:8081/'
,
target
:
'http://192.168.1.1
18
:8081/'
,
// target: 'https://dance.itechtop.cn/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
changeOrigin
:
true
,
...
...
杨炀
@yangyang
mentioned in commit
6eee9b44
2024-05-20 05:25:52 UTC
mentioned in commit
6eee9b44
Toggle commit list
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment