Merge branch '0609getMusicFee' into test

src/main.js

@@ -76,7 +76,9 @@ ElementUI.Dialog.props.closeOnClickModal.default = false;
 //  (ElementUI.Input)
 // 全局修改选择如果value与label都为数字0则清空
 const SelectValueWatch = ElementUI.Select.watch.value
+// console.log(ElementUI.Select)
 ElementUI.Select.watch.value = function (newValue, oldValue) {
+// console.log(this)
   SelectValueWatch.call(this, newValue, oldValue)
   if (this.selected && this.selected.value === 0 && this.selected.currentLabel === 0 && newValue !== oldValue) {
     this.handleClearClick.call(this, {

src/views/resetTeaming/modals/extra-class-user.vue

@@ -46,6 +46,7 @@
         </template>
         <template slot-scope="scope">
           <el-form-item
+          class="tableItem"
             :prop="'form.' + scope.$index + '.courseCurrentPrice'"
             :rules="{ required: true, message: '请输入现价', trigger: 'blur' }"
           >
@@ -70,6 +71,7 @@
         width="140">
         <template slot-scope="scope">
           <el-form-item
+            class="tableItem"
             :prop="'form.' + scope.$index + '.courseOriginalPrice'"
             :rules="{ required: true, message: '请输入原价', trigger: 'blur' }"
           >
@@ -164,4 +166,7 @@ export default {
     text-align: left;
   }
 }
+.tableItem {
+  margin-bottom: 0!important;
+}
 </style>