fix: bug修复

src/config/mapping/gic-card.js

@@ -137,13 +137,13 @@ export const mappingCardStatus = (item) => {
   if (statusFlag == 2) { // 1: 正常; 2:已禁用
     _status = 4;
   } else {
-    if (cardEffectiveMode === 0 && expireDate < Date.now()) {
+    if (cardEffectiveMode === 0 && new Date(expireDate).getTime() < Date.now()) {
       _status = 3; // ↓过期判断 固定日期
-    }
-    if (cardEffectiveMode === 0 && startDate > Date.now()) {
+    } else if (cardEffectiveMode === 0 && new Date(startDate).getTime() > Date.now()) {
       _status = 1; // 未生效
+    } else {
+      _status = 2;
     }
-    _status = 2;
   }
   item._status = _status;
   return item;

src/views/card/gic-card/member-get.vue

@@ -11,14 +11,14 @@
         <el-option label="会员领取记录" :value="1"></el-option>
         <el-option label="非会员领取记录" :value="2"></el-option>
       </el-select>
-      <el-input placeholder="请输入关键字" class="mr10 w400" v-model="listParams.search" clearable @change="refresh">
-        <el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
-          <el-option label="卡券名称" :value="1"></el-option>
-          <el-option label="备注名" :value="2"></el-option>
-          <el-option label="副标题" :value="3"></el-option>
-          <el-option label="会员昵称" :value="4"></el-option>
-          <el-option label="会员手机号" :value="5"></el-option>
-          <el-option label="会员卡号" :value="6"></el-option>
+      <el-input placeholder="请输入关键字" class="mr10 w400" v-model="searchValue" clearable @change="refresh">
+        <el-select v-model="searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
+          <el-option label="卡券名称" value="cardName"></el-option>
+          <el-option label="备注名" value="remarkName"></el-option>
+          <el-option label="副标题" value="subTitle"></el-option>
+          <el-option label="会员昵称" value="memberName"></el-option>
+          <el-option label="会员手机号" value="memberPhone"></el-option>
+          <el-option label="会员卡号" value="memberCardNo"></el-option>
         </el-select>
       </el-input>
       <el-button class="ml10" type="text" @click="isOpen = !isOpen">{{ isOpen ? '收起' : '展开' }}<i :class="`${isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`"></i></el-button>
@@ -130,10 +130,10 @@ export default {
       dateTime2: [ , ],
       listParams: {
         couponId: this.$route.query.id, // 卡券id
-        search: '',
-        searchType: 1,
+        // search: '',
+        // searchType: 1,
         cardType: '',
-        status: '',
+        statusFlag: '',
         receiveBeginTime: '',
         receiveEndTime: '',
         verifyBeginTime: '',
@@ -142,6 +142,8 @@ export default {
         pageSize: 20,
         memberType: '', // 0会员 1非会员
       },
+      searchValue: '',
+      searchType: 'cardName',
       cardType: Object.keys(cardType).map(v => { return cardType[v]; }),
       status: _statusList,
       cardOrderShow: false,
@@ -224,7 +226,7 @@ export default {
 
       this.formatterTimeFunc('receiveBeginTime', 'receiveEndTime', 'yyyy-MM-dd', 'dateTime');
       this.formatterTimeFunc('verifyBeginTime', 'verifyEndTime', 'yyyy-MM-dd', 'dateTime2');
-      let params = { ...this.listParams, memberCardId: this.currentAreaId };
+      let params = { ...this.listParams, memberCardId: this.currentAreaId, [this.searchType]: this.searchValue };
       this.loading = true;
       couponlogList(params).then(res => {
         this.loading = false;