Merge branch '0601Action' into test

src/views/categroyManager/vipActiveList.vue

@@ -73,9 +73,9 @@
             clearable
             placeholder="使用学员"
           >
-            <el-option label="新用户" :value="1"></el-option>
-            <el-option label="老用户" :value="0"></el-option>
-            <el-option label="所有用户" :value="-1"></el-option>
+            <el-option label="新学员" :value="1"></el-option>
+            <el-option label="老学员" :value="0"></el-option>
+            <el-option label="所有学员" :value="-1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -121,7 +121,7 @@
 
           <el-table-column
             align="center"
-            label="适用课时类型"
+            label="使用学员"
             :formatter="formatStudentType"
           ></el-table-column>
 
@@ -267,9 +267,9 @@
               placeholder="请选择使用学员"
               clearable
             >
-              <el-option label="新用户" :value="1"></el-option>
-              <el-option label="老用户" :value="0"></el-option>
-              <el-option label="所有用户" :value="-1"></el-option>
+              <el-option label="新学员" :value="1"></el-option>
+              <el-option label="老学员" :value="0"></el-option>
+              <el-option label="所有学员" :value="-1"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="活动描述" label-width="120px" prop="desc">
@@ -902,13 +902,13 @@ export default {
     formatStudentType(row) {
       let str = null
       if(row.applyToStudentType == -1) {
-        str = '所有用户'
+        str = '所有学员'
       }
       if(row.applyToStudentType == 0) {
-        str = '老用户'
+        str = '老学员'
       }
       if(row.applyToStudentType == 1) {
-        str = '新用户'
+        str = '新学员'
       }
       return str
     },

src/views/categroyManager/vipNewActive.vue

@@ -62,9 +62,9 @@
             placeholder="请选择使用学员"
             clearable
           >
-            <el-option label="新用户" :value="1"></el-option>
-            <el-option label="老用户" :value="0"></el-option>
-            <el-option label="所有用户" :value="-1"></el-option>
+            <el-option label="新学员" :value="1"></el-option>
+            <el-option label="老学员" :value="0"></el-option>
+            <el-option label="所有学员" :value="-1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="活动描述" prop="desc">

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -312,6 +312,7 @@ export default {
       this.search();
     },
     resetMusic(row) {
+      row.organId = this.detail.organId
       this.resetRow = row;
       this.dialogVisible = true;
     },
@@ -324,6 +325,7 @@ export default {
         try {
           const res = await getInstrumentSoundList({
             subjectId: val,
+            organId: this.detail.organId,
             page: 1,
             rows: 999,
           });

src/views/reaplceMusicPlayer/modals/resetInfo.vue

@@ -69,6 +69,7 @@ export default {
     };
   },
   async mounted() {
+    console.log(this.detail)
     await this.$store.dispatch("setSubjects");
     this.changeSound(this.detail.subjectId);
     this.form.subjectId = this.detail.subjectId;
@@ -81,6 +82,7 @@ export default {
         try {
           const res = await getInstrumentSoundList({
             subjectId: val,
+            organId: this.detail.organId,
             page: 1,
             rows: 999,
           });