Browse Source

Merge branch '07/06musicArchives' into test

wolyshaw 4 years ago
parent
commit
b2266c5685

+ 8 - 8
src/views/photo-detail/index.vue

@@ -267,16 +267,16 @@ export default {
   padding: 0 15px;
 }
 .ctrl-bar-view{
-  opacity: 0;
-  visibility: hidden;
+  // opacity: 0;
+  // visibility: hidden;
   transition: all .3s;
 }
-.img-container:hover{
-  .ctrl-bar-view{
-    opacity: 1;
-    visibility: visible;
-  }
-}
+// .img-container:hover{
+//   .ctrl-bar-view{
+//     opacity: 1;
+//     visibility: visible;
+//   }
+// }
 .el-icon-view,
 .el-icon-picture-outline-round{
   font-size: 14px;

+ 2 - 1
src/views/resetTeaming/components/archicesComponents/performance.vue

@@ -185,7 +185,8 @@ export default {
     async FetchList() {
       try {
         const res = await musicGroupPerformanceQueryPage({
-          page: this.rules.page
+          page: this.rules.page,
+          musicGroupId: this.$route.query.id,
         })
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;