diff --git a/src/components/scFileSelect/index.vue b/src/components/scFileSelect/index.vue index 84fd2bf..5f141ae 100644 --- a/src/components/scFileSelect/index.vue +++ b/src/components/scFileSelect/index.vue @@ -44,7 +44,7 @@
- +

{{item[fileProps.fileName]}}

diff --git a/src/config/fileSelect.js b/src/config/fileSelect.js index ada6630..9a8ca22 100644 --- a/src/config/fileSelect.js +++ b/src/config/fileSelect.js @@ -42,27 +42,27 @@ export default { }, files: { doc: { - icon: 'sc-icon-file-word-2-fill', + icon: 'x-icon-file-word-2-fill', color: '#409eff' }, docx: { - icon: 'sc-icon-file-word-2-fill', + icon: 'x-icon-file-word-2-fill', color: '#409eff' }, xls: { - icon: 'sc-icon-file-excel-2-fill', + icon: 'x-icon-file-excel-2-fill', color: '#67C23A' }, xlsx: { - icon: 'sc-icon-file-excel-2-fill', + icon: 'x-icon-file-excel-2-fill', color: '#67C23A' }, ppt: { - icon: 'sc-icon-file-ppt-2-fill', + icon: 'x-icon-file-ppt-2-fill', color: '#F56C6C' }, pptx: { - icon: 'sc-icon-file-ppt-2-fill', + icon: 'x-icon-file-ppt-2-fill', color: '#F56C6C' } } diff --git a/src/config/iconSelect.js b/src/config/iconSelect.js index 1ff2dac..1c37432 100644 --- a/src/config/iconSelect.js +++ b/src/config/iconSelect.js @@ -291,17 +291,17 @@ export default { { name: '扩展', icons: [ - 'sc-icon-vue', - 'sc-icon-code', - 'sc-icon-wechat', - 'sc-icon-bug-fill', - 'sc-icon-bug-line', - 'sc-icon-file-word', - 'sc-icon-file-excel', - 'sc-icon-file-ppt', - 'sc-icon-organization', - 'sc-icon-upload', - 'sc-icon-download' + 'x-icon-vue', + 'x-icon-code', + 'x-icon-wechat', + 'x-icon-bug-fill', + 'x-icon-bug-line', + 'x-icon-file-word', + 'x-icon-file-excel', + 'x-icon-file-ppt', + 'x-icon-organization', + 'x-icon-upload', + 'x-icon-download' ] } ] diff --git a/src/style/app.scss b/src/style/app.scss index db7b7a1..9262081 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -76,9 +76,9 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .right-panel-search {display: flex;align-items: center;} .right-panel-search > * + * {margin-left:10px;} -.adminui-tags {height:34px;background: #fff;border-bottom: 1px solid #e6e6e6;} +.adminui-tags {height:35px;background: #fff;border-bottom: 1px solid #e6e6e6;} .adminui-tags ul {display: flex;overflow: hidden;} -.adminui-tags li {cursor: pointer;display: inline-block;float: left;height:34px;line-height: 34px;position: relative;flex-shrink: 0;} +.adminui-tags li {cursor: pointer;display: inline-block;float: left;height:35px;line-height: 35px;position: relative;flex-shrink: 0;} .adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0px;background-image: linear-gradient(#fff, #e6e6e6);} .adminui-tags li a {display: inline-block;padding:0 10px;width:100%;height:100%;color: #999;text-decoration:none;display: flex;align-items: center;} .adminui-tags li i {margin-left:10px;border-radius: 3px;width:18px;height:18px;display: flex;align-items: center;justify-content: center;} diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 7898bc2..7eb006d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -41,4 +41,5 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c6f7456..de893f0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -43,7 +43,7 @@ diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 794a66b..26774ed 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -7,30 +7,28 @@ - + - + diff --git a/src/views/system/menu/save.vue b/src/views/system/menu/save.vue index f4eb48f..ac4e617 100644 --- a/src/views/system/menu/save.vue +++ b/src/views/system/menu/save.vue @@ -180,7 +180,7 @@ let obj = Object.assign({}, this.form); delete obj.children; - var res = await this.$http.post('system/menu/submit',obj) + var res = await this.$http.post('menu/submit',obj) this.loading = false if(res.code == 200){ this.$message.success("保存成功") diff --git a/src/views/vab/iconfont.vue b/src/views/vab/iconfont.vue index f9a21f1..ef0989e 100644 --- a/src/views/vab/iconfont.vue +++ b/src/views/vab/iconfont.vue @@ -24,7 +24,7 @@ }, mounted() { for(let icon in scIcons){ - this.icons.push('sc-icon'+icon.replace(/[A-Z]/g,(match)=>'-'+match.toLowerCase())) + this.icons.push('x-icon'+icon.replace(/[A-Z]/g,(match)=>'-'+match.toLowerCase())) } } } diff --git a/src/views/vab/importexport.vue b/src/views/vab/importexport.vue index 9c40d3b..1e79eab 100644 --- a/src/views/vab/importexport.vue +++ b/src/views/vab/importexport.vue @@ -6,10 +6,10 @@