diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 287718d..ae3b482 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -774,7 +774,11 @@ .el-button{ margin-left: 10px; } + &.is-recycle{ + margin-right: 0; + } } + } [data-theme=dark] .collect-header{ diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue index b59b386..83c0eff 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue @@ -1,12 +1,12 @@ @@ -25,6 +25,10 @@ export default { default: function() { return {} } + }, + isRecycle: { + type: Boolean, + default: false } }, data() { @@ -37,6 +41,8 @@ export default { created() { }, mounted() { + console.log((!this.isRecycle && this.selectedCategory.arrangeType !== 1)) + console.log('isRecycle', this.isRecycle) console.log('test', this.test) }, methods: { diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue index ed2c7a2..0a0f845 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue @@ -1,6 +1,6 @@