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

src/components/wechatmembers/cardvoucher.vue

@@ -74,7 +74,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>
           </div>
-           <p class="font14 tip-p">展示投放时间仅一年的卡券</p>
+           <p class="font14 tip-p">展示投放时间近一年的卡券</p>
             <div class="table-content">
               <el-table
                 :data="memberData"

src/components/wechatmembers/enterpriseIntergralWithhold.vue

@@ -34,7 +34,7 @@
               <div slot="content">
                 <p>预扣积分到达“截止日期”，若还未确认扣除，系统将自动将这笔积分转为“可用”状态（无截止日期的预扣积分，系统不会主动变更积分状态）</p>
               </div>
-              <i class="iconfont icon-QuestionCircleOutlined icon"></i>
+              <i class="iconfont icon-QuestionCircleOutlined icon" style="font-size: 14px;"></i>
             </el-tooltip>
           </template>
           <template slot-scope="scope">

src/components/wechatmembers/integralDataPage.vue

 <template>
- <div class="integral-tab m20" >
+ <div class="integral-tab" >
   <el-tabs v-model="activeName">
     <el-tab-pane label="积分明细" name="first" >
       <p class="font14 tip-p">展示近两年的积分明细</p>