Explorar o código

取消价格计算中向上进一的算法

ext.liuqiwen3 hai 1 mes
pai
achega
0b60bb4dee

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 681 - 589
pages/users/login/index.vue


+ 24 - 15
pages/users/user_goods_collection/index.vue

@@ -114,7 +114,7 @@ const collectProductList = computed(() => {
     const totalLaborCost = Number(product.totalLaborCost);
     const additionalAmount = Number(product.additionalAmount);
     const totalPrice = (totalLaborCost+additionalAmount).toFixed(2);
-    console.log('totalPrice',totalPrice)
+
     return {
       ...product,
       calculatedTotal: formattedTotal, // 新增计算结果字段
@@ -235,19 +235,24 @@ const get_user_collect_product = async () => {
     const collectProductListData = res.data.list;
     const isLoadend = collectProductListData.length < limit;
 
-    collectList.value = Util.SplitArray(collectProductListData, collectProductList.value);
-
-    if (collectList.value.length === 0) {
-      // get_host_product();
+    // 重置逻辑优化
+    if (page.value === 1) {
+      // 第一页,清空原数组
+      collectList.value = [...collectProductListData];
+    } else {
+      // 后续分页,追加数据
+      collectList.value = [...collectList.value, ...collectProductListData];
     }
 
     loadend.value = isLoadend;
-    console.log(isLoadend)
     loadTitle.value = isLoadend ? '我是有底线的' : '加载更多';
-    console.log(loadTitle.value)
     page.value++;
+
   } catch (err) {
     console.error(err);
+    if (page.value === 1) {
+      collectList.value = [];
+    }
   } finally {
     loading.value = false;
   }
@@ -299,6 +304,18 @@ const get_host_product = async () => {
 
 // 页面加载
 onLoad(() => {
+  // if (isLogin) {
+  //   loadend.value = false;
+  //   page.value = 1;
+  //   collectProductList.value = [];
+  //   get_user_collect_product();
+  // } else {
+  //   // toLogin();
+  // }
+});
+
+// 页面显示
+onShow(() => {
   if (isLogin) {
     loadend.value = false;
     page.value = 1;
@@ -309,14 +326,6 @@ onLoad(() => {
   }
 });
 
-// 页面显示
-onShow(() => {
-  loadend.value = false;
-  page.value = 1;
-  collectProductList.value = [];
-  get_user_collect_product();
-});
-
 // 页面上拉触底
 onReachBottom(() => {
   get_user_collect_product();

BIN=BIN
static/images/select-active@2x.png


BIN=BIN
static/images/select@2x.png