Merge branch 'bugfix/会员卡券列表' into dev

src/components/wechatmembers/cardvoucher.vue

@@ -72,7 +72,7 @@
                 :value=10
               ></el-option>
             </el-select>
-            <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" value-format="yyyy-MM-dd" @change="handleSearch" clearable> </el-date-picker>
+            <!-- <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" value-format="yyyy-MM-dd" @change="handleSearch" clearable> </el-date-picker> -->
           </div>
            <!-- <p class="font14 tip-p">展示投放时间近一年的卡券</p> -->
               <div class="table-content">
@@ -554,17 +554,17 @@ export default {
       });
     },
     getMemberCardsPage() {
-      let [ beginTime, endTime ] = this.dateDefault;
-      beginTime = beginTime ? new Date(beginTime).getTime() : null;
-      endTime = endTime ? new Date(endTime).getTime() : null;
+      // let [ beginTime, endTime ] = this.dateDefault;
+      // beginTime = beginTime ? new Date(beginTime).getTime() : undefined;
+      // endTime = endTime ? new Date(endTime).getTime() : undefined;
       doFetch(url.memberCardsPage, {
         memberId: this.memberId,
         pageSize: this.page.pageSize,
         currentPage: this.page.currentPage,
         cardReviceCode: this.cardReviceCode,
         useStatus: this.useStatus,
-        beginTime,
-        endTime
+        // beginTime,
+        // endTime
       })
         .then(res => {
           if (res.data.errorCode === 0) {