Merge branch '01/19NavMenu' into online

src/views/resetTeaming/modals/review-detail.vue

@@ -116,7 +116,7 @@
         </template>
         <template slot-scope="scope">
           <div>
-            {{ (musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.masterSubCoursePrice : scope.row.courseCurrentPrice) | moneyFormat }}
+            {{ scope.row.courseCurrentPrice | moneyFormat }}
           </div>
         </template>
       </el-table-column>
@@ -125,7 +125,7 @@
 
         <template slot-scope="scope">
           <div>
-            {{ (musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? musicGroupPaymentCalenders[0].paymentAmount : scope.row.courseOriginalPrice) | moneyFormat }}
+            {{ (musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.masterSubCoursePrice : scope.row.courseOriginalPrice) | moneyFormat }}
           </div>
         </template>
       </el-table-column>

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -8,7 +8,7 @@
           <el-form-item label="声部班">
             <el-select v-model.trim="form.signClass" filterable clearable>
               <el-option
-                v-for="(item, index) in signList"
+                v-for="(item, index) in signList.filter(item => item.lockFlag != 1)"
                 :key="index"
                 :value="item.id"
                 :label="item.name"
@@ -20,7 +20,7 @@
           <el-form-item label="合奏班">
             <el-select v-model.trim="form.mixClass" filterable clearable>
               <el-option
-                v-for="(item, index) in mixList"
+                v-for="(item, index) in mixList.filter(item => item.lockFlag != 1)"
                 :key="index"
                 :value="item.id"
                 :label="item.name"
@@ -32,7 +32,7 @@
           <el-form-item label="基础技能班">
             <el-select v-model.trim="form.highClass" filterable clearable>
               <el-option
-                v-for="(item, index) in highList"
+                v-for="(item, index) in highList.filter(item => item.lockFlag != 1)"
                 :key="index"
                 :value="item.id"
                 :label="item.name"
@@ -49,7 +49,7 @@
               multiple
             >
               <el-option
-                v-for="(item, index) in snapList"
+                v-for="(item, index) in snapList.filter(item => item.lockFlag != 1)"
                 :key="index"
                 :value="item.id"
                 :label="item.name"
@@ -203,6 +203,7 @@ export default {
     }
   },
   mounted() {
+    console.log([...this.snapList])
     this.formatCourse()
   },
   methods: {