Browse Source

Merge branch 'dev' of github.com:halo-dev/halo-admin into dev

pull/51/head
ruibaby 5 years ago
parent
commit
2ecba6ce74
  1. 3
      src/views/interface/components/ThemeSetting.vue
  2. 2
      src/views/system/OptionForm.vue

3
src/views/interface/components/ThemeSetting.vue

@ -317,7 +317,8 @@ export default {
this.attachmentDrawerVisible = true this.attachmentDrawerVisible = true
}, },
handleSelectAttachment(data) { handleSelectAttachment(data) {
this.themeSettings[this.selectedField] = encodeURI(data.path) this.$set(this.themeSettings, this.selectedField, encodeURI(data.path))
// this.themeSettings[this.selectedField] = encodeURI(data.path)
this.attachmentDrawerVisible = false this.attachmentDrawerVisible = false
}, },
toggleViewMode() { toggleViewMode() {

2
src/views/system/OptionForm.vue

@ -1198,7 +1198,7 @@ export default {
} }
}, },
handleSelectLogo(data) { handleSelectLogo(data) {
this.options.blog_logo = encodeURI(data.path) this.$set(this.options, 'blog_logo', encodeURI(data.path))
this.logoDrawerVisible = false this.logoDrawerVisible = false
}, },
handleTestMailClick() { handleTestMailClick() {

Loading…
Cancel
Save