优惠券修改

src/views/coupon_manage/add_coupon.vue

@@ -81,9 +81,9 @@
         </el-form-item>
         <el-form-item label="发放数量" prop="number" style="width: 100%;">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
-          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+          <!-- <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
-          </el-tooltip>
+          </el-tooltip> -->
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -97,7 +97,7 @@
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
         <el-form-item label="使用门槛" prop="fullAmount">
-          全额满<el-input v-model="form.fullAmount" oninput="value= value.replace(/[^\d|\.]/g, '')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
+          金额满<el-input v-model="form.fullAmount" oninput="value= value.replace(/[^\d|\.]/g, '')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
         </el-form-item>
         <el-form-item label="有效期类型" style="width: 100%;">
           <el-radio-group v-model="form.validityType">
@@ -158,9 +158,9 @@
         </el-form-item>
         <el-form-item label="发放数量" prop="number" style="width: 100%;">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
-          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+          <!-- <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
-          </el-tooltip>
+          </el-tooltip> -->
         </el-form-item>
         <el-form-item label="赠送商品" prop="products">
           <div>

src/views/coupon_manage/components/coupon_details.vue

@@ -91,7 +91,7 @@
       <div class="head-container">
         <el-pagination
           :total="tableData.total"
-          :current-page="tableData.page + 1"
+          :current-page="tableData.page"
           :page-size="tableData.size"
           layout="total, sizes, prev, pager, next, jumper"
           @current-change="paginationChange"
@@ -130,7 +130,7 @@ export default {
       resetQuery: null,
       tableData: {
         data: [],
-        page: 0,
+        page: 1,
         size: 10,
         loading: false,
         total: 0
@@ -146,7 +146,7 @@ export default {
      */
     async getTableData() {
       // eslint-disable-next-line no-unused-vars, prefer-const
-      console.log(this.couponId)
+      // console.log(this.couponId)
 
       // eslint-disable-next-line no-unused-vars, prefer-const
       let res = await queryReceive({
@@ -168,8 +168,13 @@ export default {
      * 时间选择监听
      */
     queryTimeChange(e) {
+      if (e) {
         this.query.startTime = e[0]
         this.query.endTime = e[1]
+      } else {
+        this.query.startTime = ''
+        this.query.endTime = ''
+      }
     },
 
     /**
@@ -200,7 +205,8 @@ export default {
     },
     // 分页回调
     paginationChange(e) {
-      this.tableData.page = e - 1
+      this.tableData.page = e
+      this.query.page = e
       this.getTableData()
     },
     /**