Merge branch '07/06musicArchives' of http://git.dayaedu.com/yonge/dy-admin-manager into 07/06musicArchives

src/views/studentManager/memberList.vue

@@ -49,7 +49,6 @@
           <el-select
             class="multiple"
             v-model.trim="searchForm.hasMember"
-            clearable
             placeholder="会员是否过期"
           >
             <el-option label="已过期" value="0"></el-option>
@@ -129,7 +128,7 @@
           <el-table-column align="center" prop="studentId" label="会员是否过期">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.memberDay > 0 ? "否" : "是" }}
+                {{ scope.row.memberDay > 0 ? "即将过期" : "已过期" }}
               </div>
             </template>
           </el-table-column>