Merge branch 'feature/7月基础一异常冻结会员'

* feature/7月基础一异常冻结会员:
  白名单生日格式化

src/components/allCustomers/index.js

@@ -361,7 +361,7 @@ export default {
                     ? formatLongTime(ele.crateCardDateString, 1)
                     : "--", // 开卡
                 birthdayMD:
-                  ele.birthdayMD != 0 ? paddingBorth(ele.birthdayMD) : "--", // 生日补全
+                  (ele.birthdayMD != 0 && ele.birthdayMD != -1) ? paddingBorth(ele.birthdayMD) : "--", // 生日补全
                 sex: ele.sex == 0 ? "--" : ele.sex == 1 ? "男" : "女",
                 age: ele.age ? ele.age : "--",
                 cardNo: ele.cardNo ? ele.cardNo : "--",

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

@@ -22,6 +22,9 @@ export default {
   mixins: [authMethods],
   filters: {
     formatBirth(value){
+      if(value == -1){
+        return '--'
+      }
       return paddingBorth(value) || '--'
     },
     formatDate(val, format) {

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

@@ -20,6 +20,9 @@ export default {
   mixins: [authMethods],
   filters: {
     formatBirth(value){
+      if(value == -1){
+        return '--'
+      }
       return paddingBorth(value) || '--'
     },
     formatDate(val, format) {

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

@@ -224,7 +224,7 @@
               </div>
               <!-- 生日 -->
               <div v-else-if="colum.code == 'birthday'">
-                <div>{{ row.birthdayMD | formatBirth() }}</div>
+                <div>{{ row.birthdayMD | formatBirth }}</div>
               </div>
               <!-- 开卡门店 -->
               <div v-else-if="colum.code == 'createCardStoreName'">

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

@@ -7,7 +7,7 @@ import {
 import authMethods from "@/mixins/auth";
 import defaultImg from "../../../../../static/img/default.png";
 import ImportDialog from "@/components/allCustomers/components/importDialog.vue";
-import { formatLongTime } from "@/utils/utils";
+import { formatLongTime, paddingBorth } from "@/utils/utils";
 import {dateformat} from '@/utils/formatTime';
 import FreezeDialog from '../../components/dialog/freeze.vue';
 export default {
@@ -18,6 +18,12 @@ export default {
   },
   mixins: [authMethods],
   filters: {
+    formatBirth(value){
+      if(value == -1){
+        return '--'
+      }
+      return paddingBorth(value) || '--'
+    },
     formatLongTimeDate(val, format) {
       if (!val || val == -1) return format == "hms" ? "" : "--";
       let str = formatLongTime(val, 1);

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

@@ -64,7 +64,11 @@
         </template>
       </el-table-column>
       <el-table-column label="会员等级" prop="gradeName" :min-width="140"></el-table-column>
-      <el-table-column label="会员生日" prop="birthdayMD" :min-width="140"></el-table-column>
+      <el-table-column label="会员生日" prop="birthdayMD" :min-width="140">
+        <template slot-scope="{ row }">
+          {{ row.birthdayMD | formatBirth }}
+        </template>
+      </el-table-column>
       <el-table-column label="会员卡号" prop="cardNo" :min-width="140"></el-table-column>
       <el-table-column label="最近消费时间" :min-width="140">
         <template slot-scope="{ row }">