Commit 180c2c65 authored by 赵茹林's avatar 赵茹林

升级element ui版本

后台优化(菜单展开、路由跳转、样式代码优化等)
parent 247f9dc5
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="referrer" content="never"> <meta name="referrer" content="never">
<link rel="stylesheet" href="https:////at.alicdn.com/t/font_746649_x1rivf5f5.css"> <link rel="stylesheet" href="https:////at.alicdn.com/t/font_746649_x1rivf5f5.css">
<link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css"> <link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css">
<title>唱唱启蒙-后台</title> <title>唱唱启蒙-后台</title>
</head> </head>
<body> <body>
......
...@@ -303,9 +303,9 @@ ...@@ -303,9 +303,9 @@
"dev": true "dev": true
}, },
"async-validator": { "async-validator": {
"version": "1.8.2", "version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz", "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=", "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": { "requires": {
"babel-runtime": "6.x" "babel-runtime": "6.x"
} }
...@@ -2574,8 +2574,8 @@ ...@@ -2574,8 +2574,8 @@
}, },
"deepmerge": { "deepmerge": {
"version": "1.5.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
}, },
"define-properties": { "define-properties": {
"version": "1.1.2", "version": "1.1.2",
...@@ -2878,9 +2878,9 @@ ...@@ -2878,9 +2878,9 @@
"dev": true "dev": true
}, },
"element-ui": { "element-ui": {
"version": "2.4.3", "version": "2.11.1",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.3.tgz", "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.11.1.tgz?cache=0&sync_timestamp=1564126738326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.11.1.tgz",
"integrity": "sha512-fHcpUGbJsfP1mvfErdnn4A7MglNbfL4uiukGHRZaFy1K7HhVKEpLficNqUtaYS3SKjKnzpkSdZkrJJCR1aNICw==", "integrity": "sha1-K2f57uPtouaISHPBxYnL4w2anWA=",
"requires": { "requires": {
"async-validator": "~1.8.1", "async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -6123,7 +6123,7 @@ ...@@ -6123,7 +6123,7 @@
}, },
"normalize-wheel": { "normalize-wheel": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
}, },
"npm-run-path": { "npm-run-path": {
...@@ -9249,9 +9249,9 @@ ...@@ -9249,9 +9249,9 @@
"dev": true "dev": true
}, },
"resize-observer-polyfill": { "resize-observer-polyfill": {
"version": "1.5.0", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz", "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg==" "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
}, },
"resolve": { "resolve": {
"version": "1.8.1", "version": "1.8.1",
...@@ -10049,8 +10049,8 @@ ...@@ -10049,8 +10049,8 @@
}, },
"throttle-debounce": { "throttle-debounce": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", "resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
"integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
}, },
"through2": { "through2": {
"version": "2.0.3", "version": "2.0.3",
......
...@@ -75,16 +75,17 @@ export default { ...@@ -75,16 +75,17 @@ export default {
}; };
</script> </script>
<style > <style lang="less">
#app { #app {
height: 100%; height: 100%;
} }
html,
body { html, body {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.el-collapse-item__arrow { .el-collapse-item__arrow {
margin-left: 0; margin-left: 0;
} }
...@@ -119,7 +120,39 @@ body { ...@@ -119,7 +120,39 @@ body {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
} }
#app .el-main .menu-block{
height: 170vh; .el-table {
/*padding: 0 20px;*/
}
@gutterSize: 10px;
.admin-refresh {
.section-search {
padding: @gutterSize;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
&.search-single {
font-size: 0; // 去掉空隙
/*.el-form-item__content {
font-size: 0; // 去掉空隙
}*/
.el-form-item {
margin-bottom: 0;
}
}
.search-btn-wrapper {
display: flex;
}
}
.page-div {
padding: 0;
}
.el-pagination {
padding: @gutterSize 0;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
}
} }
</style> </style>
...@@ -54,7 +54,12 @@ ...@@ -54,7 +54,12 @@
.menu-block{ .menu-block{
float: left; float: left;
height: 100%; height: 100%;
overflow: auto; /*overflow: auto;
position: fixed;
left: 0;
top: 60px;
bottom: 0;
z-index: 10;*/
} }
.content{ .content{
display: flex; display: flex;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<el-menu <el-menu
:default-active="$route.path" :default-active="$route.path"
:router="true" :router="true"
:unique-opened="true"
text-color="#fff" text-color="#fff"
background-color="#333333" background-color="#333333"
active-text-color="#ffd04b" active-text-color="#ffd04b"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-input type="password" v-model="login.password" placeholder="密码"></el-input> <el-input type="password" v-model="login.password" placeholder="密码"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="btn" size="medium" type="primary" @click="submitForm"></el-button> <el-button class="btn" size="medium" type="primary" @click="submitForm"></el-button>
<router-link class="fr" :to="{name:'register'}" > <router-link class="fr" :to="{name:'register'}" >
班主任注册入口 班主任注册入口
</router-link> </router-link>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="last_login_at" prop="last_login_at"
label="最后登时间" sortable> label="最后登时间" sortable>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="!$store.state.readonly" v-if="!$store.state.readonly"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
prop="user_role"> prop="user_role">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="登名" label="登名"
prop="user_name"> prop="user_name">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<el-form-item> <el-form-item>
<!--<div class="flexRow">--> <!--<div class="flexRow">-->
<el-button @click="onSearch" type="primary" plain>搜索</el-button> <el-button @click="onSearch" type="primary" plain>搜索</el-button>
<el-button @click="onAdd" type="success" plain>添加</el-button> <el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>添加</el-button>
<!--</div>--> <!--</div>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
{{scope.row.status == 0 ? '在职' : '离职'}} {{scope.row.status == 0 ? '在职' : '离职'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" v-if="!$store.state.readonly">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" plain type="primary" @click="onEdit(scope.row)">编辑</el-button> <el-button size="mini" plain type="primary" @click="onEdit(scope.row)">编辑</el-button>
</template> </template>
...@@ -213,7 +213,6 @@ ...@@ -213,7 +213,6 @@
this.dialog.form.type = ''; this.dialog.form.type = '';
this.dialog.form.in_at = '';*/ this.dialog.form.in_at = '';*/
this.$nextTick(()=>{ this.$nextTick(()=>{
console.log('tick')
this.$refs['dialogForm'].resetFields(); this.$refs['dialogForm'].resetFields();
}) })
}, },
......
<template>
<div class="admin-refresh" v-loading="loading">
<div class="section-search search-single">
<el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
<el-form-item>
<el-cascader
style="width: 280px" placeholder="选择标签"
:props="searchProps" clearable></el-cascader>
</el-form-item>
<el-form-item>
<div class="search-btn-wrapper">
<el-button @click="onSearch" type="primary" plain>搜索</el-button>
<el-button @click="onSearch" type="warning" plain>高级搜索</el-button>
<el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>新增标签</el-button>
</div>
</el-form-item>
</el-form>
</div>
<el-table :data="tableData">
<el-table-column prop="id" label="ID"></el-table-column>
<el-table-column prop="name" label="一级标签"></el-table-column>
<el-table-column prop="mobile" label="二级标签"></el-table-column>
<el-table-column prop="in_at" label="三级标签"></el-table-column>
<el-table-column prop="in_at" label="四级标签"></el-table-column>
<el-table-column prop="in_at" label="标签备注"></el-table-column>
<el-table-column label="操作" v-if="!$store.state.readonly">
<template slot-scope="scope">
<el-button size="mini" plain type="primary" @click="onEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
<page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
<el-dialog :title="dialog.title" :visible.sync="dialog.show" width="500px">
<el-form ref="dialogForm" :rules="dialog.form.rules" :model="dialog.form" label-width="100px">
<el-form-item label="一级标签:" prop="name">
<el-input v-model="dialog.form.name" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="二级标签:" prop="mobile">
<el-input v-model="dialog.form.mobile" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="三级标签:" prop="id_card">
<el-input v-model="dialog.form.id_card" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="标签备注:" prop="in_at">
<el-input v-model="dialog.form.in_at" maxlength="50" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogToggle">取消</el-button>
<el-button type="primary" @click="dialogSave">确定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {getStaffListApi, postStaffListApi, putStaffListApi} from "../../service/api";
import page from '../framework/page'
let sid = 0;
export default {
name: "index",
data() {
return {
options: [{
value: 'zhinan',
label: '指南',
children: [{
value: 'shejiyuanze',
label: '设计原则',
children: [{
value: 'yizhi',
label: '一致'
}, {
value: 'fankui',
label: '反馈'
}, {
value: 'xiaolv',
label: '效率'
}, {
value: 'kekong',
label: '可控'
}]
}, {
value: 'daohang',
label: '导航',
children: [{
value: 'cexiangdaohang',
label: '侧向导航'
}, {
value: 'dingbudaohang',
label: '顶部导航'
}]
}]
}, {
value: 'zujian',
label: '组件',
children: [{
value: 'basic',
label: 'Basic',
children: [{
value: 'layout',
label: 'Layout 布局'
}, {
value: 'color',
label: 'Color 色彩'
}, {
value: 'typography',
label: 'Typography 字体'
}, {
value: 'icon',
label: 'Icon 图标'
}, {
value: 'button',
label: 'Button 按钮'
}]
}, {
value: 'form',
label: 'Form',
children: [{
value: 'radio',
label: 'Radio 单选框'
}, {
value: 'checkbox',
label: 'Checkbox 多选框'
}, {
value: 'input',
label: 'Input 输入框'
}, {
value: 'input-number',
label: 'InputNumber 计数器'
}, {
value: 'select',
label: 'Select 选择器'
}, {
value: 'cascader',
label: 'Cascader 级联选择器'
}, {
value: 'switch',
label: 'Switch 开关'
}, {
value: 'slider',
label: 'Slider 滑块'
}, {
value: 'time-picker',
label: 'TimePicker 时间选择器'
}, {
value: 'date-picker',
label: 'DatePicker 日期选择器'
}, {
value: 'datetime-picker',
label: 'DateTimePicker 日期时间选择器'
}, {
value: 'upload',
label: 'Upload 上传'
}, {
value: 'rate',
label: 'Rate 评分'
}, {
value: 'form',
label: 'Form 表单'
}]
}, {
value: 'data',
label: 'Data',
children: [{
value: 'table',
label: 'Table 表格'
}, {
value: 'tag',
label: 'Tag 标签'
}, {
value: 'progress',
label: 'Progress 进度条'
}, {
value: 'tree',
label: 'Tree 树形控件'
}, {
value: 'pagination',
label: 'Pagination 分页'
}, {
value: 'badge',
label: 'Badge 标记'
}]
}, {
value: 'notice',
label: 'Notice',
children: [{
value: 'alert',
label: 'Alert 警告'
}, {
value: 'loading',
label: 'Loading 加载'
}, {
value: 'message',
label: 'Message 消息提示'
}, {
value: 'message-box',
label: 'MessageBox 弹框'
}, {
value: 'notification',
label: 'Notification 通知'
}]
}, {
value: 'navigation',
label: 'Navigation',
children: [{
value: 'menu',
label: 'NavMenu 导航菜单'
}, {
value: 'tabs',
label: 'Tabs 标签页'
}, {
value: 'breadcrumb',
label: 'Breadcrumb 面包屑'
}, {
value: 'dropdown',
label: 'Dropdown 下拉菜单'
}, {
value: 'steps',
label: 'Steps 步骤条'
}]
}, {
value: 'others',
label: 'Others',
children: [{
value: 'dialog',
label: 'Dialog 对话框'
}, {
value: 'tooltip',
label: 'Tooltip 文字提示'
}, {
value: 'popover',
label: 'Popover 弹出框'
}, {
value: 'card',
label: 'Card 卡片'
}, {
value: 'carousel',
label: 'Carousel 走马灯'
}, {
value: 'collapse',
label: 'Collapse 折叠面板'
}]
}]
}, {
value: 'ziyuan',
label: '资源',
children: [{
value: 'axure',
label: 'Axure Components'
}, {
value: 'sketch',
label: 'Sketch Templates'
}, {
value: 'jiaohu',
label: '组件交互文档'
}]
}],
searchProps: {
lazy: true,
multiple: true,
checkStrictly: true,
lazyLoad (node, resolve) {
const { level } = node;
setTimeout(() => {
const nodes = Array.from({ length: level + 1 })
.map(item => ({
value: ++sid,
label: `选项${sid}`,
leaf: level >= 2
}));
// 通过调用resolve将子节点数据返回,通知组件数据加载完成
resolve(nodes);
}, 1000);
}
},
searchFrom: {
id: '',
name: '',
mobile: '',
id_card: '',
type: '',
status: '',
start_in: '',
over_in: ''
},
startTime: [],
tableData: [],
dialog: {
title: '',
show: false,
form: {
id: '',
name: '',
mobile: '',
id_card: '',
type: '',
in_at: '',
over_at: '',
rules: {
name: [{required: true, message: '请输入', trigger: 'blur'}],
mobile: [{required: true, message: '请输入', trigger: 'blur'}],
id_card: [{required: true, message: '请输入', trigger: 'blur'}],
type: [{required: true, message: '请选择', trigger: 'change'}],
in_at: [{required: true, message: '请选择', trigger: 'change'}],
},
}
},
type: [{
value: 1,
label: '销售'
}],
dialogDetail: {
show: false,
id: ''
},
userList: [],
total: 0,
nowPage: 1,
limit: 10,
showDetail: false,
showId: '',
dialogObj: {
show: false,
title: '绑定老师',
id: 0,
teacher_id: 0
},
dialogDetailObj: {
show: false,
id: ''
},
loading: false
}
},
components: { page },
mounted() {
this.getData()
},
methods: {
dialogToggle() {
this.dialog.show = !this.dialog.show;
if (!this.dialog.show) {
this.dialogReset();
}
},
dialogReset() {
/*this.dialog.title = '';
this.dialog.form.id = '';
this.dialog.form.name = '';
this.dialog.form.mobile = '';
this.dialog.form.id_card = '';
this.dialog.form.type = '';
this.dialog.form.in_at = '';*/
this.$nextTick(()=>{
this.$refs['dialogForm'].resetFields();
})
},
dialogSave() {
this.$refs['dialogForm'].validate((valid) => {
if (valid) {
var json = {
name: this.dialog.form.name,
mobile: this.dialog.form.mobile,
id_card: this.dialog.form.id_card,
type: this.dialog.form.type,
in_at: this.dialog.form.in_at
};
if (this.dialog.form.id) { // 编辑
json.id = this.dialog.form.id;
// 离职
if (this.dialog.form.over_at) {
json.over_at = this.dialog.form.over_at;
json.status = 1;
} else {
json.over_at = '0000-00-00';
json.status = 0
}
putStaffListApi(json).then(res => {
this.$message({ type: 'success', message: '编辑成功!' });
this.dialogToggle();
this.getData();
})
} else {
postStaffListApi(json).then(res => {
this.$message({ type: 'success', message: '添加成功!' });
this.dialogToggle();
this.getData();
})
}
} else {
console.log('error submit!!');
return false;
}
});
},
getData() {
let json = {
limit: this.limit,
page: this.nowPage
};
this.searchFrom.id?json.id = this.searchFrom.id:'';
this.searchFrom.name?json.name = this.searchFrom.name:'';
this.searchFrom.mobile?json.mobile = this.searchFrom.mobile:'';
this.searchFrom.id_card?json.id_card = this.searchFrom.id_card:'';
this.searchFrom.type?json.type = this.searchFrom.type:'';
this.searchFrom.status?json.status = this.searchFrom.status:'';
getStaffListApi(json).then(res => {
this.tableData = res.list;
this.total = res.total
});
},
onAdd() {
this.dialog.title = '新增标签';
this.dialogToggle();
this.$nextTick(()=>{
this.dialogReset();
});
},
onEdit(item) {
this.dialogToggle();
this.dialogReset();
this.$nextTick(()=>{
this.dialog.title = '编辑员工';
this.dialog.form.id = item.id;
this.dialog.form.name = item.name;
this.dialog.form.mobile = item.mobile;
this.dialog.form.id_card = item.id_card;
this.dialog.form.type = item.type;
this.dialog.form.in_at = item.in_at;
if (item.status == 1) { // 离职
this.dialog.form.over_at = item.over_at;
} else {
this.dialog.form.over_at = ''
}
});
},
onSearch(){
this.getData();
},
onPageChange(val) {
this.nowPage = val
this.getData()
},
onSizeChange(val) {
this.limit = val;
this.nowPage = 1;
this.getData()
},
}
}
</script>
<style scoped lang="less">
@import "../../util/public";
.el-form {
.el-form-item:last-child {
margin-bottom: 0;
}
}
.avatar {
width: 50px;
margin-right: 5px;
border-radius: 50%;
height: 50px;
}
.user {
height: 100%;
overflow: auto;
padding: 20px 0;
.btn-content {
text-align: center;
}
}
.flexRow {
display: flex;
flex-flow: row;
justify-content: flex-start;
align-items: center;
}
</style>
<style>
.f-c > div {
display: flex !important;
flex-flow: row;
justify-content: flex-start;
align-items: center;
}
</style>
...@@ -2,6 +2,7 @@ import store from "@/store" ...@@ -2,6 +2,7 @@ import store from "@/store"
import Router from 'vue-router' import Router from 'vue-router'
import Cookie from '../util/cookie' import Cookie from '../util/cookie'
const router =new Router({ const router =new Router({
scrollBehavior: () => ({y: 0}),
routes: [ routes: [
{ {
path: '/', path: '/',
......
...@@ -167,7 +167,7 @@ export default [{ ...@@ -167,7 +167,7 @@ export default [{
{ {
name: '', name: '',
value: '用户管理', value: '用户管理',
icon: 'icon-laoshi', icon: 'icon-yonghu',
list: [ list: [
{ {
value: '用户列表', value: '用户列表',
...@@ -630,6 +630,17 @@ export default [{ ...@@ -630,6 +630,17 @@ export default [{
component: e => require(['@/components/system/staffRecord'], e), component: e => require(['@/components/system/staffRecord'], e),
} }
}, },
{
value: '标签管理',
routerName: 'tag',
path: '/tag',
cover: '10-8',
router: {
path: '/tag',
name: 'tag',
component: e => require(['@/components/system/tag'], e),
}
},
{ {
value: '员工管理', value: '员工管理',
routerName: 'staff', routerName: 'staff',
......
...@@ -19,40 +19,42 @@ ...@@ -19,40 +19,42 @@
padding: 10px; padding: 10px;
margin: 10px 0; margin: 10px 0;
} }
.new-block{ .new-block{
margin: 10px; margin: 10px;
text-align: right; text-align: right;
} }
.fl-r{ .fl-r{
float: right; float: right;
} }
.text-c{ .text-c{
text-align: center; text-align: center;
} }
.text-b{ .text-b{
font-weight: bold; font-weight: bold;
} }
.color-b{ .color-b{
color: #6ba8e6; color: #6ba8e6;
} }
.text-r{ .text-r{
text-align: right; text-align: right;
} }
.main-block{ .main-block{
margin: 5px; margin: 5px;
background: white; background: white;
padding: 5px; padding: 5px;
} }
html{ html{
font-family: "Helvetica Neue", font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
Helvetica,
"PingFang SC",
"Hiragino Sans GB",
"Microsoft YaHei",
"微软雅黑",
Arial,
sans-serif;
} }
.clear-both{ .clear-both{
&:after{ &:after{
content: ''; content: '';
...@@ -60,8 +62,9 @@ html{ ...@@ -60,8 +62,9 @@ html{
clear: both; clear: both;
} }
} }
//滚动条样式 //滚动条样式
::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色,还可以设置边框属性 /*::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色,还可以设置边框属性
border-radius: 10px; border-radius: 10px;
} }
::-webkit-scrollbar {//滚动条的宽度 ::-webkit-scrollbar {//滚动条的宽度
...@@ -73,4 +76,4 @@ html{ ...@@ -73,4 +76,4 @@ html{
border-radius: 10px; border-radius: 10px;
height: 10px; height: 10px;
min-height:10px; min-height:10px;
} }*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment