Merge branch '12/25morning' into online

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)
       })