领取上限未达到可以一直领取

pages/coupon/list.vue

@@ -120,7 +120,7 @@
   }
 
   // 获得优惠劵模版列表
-  async function getData() {
+  async function getData(id) {
     state.loadStatus = 'loading';
     const { data, code } = await CouponApi.getCouponTemplatePage({
       pageNo: state.pagination.pageNo,
@@ -129,8 +129,8 @@
     if (code !== 0) {
       return;
     }
-    // state.pagination.list = _.concat(state.pagination.list, data.list);
-    state.pagination.list = data.list
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    // state.pagination.list = data.list
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
@@ -146,8 +146,8 @@
     if (code !== 0) {
       return;
     }
-    // state.pagination.list = _.concat(state.pagination.list, data.list);
-    state.pagination.list = data.list
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    // state.pagination.list = data.list
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
@@ -180,27 +180,27 @@
     }
   }
 
-  // onLoad((Option) => {
-  //   // 领劵中心
-  //   if (Option.type === 'all' || !Option.type) {
-  //     getData();
-  //     // 我的优惠劵
-  //   } else {
-  //     Option.type === 'geted'
-  //       ? (state.currentTab = 1)
-  //       : Option.type === 'used'
-  //       ? (state.currentTab = 2)
-  //       : (state.currentTab = 3);
-  //     state.type = state.currentTab;
-  //     getCoupon();
-  //   }
-  // });
+  onLoad((Option) => {
+    // 领劵中心
+    if (Option.type === 'all' || !Option.type) {
+      getData();
+      // 我的优惠劵
+    } else {
+      Option.type === 'geted'
+        ? (state.currentTab = 1)
+        : Option.type === 'used'
+        ? (state.currentTab = 2)
+        : (state.currentTab = 3);
+      state.type = state.currentTab;
+      getCoupon();
+    }
+  });
 
-  onShow(() => {
-    state.type = 0
-    state.currentTab = 0
-    getData()
-  })
+  // onShow(() => {
+  //   state.type = 0
+  //   state.currentTab = 0
+  //   getData()
+  // })
 
   onReachBottom(() => {
     loadMore();