Skip to content

Commit 50759b2

Browse files
authored
Origin/feature/preview (#189)
* feat(custom): gallery * style: optimize some ui
1 parent bab8c56 commit 50759b2

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

src/assets/styles/realize/animation.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
// 页面切换动画
4646
.fade-transform-leave-active,
4747
.fade-transform-enter-active {
48-
transition: all 0.5s;
48+
transition: all 0.3s;
4949
}
5050
.fade-transform-enter {
5151
opacity: 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$theme: #3963bc;
22

33
/* 布局 */
4-
$sidebar-width: 170px;
4+
$sidebar-width: 175px;
55
$sidebar-background: #192a5e;
66

77
$navbar-height: 30px;

src/config/stage/plugins.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// 本文件是自动生成, 请勿修改
2-
import custom from '@/plugins/custom/stage-config'
32
import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
3+
import custom from '@/plugins/custom/stage-config'
44

55
const pluginsConfig = [
6-
custom,
76
LinCmsUi,
7+
custom,
88
]
99

1010
export default pluginsConfig

src/lin/plugins/axios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ _axios.interceptors.request.use((originConfig) => {
6666
if (typeof reqConfig.data[key] === 'object') {
6767
if (reqConfig.data[key] instanceof FileList || reqConfig.data[key] instanceof File || reqConfig.data[key] instanceof Blob) {
6868
hasFile = true
69-
} else {
69+
} else if (reqConfig.data[key].constructor === Object) {
7070
reqConfig.data[key] = JSON.stringify(reqConfig.data[key])
7171
}
7272
}

src/views/admin/user/UserInfo.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,17 @@
2828
<el-input size="medium" clearable type="password" v-model="form.confirm_password" autocomplete="off"></el-input>
2929
</el-form-item>
3030
<el-form-item v-if="pageType !== 'password'" label="选择分组">
31-
<el-radio-group v-model="form.group_id" label-position="top" class="user-info">
31+
<el-select size="medium" v-model="form.group_id" placeholder="请选择分组">
32+
<el-option
33+
v-for="item in groups"
34+
:key="item.id"
35+
:label="item.name"
36+
:value="item.id">
37+
</el-option>
38+
</el-select>
39+
<!-- <el-radio-group v-model="form.group_id" label-position="top" class="user-info">
3240
<el-radio :label="item.id" v-for="(item, index) in groups" :key="index">{{item.name}}</el-radio>
33-
</el-radio-group>
41+
</el-radio-group> -->
3442
</el-form-item>
3543
<el-form-item v-show="submit" class="submit">
3644
<el-button type="primary" @click="submitForm('form')">保 存</el-button>

src/views/admin/user/UserList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ export default {
294294
295295
.info {
296296
margin-left: -55px;
297-
margin-bottom: -40px;
297+
margin-bottom: -30px;
298298
}
299299
300300
.password {

src/views/home/Home.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default {
5050
data() {
5151
return {
5252
isCollapse: false, // 左侧菜单栏是否折叠
53-
sideBarWidth: '170px', // 左侧菜单栏展开的宽度
53+
sideBarWidth: '175px', // 左侧菜单栏展开的宽度
5454
clientWidth: 0, // 页面宽度
5555
clientHeight: 0, // 页面高度
5656
foldState: false, // 控制左侧菜单栏按键
@@ -97,7 +97,7 @@ export default {
9797
},
9898
watch: {
9999
isCollapse() {
100-
this.sideBarWidth = this.isCollapse === false ? '170px' : '64px'
100+
this.sideBarWidth = this.isCollapse === false ? '175px' : '64px'
101101
},
102102
$route() {
103103
this.showBackTop = false

0 commit comments

Comments
 (0)