Merge branch 'master' into iteration_adminOptimiz

.gitignore

@@ -19,3 +19,4 @@ debug.log
 
 
 
+*.log

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -334,7 +334,7 @@
                :inline="true"
                label-width="120px"
                label-position="right"
-               ref="resetPayForm">
+               ref="resetPayForm"  @submit.native.prevent>
         <!-- <el-form-item label="学员姓名"
                       :rules="[{ required: true, message: '学员姓名',trigger: 'blur'}]"
                       prop="startDate">

src/views/resetTeaming/modals/pay-items.vue

@@ -189,7 +189,9 @@ export default {
       } catch (error) {}
     },
     toDetail(row) {
-      // this.$listeners.close();
+      if (this.payUserType === 'STUDENT') {
+        this.$listeners.close();
+      }
       this.$nextTick(() => {
           this.$listeners.lookDetail(row)
       })

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -20,7 +20,8 @@
               :label="item.name"
               :value="item.id"
               :disabled="checkDisabled(item)"
-            ></el-option>
+            >
+            </el-option>
           </el-select>
         </div>
         <div class="flexRow">

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -64,7 +64,12 @@
                   :key="index"
                   :label="item.name"
                   :value="item.id"
-                ></el-option>
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px; padding-right:20px">{{
+                    item.groupPurchasePrice|moneyFormat
+                  }}元</span>
+                </el-option>
               </el-select>
             </div>
           </el-collapse-item>