diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 6645b4a..0783f80 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -241,7 +241,10 @@ img[src=""],img:not([src]){opacity:0;} border: 1px solid #f0f0f0; border-radius: 6px; margin: 0 10px 10px 0; - + .img_box{ + width: 100%; + height: 148px; + } img { display: block; width: 164px; @@ -414,6 +417,10 @@ img[src=""],img:not([src]){opacity:0;} border-radius: 4px; overflow: hidden; margin: 0 24px 24px 0; + .img_box{ + width: 100%; + height: 100%; + } img { position: relative; display: block; @@ -635,4 +642,8 @@ img[src=""],img:not([src]){opacity:0;} } } } +.img_box{ + background: url(~@/assets/images/menu_bg_02.png) no-repeat #fff; + background-size: cover; +} // end diff --git a/src/views/components/MyAlbum.vue b/src/views/components/MyAlbum.vue index 5e75a93..3f37e28 100644 --- a/src/views/components/MyAlbum.vue +++ b/src/views/components/MyAlbum.vue @@ -108,7 +108,7 @@ import UploadCover from './upload_cover' export default { name: 'ThemeGalleryList', components: { UploadCover }, - inject: ['selectContVisible'], + // inject: ['selectContVisible'], filters: { getSeconds(s) { return getSeconds(s) @@ -151,8 +151,8 @@ export default { img_path: '', name: '', orga_id: '' - }, - selectContVisible2: 0 + } + // selectContVisible2: 0 } }, computed: { @@ -173,9 +173,9 @@ export default { document.addEventListener('click', this.hiddenFolderActiveClick) }, methods: { - addThemeToAlbum() { - this.$emit('test', this.selectContVisible2) - }, + // addThemeToAlbum() { + // this.$emit('test', this.selectContVisible2) + // }, breadcrumbToAlbum() { this.$router.push('/theme') this.getMyAlbum() diff --git a/src/views/components/ThemeGalleryList.vue b/src/views/components/ThemeGalleryList.vue index 5690576..ec835d4 100644 --- a/src/views/components/ThemeGalleryList.vue +++ b/src/views/components/ThemeGalleryList.vue @@ -17,8 +17,9 @@
- -
+
+ +
{{ item.deposit_url | getFileFormat }} @@ -73,10 +74,6 @@ export default { showItemInfo: { type: Boolean, required: true - }, - isLayer: { - type: Boolean, - required: true } }, data() { @@ -102,8 +99,8 @@ export default { themeGalleryList: [], // 主题库的列表 selectedListId: [], selectInFolderid: [], // 关联素材得主键得ID - selectedMaterial: [], // 素材选中 - selectContVisible: false + selectedMaterial: [] // 素材选中 + // selectContVisible: false } }, computed: { diff --git a/src/views/device/index.vue b/src/views/device/index.vue index aa7fd34..da8ba3e 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -100,11 +100,13 @@
{{ items.bgm_name }}
-->
- +
+ +
{{ item.deposit_url | getFileFormat }} - {{ item.duration | getSeconds }} +
{{ item.material_name }}
背景音乐:{{ item.bgm_name }}
diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue index 96fe00b..5766c82 100644 --- a/src/views/immediateRelease/index.vue +++ b/src/views/immediateRelease/index.vue @@ -66,7 +66,7 @@
已选内容: {{ selectTotal }}
-
内容总时长:{{ selectTotalTime }}s
+
内容总时长:{{ selectTotalTime | getSeconds }}
添加BGM:选择文件
@@ -164,7 +164,7 @@
- 内容总时长:3m15s + 内容总时长:{{ selectTotalTime | getSeconds }}
@@ -412,6 +412,7 @@ export default { this.selectedMaterial = [] this.selectedMaterial = JSON.parse(localStorage.getItem('selectedMaterial')) this.getSelectTotal() + this.getSelectTimeTotal() }, mounted() { if (this.$route.path === '/release') { @@ -438,14 +439,31 @@ export default { } }) this.selectTotal = this.selectedMaterial.length + result.length - console.log(this.selectedMaterial) - console.log(this.selectedMaterial.length) - console.log(result.length) + } + }, + getSelectTimeTotal() { + if (this.selectedMaterial) { + const imgTimeTotal = [] + this.selectedMaterial.forEach(item => { + if (item.material_type == 0) { + if (item.showTime) { + imgTimeTotal.push(parseInt(item.showTime)) + } else { + imgTimeTotal.push(parseInt(15)) + } + } else { + imgTimeTotal.push(parseInt(item.duration)) + } + }) + this.selectTotalTime = imgTimeTotal.reduce((a, b) => { + return a + b + }, 0) } }, saveEdit() { this.listEditVisible = false this.getSelectTotal() + this.getSelectTimeTotal() }, // 编辑带来 release_id editRelease() { @@ -513,6 +531,7 @@ export default { } }) this.getSelectTotal() + this.getSelectTimeTotal() } }) // 设备list @@ -728,6 +747,8 @@ export default { }) } // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial)) + this.getSelectTotal() + this.getSelectTimeTotal() }, // 选中可编辑的 clickMaterialItem(id, item) { @@ -820,6 +841,7 @@ export default { this.selectedMaterial.push(this.audioListData[index]) } this.getSelectTotal() + this.getSelectTimeTotal() // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial)) } else { this.selectedEditData[this.thisEditIndex].showAudioName = this.audioListData[index].material_name @@ -918,7 +940,9 @@ export default { }) } // localStorage.setItem('selectedMaterial', JSON.stringify(this.selectedMaterial)) + console.log(this.selectedMaterial) this.getSelectTotal() + this.getSelectTimeTotal() this.mulitText = '多选' }, // 素材选择 - 取消按钮 diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index 2dd5e91..1e57904 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -26,7 +26,9 @@
- +
+ +
{{ item.deposit_url | getFileFormat }}