Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-middle-front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xingmin
yd-middle-front
Commits
9bd475d5
Commit
9bd475d5
authored
Feb 27, 2026
by
Sweet Zhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' into dev
parents
b3deca5b
58a41c40
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/views/login.vue
+3
-3
src/views/merchandise/components/comeInfo.vue
+2
-2
src/views/register.vue
+1
-1
No files found.
src/views/login.vue
View file @
9bd475d5
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
</el-form>
</el-form>
<!-- 底部 -->
<!-- 底部 -->
<div
class=
"el-login-footer"
>
<div
class=
"el-login-footer"
>
<span>
Copyright © 20
18-2025 ruoyi.vip
All Rights Reserved.
</span>
<span>
Copyright © 20
26 supguard
All Rights Reserved.
</span>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -83,8 +83,8 @@ const router = useRouter()
...
@@ -83,8 +83,8 @@ const router = useRouter()
const
{
proxy
}
=
getCurrentInstance
()
const
{
proxy
}
=
getCurrentInstance
()
const
loginForm
=
ref
({
const
loginForm
=
ref
({
username
:
'
zs
'
,
username
:
'
admin
'
,
password
:
'123'
,
password
:
'123
45
'
,
rememberMe
:
false
,
rememberMe
:
false
,
code
:
''
,
code
:
''
,
uuid
:
''
uuid
:
''
...
...
src/views/merchandise/components/comeInfo.vue
View file @
9bd475d5
...
@@ -211,7 +211,7 @@
...
@@ -211,7 +211,7 @@
</el-select>
</el-select>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"是否直签"
prop=
"isDirectSign"
width=
"150"
>
<
!-- <
el-table-column label="是否直签" prop="isDirectSign" width="150">
<template #header>
<template #header>
<span class="required-label">是否直签</span>
<span class="required-label">是否直签</span>
</template>
</template>
...
@@ -231,7 +231,7 @@
...
@@ -231,7 +231,7 @@
/>
/>
</el-select>
</el-select>
</template>
</template>
</el-table-column>
</el-table-column>
-->
<el-table-column
<el-table-column
label=
"对账公司"
label=
"对账公司"
prop=
"reconciliationCompanyName"
prop=
"reconciliationCompanyName"
...
...
src/views/register.vue
View file @
9bd475d5
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
</el-form>
</el-form>
<!-- 底部 -->
<!-- 底部 -->
<div
class=
"el-register-footer"
>
<div
class=
"el-register-footer"
>
<span>
Copyright © 20
18-2025 ruoyi.vip
All Rights Reserved.
</span>
<span>
Copyright © 20
26 supguard
All Rights Reserved.
</span>
</div>
</div>
</div>
</div>
</template>
</template>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment