Merge branch 'LAO_MO' into online

src/views/teamDetail/components/studentList.vue

@@ -29,10 +29,11 @@
     <el-form :inline="true"
              class="searchForm"
              v-model="searchForm">
-      <el-form-item >
-        <el-input v-model="searchForm.search" placeholder="学生姓名或联系电话"></el-input>
+      <el-form-item label="学生姓名">
+        <el-input v-model="searchForm.search"
+                  @keyup.enter.native='search'></el-input>
       </el-form-item>
-      <el-form-item>
+      <el-form-item label="学员状态">
         <el-select v-model="searchForm.studentStatus"
                    clearable
                    placeholder="学员状态">
@@ -54,7 +55,7 @@
                      :label="item.name"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <el-select v-model="searchForm.isPay"
                    clearable
                    placeholder="是否缴费">
@@ -66,7 +67,7 @@
                      value="2"></el-option>
         </el-select>
       </el-form-item>
-      
+
       <!-- <el-form-item>
         <el-select v-model="searchForm.school"
                    placeholder="所在学校">
@@ -76,7 +77,7 @@
       </el-form-item> -->
       <el-form-item>
         <div class='searchBtn'
-             @click='getList'>筛选</div>
+             @click='search'>搜索</div>
       </el-form-item>
     </el-form>
 
@@ -501,7 +502,8 @@ export default {
         studentStatus: '', // 学生状态
         major: '', // 报名专业
         isPay: '', // 是否缴费
-        search: '', // 电话 || 姓名
+        search: ''
+
       },
       quitForm: { // 退团信息确认
         isRefundCourseFee: null,
@@ -647,6 +649,10 @@ export default {
 
   },
   methods: {
+    search () {
+      this.rules.page = 1;
+      this.getList()
+    },
     onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true
       let id = this.$route.query.id
@@ -923,7 +929,7 @@ export default {
 //   }
 // }
 .el-select {
-    width: 180px !important;
+  width: 180px !important;
 }
 
 .headWrap {