From 8fd965934f90029e39b7ea5a2f230bfb0e22a023 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 21 Dec 2023 09:41:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B1=8F?=
=?UTF-8?q?=E5=9C=A8=E6=9C=89=E8=83=8C=E6=99=AF=E5=9B=BE=E7=9A=84=E6=83=85?=
=?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=89=93=E5=BC=80=E8=83=8C=E6=99=AF?=
=?UTF-8?q?=E5=9B=BE=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=86=8D=E5=85=B3?=
=?UTF-8?q?=E9=97=AD=E4=BC=9A=E6=8A=8A=E5=B7=B2=E6=9C=89=E8=83=8C=E6=99=AF?=
=?UTF-8?q?=E5=9B=BE=E6=B8=85=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BigScreenDesign/OverallSetting/BgImgDialog.vue | 9 ++-------
.../packages/BigScreenDesign/OverallSetting/index.vue | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/BgImgDialog.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/BgImgDialog.vue
index 4f69a5b7..0545b575 100644
--- a/data-room-ui/packages/BigScreenDesign/OverallSetting/BgImgDialog.vue
+++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/BgImgDialog.vue
@@ -115,13 +115,8 @@ export default {
methods: {
init () {
this.dialogVisible = true
- this.imgUrl = this.form.customTheme === 'light' ? this.form.bg : this.form.lightBg
- this.fileList = this.getCoverPicture(this.imgUrl)
- ? [{
- name: '背景图',
- url: this.getCoverPicture(this.imgUrl)
- }]
- : []
+ this.imgUrl = this.form.customTheme === 'light' ? this.form.lightBg : this.form.bg
+ this.fileList = this.getCoverPicture(this.imgUrl) ? [{ name: '背景图', url: this.getCoverPicture(this.imgUrl) }] : []
this.hideUploadImgBtn = this.fileList.length !== 0
this.$dataRoomAxios.get('/bigScreen/design/bg/list').then(list => {
this.bgImgList = list
diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
index 6cce4b38..e52593f2 100644
--- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
@@ -196,10 +196,10 @@
<script>
import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
-import BgImg from './BgImgDialog.vue'
+import BgImg from 'data-room-ui/BigScreenDesign/OverallSetting/BgImgDialog.vue'
import { mapState, mapMutations } from 'vuex'
import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting'
-import {predefineColors} from 'data-room-ui/js/utils/colorList'
+import { predefineColors } from 'data-room-ui/js/utils/colorList'
import { getFileUrl } from 'data-room-ui/js/utils/file'
export default {
name: 'OverallSetting',