Skip to content

Commit 78feb7c

Browse files
gongjsvanoneang
authored andcommitted
fix (#150)
1 parent ea7f943 commit 78feb7c

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

src/assets/styles/realize/element-variables.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
157157
}
158158

159159
.el-radio-group {
160-
padding-top: 15px;
160+
// padding-top: 15px;
161161
width: 100%;
162162
}
163163

@@ -191,7 +191,6 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
191191
}
192192

193193
.el-form--label-top .el-form-item__label {
194-
padding-bottom: 0px !important;
195194
color: $title-color;
196195
font-weight: 500;
197196
}
@@ -205,7 +204,6 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
205204
.el-input__inner {
206205
border-radius: 4px;
207206
}
208-
209207
}
210208

211209
.el-pagination.is-background .el-pager li:not(.disabled).active {

src/config/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const Config = {
2-
baseUrl: 'http://dev.lin.colorful3.com',
2+
baseUrl: 'localhost:5000',
33
stagnateTime: 1 * 60 * 60 * 1000, // 无操作停滞时间 默认1小时
44
openAutoJumpOut: true, // 是否开启无操作跳出
55
notLoginRoute: ['login'], // 无需登录即可访问的路由 name,

src/plugins/LinCmsUi/views/form/Checkbox.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<div slot="header">
4040
<span>多选框组</span>
4141
</div>
42-
<el-row :gutter="20">
43-
<el-col :span="12">
42+
<el-row>
43+
<el-col>
4444
<el-checkbox-group v-model="checkList1">
4545
<el-checkbox label="复选框 A"></el-checkbox>
4646
<el-checkbox label="复选框 B"></el-checkbox>

src/plugins/LinCmsUi/views/form/Input.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</div>
4141
<el-row>
4242
<el-col :span="12">
43-
<el-input placeholder="请选择日期" size="medium" suffix-icon="el-icon-date"></el-input>
43+
<el-input placeholder="请输入内容" size="medium" suffix-icon="el-icon-edit"></el-input>
4444
</el-col>
4545
</el-row>
4646
<el-row style="margin-top:20px">
@@ -76,8 +76,8 @@
7676
<el-row>
7777
<el-col>
7878
<el-col :span="12">
79-
<el-input placeholder="请输入内容" size="medium" class="input-with-select">
80-
<el-select size="medium" slot="prepend" placeholder="请选择" value="">
79+
<el-input v-model="input" placeholder="请输入内容" size="medium" class="input-with-select">
80+
<el-select v-model="select" size="medium" slot="prepend" placeholder="请选择">
8181
<el-option label="餐厅名" value="1"></el-option>
8282
<el-option label="订单号" value="2"></el-option>
8383
<el-option label="用户电话" value="3"></el-option>
@@ -129,6 +129,8 @@ export default {
129129
data() {
130130
return {
131131
text: '',
132+
input: '',
133+
select: '',
132134
base: `
133135
<el-input placeholder="请输入内容" size="medium"></el-input>`,
134136
disabled: `

src/plugins/LinCmsUi/views/form/Radio.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
<el-radio-button label="深圳"></el-radio-button>
7171
</el-radio-group>
7272
</div>
73-
<div>
73+
<div style="margin:20px 0px;">
7474
<el-radio-group v-model="radio2" size="medium">
7575
<el-radio-button label="上海"></el-radio-button>
7676
<el-radio-button label="北京"></el-radio-button>
7777
<el-radio-button label="广州"></el-radio-button>
7878
<el-radio-button label="深圳"></el-radio-button>
7979
</el-radio-group>
8080
</div>
81-
<div>
81+
<div style="margin:20px 0px;">
8282
<el-radio-group v-model="radio3" size="small">
8383
<el-radio-button label="上海"></el-radio-button>
8484
<el-radio-button label="北京" disabled></el-radio-button>
@@ -114,11 +114,11 @@
114114
<el-radio v-model="radio5" label="1" border>备选项1</el-radio>
115115
<el-radio v-model="radio5" label="2" border>备选项2</el-radio>
116116
</div>
117-
<div style="margin-top: 20px">
117+
<div style="margin: 20px 0px;">
118118
<el-radio v-model="radio6" label="1" border size="medium">备选项1</el-radio>
119119
<el-radio v-model="radio6" label="2" border size="medium">备选项2</el-radio>
120120
</div>
121-
<div>
121+
<div style="margin: 20px 0px;">
122122
<el-radio-group v-model="radio7" size="small">
123123
<el-radio label="1" border>备选项1</el-radio>
124124
<el-radio label="2" border disabled>备选项2</el-radio>

src/views/admin/user/UserInfo.vue

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -250,18 +250,18 @@ export default {
250250
</style>
251251

252252
<style lang="scss">
253-
.el-radio-group {
254-
&.user-info {
255-
display: flex;
256-
flex-wrap: wrap;
257-
> .el-radio {
258-
width: 150px;
259-
margin-left: 0px !important;
260-
margin-right: 10px;
261-
margin-bottom: 20px;
262-
white-space: normal;
263-
display: flex;
264-
}
265-
}
266-
}
253+
// .el-radio-group {
254+
// &.user-info {
255+
// display: flex;
256+
// flex-wrap: wrap;
257+
// > .el-radio {
258+
// width: 150px;
259+
// margin-left: 0px !important;
260+
// margin-right: 10px;
261+
// margin-bottom: 20px;
262+
// white-space: normal;
263+
// display: flex;
264+
// }
265+
// }
266+
// }
267267
</style>

0 commit comments

Comments
 (0)