Merge branch 'feature/7月迭代-会员' into test

src/components/allCustomers/components/customerLog.vue

@@ -10,7 +10,7 @@
         :props="{ checkStrictly: true }"
         @change="filterMethod">
       </el-cascader>
-      <el-date-picker style="width: 256px; margin-left:10px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
+      <el-date-picker style="width: 256px; margin-left:10px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
       <p class="font14 tip-p" v-if="!memberId">展示近一年的日志</p>
     </div>
     <el-table :data="tableData"  style="width: 100%">

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="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
+            <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
           </div>
            <p class="font14 tip-p">展示投放时间近一年的卡券</p>
             <div class="table-content">

src/components/wechatmembers/enterpriseIntegralDetial.vue

@@ -223,6 +223,8 @@ export default {
     },
     getIntegralDataPage() {
       this.loading = true;
+      console.log(this.dateDefault);
+      if(!this.dateDefault) this.dateDefault = ['', ''];
       let para = this.form
       para['memberId'] = this.memberId
       para['pageSize'] = this.page.pageSize

src/components/wechatmembers/enterpriseIntergralWithhold.vue

@@ -8,7 +8,7 @@
         </el-select>
         <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~"
           start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']"
-          :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
+          :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
       </div>
     </div>
     <div>
@@ -146,6 +146,7 @@ export default {
     },
     getIntegralDataPage() {
       this.loading = true;
+      if(!this.dateDefault) this.dateDefault = ['', ''];
       doFetch(url.enterpriseIntegralWithholdData, {
         memberId: this.memberId,
         pageSize: this.page.pageSize,

src/components/wechatmembers/integralDataPage.vue

@@ -54,7 +54,7 @@
           <el-option label="所有积分状态" :value=-1></el-option>
           <el-option v-for="item in frozenStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
-         <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
+         <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
       </div>
       <el-button
         v-if="getCodeAuth('memberAdjustIntegral')"