Merge branch '07/06musicArchives' into 11/24SAAS

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -58,7 +58,7 @@
                 <template
                   slot="append"
                   v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                  >元/40分钟</template
+                  >元/节</template
                 >
                 <template slot="append" v-else
                   >元/90分钟</template
@@ -83,7 +83,7 @@
                 <template
                   slot="append"
                   v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                  >元/40分钟</template
+                  >元/节</template
                 >
                 <template slot="append" v-else
                   >元/90分钟</template

src/views/teamDetail/teamList.vue

@@ -405,7 +405,7 @@
                            @click="stopTeam(scope.row)">取消乐团</el-button> -->
                 <el-button
                   v-if="
-                    scope.row.status == 'PAUSE' &&
+                    (scope.row.status == 'PAUSE'|| scope.row.status == 'CLOSE') &&
                     permission('musicGroup/resumeMusicGroup')
                   "
                   @click="onTeamOpeation('start', scope.row)"