api/appUser.js

@@ -234,16 +234,8 @@ export function redeemItemCardByPoints(user_id, item_card_id, quantity = 1) {
   return authRequest({ url: `/api/app/users/${user_id}/points/redeem-item-card`, method: 'POST', data: { item_card_id, quantity } })
 }
 
-export function getStoreItems(kind = 'product', page = 1, page_size = 20, filters = {}) {
+export function getStoreItems(kind = 'product', page = 1, page_size = 20) {
-  const data = { kind, page, page_size }
+  return authRequest({ url: '/api/app/store/items', method: 'GET', data: { kind, page, page_size } })
-  if (filters.keyword) data.keyword = filters.keyword
-  if (filters.price_min !== undefined && filters.price_min !== null && filters.price_min !== '') {
-    data.price_min = parseInt(filters.price_min)
-  }
-  if (filters.price_max !== undefined && filters.price_max !== null && filters.price_max !== '') {
-    data.price_max = parseInt(filters.price_max)
-  }
-  return authRequest({ url: '/api/app/store/items', method: 'GET', data })
 }
 
 export function getTasks(page = 1, page_size = 20) {

pages/mine/index.vue

@@ -776,10 +776,10 @@ export default {
       return String(v || '').trim()
     },
     formatPoints(v) {
-      // 后端已返回积分单位（分 * rate / 100），直接显示
       const n = Number(v) || 0
       if (n === 0) return '0.0'
-      return n.toFixed(1)
+      const f = n / 100
+      return f.toFixed(1)
     },
     copyInviteCode() {
       const code = this.getInviteCode()

pages/shop/index.vue

@@ -290,19 +290,7 @@ async function loadItems(append = false) {
   if (loading.value) return
   loading.value = true
   try {
-    // 构建筛选参数
+    const res = await getStoreItems(currentTab.value, page.value, pageSize)
-    const filters = {}
-    if (keyword.value && keyword.value.trim()) {
-      filters.keyword = keyword.value.trim()
-    }
-    if (priceMin.value !== '' && priceMin.value !== null) {
-      filters.price_min = priceMin.value
-    }
-    if (priceMax.value !== '' && priceMax.value !== null) {
-      filters.price_max = priceMax.value
-    }
-    
-    const res = await getStoreItems(currentTab.value, page.value, pageSize, filters)
     const list = res.list || res || []
     const total = res.total || 0
     const newItems = normalizeItems(list, currentTab.value)
@@ -313,12 +301,21 @@ async function loadItems(append = false) {
       allItems.value = newItems
     }
 
-    // 直接使用服务端返回的数据（已经过筛选）
+    // 根据返回的total计算总页数
-    items.value = allItems.value
-
-    // 检查是否还有更多数据
     const totalPages = Math.ceil(total / pageSize)
-    hasMore.value = page.value < totalPages
+
+    // 如果当前页小于总页数，继续加载下一页
+    if (page.value < totalPages) {
+      page.value++
+      // 递归加载下一页
+      loading.value = false // 临时释放loading状态，允许递归调用
+      await loadItems(true)
+    } else {
+      // 所有数据加载完成
+      hasMore.value = false
+    }
+
+    applyFilters()
   } catch (e) {
     console.error(e)
     hasMore.value = false
@@ -353,22 +350,14 @@ function applyFilters() {
 
 function applyPriceFilter() {
   activePriceRange.value = 'custom'
-  // 重新加载数据（服务端筛选）
+  applyFilters()
-  page.value = 1
-  hasMore.value = true
-  allItems.value = []
-  loadItems()
 }
 
 function resetPriceFilter() {
   priceMin.value = ''
   priceMax.value = ''
   activePriceRange.value = 'all'
-  // 重新加载数据
+  applyFilters()
-  page.value = 1
-  hasMore.value = true
-  allItems.value = []
-  loadItems()
 }
 
 function selectQuickPrice(range) {
@@ -383,24 +372,14 @@ function selectQuickPrice(range) {
   } else {
     priceMax.value = ''
   }
-  // 重新加载数据
+  applyFilters()
-  page.value = 1
-  hasMore.value = true
-  allItems.value = []
-  loadItems()
 }
 
 function isRangeActive(range) {
   return activePriceRange.value === range.key
 }
 
-function onSearchConfirm() {
+function onSearchConfirm() { applyFilters() }
-  // 搜索时重新加载数据
-  page.value = 1
-  hasMore.value = true
-  allItems.value = []
-  loadItems()
-}
 
 function onProductTap(p) {
   if (p.kind === 'product') {
@@ -479,11 +458,7 @@ onShow(() => {
 })
 
 onReachBottom(() => {
-  // 触底加载更多
+  // 所有数据已在页面加载时一次性请求完成，无需触底加载
-  if (hasMore.value && !loading.value) {
-    page.value++
-    loadItems(true)
-  }
 })
 
 watch(keyword, () => applyFilters())