Merge branch 'master' into 02_07search

src/constant/index.js

@@ -113,7 +113,7 @@ export const auditPaymentType = {
   ADD_COURSE: '临时加课',
   MUSIC_APPLY: '乐团报名',
   MUSIC_RENEW: '乐团续费',
-  SPAN_GROUP_CLASS_ADJUST: '跨团合班',
+  SPAN_GROUP_CLASS_ADJUST: '合班缴费',
 }
 
 export const orderServerType = {

src/views/auditList/index.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      审核列表
+      费用审核列表
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->

src/views/teamBuild/signupList.vue

@@ -1350,7 +1350,9 @@ export default {
       // this.visitForm.studentName = row.studentName;
       // this.visitForm.musicGroupId = this.teamid;
       // this.visitForm.studentId = row.studentId;
+      row.userId = row.studentId
       this.detail = row
+      this.detail.musicGroupId = this.$route.query.id
       this.visitVisiable = true;
     },
     openChangeVoice(row) {