白名单参数

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

@@ -99,7 +99,7 @@
             :label="colum.name"
             show-overflow-tooltip
             :min-width="
-              colum.code === 'name' ? 220 : colum.code == 'status' ? 170 : 140
+              colum.code === 'name' ? 200 : colum.code == 'status' ? 170 : 140
             "
             :fixed="colum.code === 'name'"
             :sortable="colum.isSort ? 'custom' : false"

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

@@ -93,7 +93,7 @@
             :label="colum.name"
             show-overflow-tooltip
             :min-width="
-              colum.code === 'name' ? 220 : colum.code == 'status' ? 170 : 140
+              colum.code === 'name' ? 200 : colum.code == 'status' ? 170 : 140
             "
             :fixed="colum.code === 'name'"
             :sortable="colum.isSort ? 'custom' : false"

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

@@ -8,6 +8,7 @@ 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 {dateformat} from '@/utils/formatTime';
 import FreezeDialog from '../../components/dialog/freeze.vue';
 export default {
   name: "frozen-member",
@@ -17,7 +18,7 @@ export default {
   },
   mixins: [authMethods],
   filters: {
-    formatDate(val, format) {
+    formatLongTimeDate(val, format) {
       if (!val || val == -1) return format == "hms" ? "" : "--";
       let str = formatLongTime(val, 1);
       let arr = str.split(" ");
@@ -28,9 +29,19 @@ export default {
       }
       return str;
     },
+    formatDate(val, format) {
+      if (!val || val == -1) return format == "hms" ? "" : "--";
+    
+      if (format == "ymd") {
+        return dateformat(new Date(val), 'yyyy-MM-dd');
+      } else if (format == "hms") {
+        return dateformat(new Date(val), 'hh:mm:ss');
+      }
+      return dateformat(new Date(val), 'yyyy-MM-dd hh:mm:ss');
+    },
     formateTime(val){
       if (!val || val == -1) return "--";
-      return formatLongTime(val, 1);
+      return dateformat(val, 'yyyy-MM-dd hh:mm:ss');
     },
   },
   data() {

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

@@ -37,7 +37,7 @@
       ref="multipleTable"
       class="member-table"
     >
-      <el-table-column label="会员信息">
+      <el-table-column label="会员信息" :min-width="200">
         <template slot-scope="{ row }">
           <!-- 基本信息 -->
           <el-row
@@ -61,24 +61,32 @@
           </el-row>
         </template>
       </el-table-column>
-      <el-table-column label="会员等级" prop="memberGrade"></el-table-column>
-      <el-table-column label="会员生日" prop="birth"></el-table-column>
-      <el-table-column label="会员卡号" prop="cardNum"></el-table-column>
+      <el-table-column label="会员等级" prop="gradeName"></el-table-column>
+      <el-table-column label="会员生日" prop="birthdayMD"></el-table-column>
+      <el-table-column label="会员卡号" prop="cardNo"></el-table-column>
       <el-table-column label="最近消费时间">
         <template slot-scope="{ row }">
           <div>
-            TODO
-            <div>{{ row.createTime | formatDate("ymd") }}</div>
-            <div>{{ row.createTime | formatDate("hms") }}</div>
+            <div>{{ row.lastCostTime | formatLongTimeDate("ymd") }}</div>
+            <div>{{ row.lastCostTime | formatLongTimeDate("hms") }}</div>
           </div>
         </template>
       </el-table-column>
 
       <el-table-column
         label="移入原因"
-        prop="reason"
+        prop="remark"
         label-class-name="reason-label"
       ></el-table-column>
+      
+      <el-table-column label="移入时间">
+        <template slot-scope="{ row }">
+          <div>
+            <div>{{ row.createTime | formatDate("ymd") }}</div>
+            <div>{{ row.createTime | formatDate("hms") }}</div>
+          </div>
+        </template>
+      </el-table-column>
 
       <el-table-column label="操作" fixed="right" width="220">
         <template slot-scope="{ row }">