perf :包含分页数据页面代码优化

pages/activity/seckill/list.vue

@@ -101,15 +101,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let couponList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: couponList,
         };
-      } else {
-        state.pagination = res.data;
-      }
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {

pages/app/score-shop.vue

@@ -48,15 +48,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let couponlist = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: couponlist,
         };
-      } else {
-        state.pagination = res.data;
-      }
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {

pages/commission/team.vue

@@ -131,16 +131,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
-
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {

pages/coupon/detail.vue

@@ -144,6 +144,13 @@
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
   import _ from 'lodash';
+
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     list: {},
     couponId: 0,
@@ -182,12 +189,7 @@
   });
 
   function onTabsChange(e) {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
+    state.pagination = pagination;
     state.currentTab = e.index;
     state.categoryId = e.value;
     getGoodsList(state.categoryId);
@@ -201,15 +203,11 @@
       is_category_deep: false,
     });
     if (res.error === 0) {
-      if (page >= 2) {
-        let couponlist = _.concat(state.pagination.data, res.data.data);
-        state.pagination = {
-          ...res.data,
-          data: couponlist,
-        };
-      } else {
-        state.pagination = res.data;
-      }
+      let couponlist = _.concat(state.pagination.data, res.data.data);
+      state.pagination = {
+        ...res.data,
+        data: couponlist,
+      };
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {
@@ -234,6 +232,7 @@
     data.items_value.forEach((i) => {
       state.tabMaps.push({ name: i.name, value: i.id });
     });
+    state.pagination = pagination
     getGoodsList(state.tabMaps[0].value);
   }
   // 加载更多

pages/coupon/list.vue

@@ -91,6 +91,12 @@
   import { computed, reactive } from 'vue';
   import _ from 'lodash';
 
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   // 数据
   const state = reactive({
     currentTab: 0,
@@ -123,12 +129,7 @@
     },
   ];
   function onTabsChange(e) {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
+    state.pagination = pagination
     state.currentTab = e.index;
     state.type = e.value;
     if (state.currentTab == 0) {
@@ -141,15 +142,11 @@
     state.loadStatus = 'loading';
     const res = await sheep.$api.coupon.list({ list_rows, page });
     if (res.error === 0) {
-      if (page >= 2) {
-        let couponlist = _.concat(state.pagination.data, res.data.data);
-        state.pagination = {
-          ...res.data,
-          data: couponlist,
-        };
-      } else {
-        state.pagination = res.data;
-      }
+      let couponlist = _.concat(state.pagination.data, res.data.data);
+      state.pagination = {
+        ...res.data,
+        data: couponlist,
+      };
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {
@@ -189,6 +186,7 @@
         title: msg,
       });
       setTimeout(() => {
+        state.pagination = pagination
         getData();
       }, 1000);
     }

pages/goods/comment/list.vue

@@ -30,6 +30,13 @@
   import { computed, reactive } from 'vue';
   import _ from 'lodash';
   import commentItem from '../components/detail/comment-item.vue';
+
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     list: [],
     type: [],
@@ -45,12 +52,7 @@
   });
   // 切换选项卡
   function onTabsChange(e) {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
+    state.pagination = pagination
     state.currentTab = e.index;
     state.code = e.code;
     getList(state.commentId, e.code);
@@ -69,15 +71,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {

pages/goods/list.vue

@@ -124,6 +124,12 @@
   const sys_navBar = sheep.$platform.navbar;
   const emits = defineEmits(['close', 'change']);
 
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     pagination: {
       data: [],
@@ -198,12 +204,7 @@
   }
 
   function emptyList() {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
+    state.pagination = pagination
     state.leftGoodsList = [];
     state.rightGoodsList = [];
     count = 0;
@@ -256,15 +257,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let couponList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: couponList,
         };
-      } else {
-        state.pagination = res.data;
-      }
       mountMasonry();
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';

pages/order/aftersale/list.vue

@@ -75,6 +75,12 @@
   import { computed, reactive } from 'vue';
   import _ from 'lodash';
 
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     currentTab: 0,
     showApply: false,
@@ -111,12 +117,7 @@
   ];
   // 切换选项卡
   function onTabsChange(e) {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
+    state.pagination = pagination
     state.currentTab = e.index;
     getOrderList();
   }
@@ -130,15 +131,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
 
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
@@ -156,6 +153,7 @@
         if (res.confirm) {
           const { error } = await sheep.$api.order.aftersale.cancel(orderId);
           if (error === 0) {
+            state.pagination = pagination
             getOrderList();
           }
         }
@@ -171,6 +169,7 @@
         if (res.confirm) {
           const { error } = await sheep.$api.order.aftersale.delete(orderId);
           if (error === 0) {
+            state.pagination = pagination
             getOrderList();
           }
         }

pages/user/goods-collect.vue

@@ -105,7 +105,14 @@
   import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import _ from 'lodash';
+
   const sys_navBar = sheep.$platform.navbar;
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     pagination: {
       data: [],
@@ -126,15 +133,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {
@@ -178,6 +181,7 @@
         state.editMode = false;
         state.selectedCollectList = [];
         state.selectAll = false;
+        state.pagination = pagination
         getData();
       }
     }

pages/user/goods-log.vue

@@ -85,7 +85,7 @@
               class="ss-reset-button ui-BG-Main-Gradient pay-btn ss-font-28 ui-Shadow-Main"
               @tap="onCancel"
             >
-              取消收藏
+              删除足迹
             </button>
           </view>
         </view>
@@ -114,6 +114,12 @@
   import _ from 'lodash';
 
   const sys_navBar = sheep.$platform.navbar;
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   const state = reactive({
     pagination: {
       data: [],
@@ -134,15 +140,11 @@
       page,
     });
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {
@@ -188,6 +190,7 @@
         state.editMode = false;
         state.selectedCollectList = [];
         state.selectAll = false;
+        state.pagination = pagination
         getData();
       }
     }