Merge commit '30ad2e3f' into dev

* commit '30ad2e3f':
  列表吸顶 搜索条件位置UI

src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.vue

@@ -14,6 +14,17 @@
               placeholder="输入手机号/会员卡号"
               @change="onSearchDataChange"
             ></el-input>
+            <el-date-picker v-model="dateValue" 
+              style="margin-left: 10px;width: 260px;"
+              format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              :pickerOptions="pickerOptions"
+              @change="dateRangeChange"></el-date-picker>
+
             <el-select
               v-model="searchData.memberCardStatus"
               style="width: 160px; margin-left: 10px"
@@ -24,16 +35,7 @@
               <el-option label="正常" :value="1"></el-option>
               <el-option label="冻结" :value="2"></el-option>
             </el-select>
-            <el-date-picker v-model="dateValue" 
-              style="margin-left: 10px"
-              format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="~"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              :pickerOptions="pickerOptions"
-              @change="dateRangeChange"></el-date-picker>
+            
           </el-row>
           <span
             class="right-btn"
@@ -67,6 +69,7 @@
           :data="list"
           tooltip-effect="dark"
           style="width: 100%"
+          max-height="700"
         >
           <el-table-column type="selection" min-width="30" fixed="left">
           </el-table-column>

src/components/wechatmembers/frozen-member/frozen-list/frozen-list.vue

@@ -62,6 +62,7 @@
           tooltip-effect="dark"
           style="width: 100%"
           @sort-change="sortChange"
+          max-height="700"
         >
           <el-table-column type="selection" min-width="30" fixed="left">
           </el-table-column>

src/components/wechatmembers/frozen-member/frozen-member/frozen-member.vue

@@ -27,6 +27,7 @@
         class="member-table"
         @selection-change="handleSelectionChange"
         v-loading="load"
+        max-height="700"
       >
         <el-table-column
           type="selection"

src/components/wechatmembers/frozen-member/white-list/white-list.js

@@ -11,7 +11,7 @@ import { formatLongTime } from "@/utils/utils";
 import {dateformat} from '@/utils/formatTime';
 import FreezeDialog from '../../components/dialog/freeze.vue';
 export default {
-  name: "frozen-member",
+  name: "frozenMemberWhiteList",
   components: {
     FreezeDialog,
     ImportDialog