Skip to content

Commit 4b0d3ec

Browse files
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm
2 parents 47f1f13 + 97a68ce commit 4b0d3ec

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/layout/components/Breadcrumb/src/Breadcrumb.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default defineComponent({
9292
$prefix-cls: #{$elNamespace}-breadcrumb;
9393
9494
.#{$prefix-cls} {
95-
:deep(&__item) {
95+
:deep(.#{$prefix-cls}__item) {
9696
display: flex;
9797
.#{$prefix-cls}__inner {
9898
display: flex;
@@ -105,7 +105,7 @@ $prefix-cls: #{$elNamespace}-breadcrumb;
105105
}
106106
}
107107
108-
:deep(&__item):not(:last-child) {
108+
:deep(.#{$prefix-cls}__item):not(:last-child) {
109109
.#{$prefix-cls}__inner {
110110
color: var(--top-header-text-color);
111111
@@ -115,7 +115,7 @@ $prefix-cls: #{$elNamespace}-breadcrumb;
115115
}
116116
}
117117
118-
:deep(&__item):last-child {
118+
:deep(.#{$prefix-cls}__item):last-child {
119119
.#{$prefix-cls}__inner {
120120
display: flex;
121121
align-items: center;

src/views/pay/app/components/AppForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<el-form-item label="应用名" prop="name">
1111
<el-input v-model="formData.name" placeholder="请输入应用名" />
1212
</el-form-item>
13-
<el-form-item label="应用标识" prop="name">
13+
<el-form-item label="应用标识" prop="appKey">
1414
<el-input v-model="formData.appKey" placeholder="请输入应用标识" />
1515
</el-form-item>
1616
<el-form-item label="开启状态" prop="status">

0 commit comments

Comments
 (0)