Merge branch '11/24SAAS' into 08/24teamQuest

dist/static/css/chunk-0cc129f5.845193fe.css → dist/static/css/chunk-c40b2150.599da6cc.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-5b4bd763]{margin-top:20px;display:block;text-align:right}[data-v-80d511ca] .el-button+.el-button{margin-left:0}.select[data-v-80d511ca]{font-size:14px}.btnList[data-v-80d511ca]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList .exportBtn[data-v-80d511ca]{margin-left:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-5b4bd763]{margin-top:20px;display:block;text-align:right}[data-v-359ef334] .el-button+.el-button{margin-left:0}.select[data-v-359ef334]{font-size:14px}.btnList[data-v-359ef334]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList .exportBtn[data-v-359ef334]{margin-left:15px}

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)"