From 846debb8daecc4c5f09841d9153da249799fba3d Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Tue, 2 Dec 2025 15:27:51 +0800
Subject: [PATCH] =?UTF-8?q?test(=E5=9B=BE=E7=89=87=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD):=20=E7=BD=91=E7=BB=9C=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E3=80=81=E7=BB=93=E5=90=88=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E3=80=81=E6=87=92=E5=8A=A0=E8=BD=BD=E3=80=81=E9=A2=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD=E8=AF=95=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/itemCenter.vue                 |  85 +++++++++++++-
 src/config/imagePaths.js                      |   8 ++
 src/utils/imageCacheManager.js                |  33 ++++--
 src/utils/imagePreloader.js                   |  62 ++++------
 .../Activities/Oman/NationalDay/index.vue     | 108 +++++++++++-------
 5 files changed, 201 insertions(+), 95 deletions(-)
 create mode 100644 src/config/imagePaths.js

diff --git a/src/components/itemCenter.vue b/src/components/itemCenter.vue
index a814d88..de35e44 100644
--- a/src/components/itemCenter.vue
+++ b/src/components/itemCenter.vue
@@ -1,7 +1,26 @@
+<!-- src/components/itemCenter.vue -->
 <template>
-  <div style="position: relative; width: 100%">
+  <div style="position: relative; width: 100%" ref="containerRef">
     <!-- 背景图 -->
-    <img v-smart-img :src="imgUrl" :key="imgUrl" alt="" width="100%" style="display: block" />
+    <img
+      v-if="shouldShowImage"
+      v-smart-img
+      :src="imgUrl"
+      :key="imgUrl"
+      alt=""
+      width="100%"
+      style="display: block"
+    />
+    <div
+      v-else
+      class="placeholder"
+      :style="{
+        width: '100%',
+        height: '100%',
+        backgroundColor: '#f0f0f0',
+      }"
+    ></div>
+
     <!-- 内容 -->
     <div
       style="
@@ -19,18 +38,76 @@
 </template>
 
 <script setup>
+import { ref, onMounted, computed } from 'vue'
+
 const props = defineProps({
   imgUrl: {
     type: String,
     required: true,
   },
 
-  // 内容样式
   contentStyle: {
     type: String,
     default: '',
   },
+
+  // 是否启用懒加载
+  lazy: {
+    type: Boolean,
+    default: false,
+  },
+
+  // 是否立即显示（优先级高于lazy）
+  immediate: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+const containerRef = ref(null)
+const isVisible = ref(false)
+
+// 是否应该显示图片
+const shouldShowImage = computed(() => {
+  // 如果标记为立即显示或禁用懒加载，则直接显示
+  if (props.immediate || !props.lazy) {
+    return true
+  }
+
+  // 否则根据是否可见决定
+  return isVisible.value
+})
+
+// 创建交叉观察器
+const createObserver = () => {
+  if (!props.lazy || props.immediate) return
+
+  if (!containerRef.value) return
+
+  const observer = new IntersectionObserver(
+    (entries) => {
+      entries.forEach((entry) => {
+        if (entry.isIntersecting) {
+          isVisible.value = true
+          observer.unobserve(entry.target)
+        }
+      })
+    },
+    {
+      rootMargin: '100px', // 提前100px开始加载
+    }
+  )
+
+  observer.observe(containerRef.value)
+}
+
+onMounted(() => {
+  createObserver()
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.placeholder {
+  transition: opacity 0.3s ease;
+}
+</style>
diff --git a/src/config/imagePaths.js b/src/config/imagePaths.js
new file mode 100644
index 0000000..c1fd6d0
--- /dev/null
+++ b/src/config/imagePaths.js
@@ -0,0 +1,8 @@
+// src/config/imagePaths.js
+export const OSS_BASE_URL = 'https://tkm-likei.oss-ap-southeast-1.aliyuncs.com/h5/' // 阿里云oss
+// export const OMAN_NATIONAL_DAY_PATH = 'Activities/Oman/NationalDay/'// 文件路径
+
+// 组合使用示例
+export const getPngUrl = (imagePath, filename) => {
+  return `${OSS_BASE_URL}${imagePath}${filename}.png`
+}
diff --git a/src/utils/imageCacheManager.js b/src/utils/imageCacheManager.js
index bc18703..b027c56 100644
--- a/src/utils/imageCacheManager.js
+++ b/src/utils/imageCacheManager.js
@@ -13,6 +13,7 @@ class ImageCacheManager {
     await this.checkVersionAndUpdate()
   }
 
+  // 版本检查逻辑
   async checkVersionAndUpdate() {
     const cachedVersion = localStorage.getItem(this.cacheVersionKey)
 
@@ -91,6 +92,12 @@ class ImageCacheManager {
         return true
       }
 
+      // 新增：允许缓存特定域名下的资源
+      const ossBaseUrl = 'https://tkm-likei.oss-ap-southeast-1.aliyuncs.com/h5'
+      if (url.startsWith(ossBaseUrl)) {
+        return true
+      }
+
       return false
     } catch (error) {
       console.warn('判断资源类型时出错:', error)
@@ -172,16 +179,26 @@ class ImageCacheManager {
   }
 
   async loadImageFromNetwork(src, resolve, reject) {
-    const img = new Image()
-    img.onload = async () => {
-      resolve(img)
-      // 只有本地资源才缓存
-      if (this.isBuildAsset(src)) {
-        await this.cacheImage(src)
+    try {
+      const response = await fetch(src)
+      if (response.ok) {
+        const img = new Image()
+        img.onload = async () => {
+          resolve(img)
+          // 缓存带有 ETag 的响应
+          if (this.isBuildAsset(src)) {
+            const cache = await caches.open(this.cacheName)
+            await cache.put(src, response.clone())
+          }
+        }
+        img.onerror = reject
+        img.src = URL.createObjectURL(await response.blob())
+      } else {
+        reject(new Error(`HTTP ${response.status}`))
       }
+    } catch (error) {
+      reject(error)
     }
-    img.onerror = reject
-    img.src = src
   }
 }
 
diff --git a/src/utils/imagePreloader.js b/src/utils/imagePreloader.js
index fb770e1..f20dead 100644
--- a/src/utils/imagePreloader.js
+++ b/src/utils/imagePreloader.js
@@ -1,55 +1,33 @@
 // src/utils/imagePreloader.js
+import { imageCacheManager } from '@/utils/imageCacheManager'
 
-/**
- * 简单图片预加载函数
- * @param {Array|string|Object} sources - 图片源（数组、字符串或对象）
- */
-export const preloadImages = (sources) => {
+export const preloadImages = (sources, options = {}) => {
+  const { useSmartCache = false } = options
   let urls = []
 
   if (Array.isArray(sources)) {
     urls = sources
-  } else if (typeof sources === 'string') {
-    urls = [sources]
   } else if (typeof sources === 'object') {
     urls = Object.values(sources)
   }
 
-  urls.forEach((url) => {
-    const img = new Image()
-    img.src = url
-  })
+  if (useSmartCache) {
+    // 使用 SmartImage 缓存系统
+    urls.forEach((url) => {
+      if (imageCacheManager.isBuildAsset(url)) {
+        imageCacheManager.loadImage(url) // 触发缓存
+      } else {
+        const img = new Image()
+        img.src = url
+      }
+    })
+  } else {
+    // 使用浏览器默认缓存
+    urls.forEach((url) => {
+      const img = new Image()
+      img.src = url
+    })
+  }
 
   console.log(`开始预加载 ${urls.length} 张图片`)
 }
-
-/**
- * 带进度监控的图片预加载函数
- * @param {Array|string|Object} sources - 图片源
- * @param {Function} onProgress - 进度回调
- */
-export const preloadImagesWithProgress = (sources, onProgress) => {
-  let urls = []
-
-  if (Array.isArray(sources)) {
-    urls = sources
-  } else if (typeof sources === 'string') {
-    urls = [sources]
-  } else if (typeof sources === 'object') {
-    urls = Object.values(sources)
-  }
-
-  let loaded = 0
-  const total = urls.length
-
-  urls.forEach((url) => {
-    const img = new Image()
-    img.onload = img.onerror = () => {
-      loaded++
-      if (onProgress) {
-        onProgress({ loaded, total, url })
-      }
-    }
-    img.src = url
-  })
-}
diff --git a/src/views/Activities/Oman/NationalDay/index.vue b/src/views/Activities/Oman/NationalDay/index.vue
index 65c52d0..0a130e3 100644
--- a/src/views/Activities/Oman/NationalDay/index.vue
+++ b/src/views/Activities/Oman/NationalDay/index.vue
@@ -1,10 +1,10 @@
-<!-- src/views/Activities/heroesDay/index.vue -->
+<!-- src/views/Activities/Oman/NationalDay/index.vue -->
 <template>
   <div class="fullPage">
     <!-- 新增的背景图层 -->
     <div class="background-overlay"></div>
 
-    <div class="bg">
+    <div class="bg" :style="{ '--bg-url': `url(${imageUrl('bg')})` }">
       <!-- 状态栏占位区域（仅在APP中显示） -->
       <div v-if="isInAppEnvironment" style="height: 30px"></div>
 
@@ -23,25 +23,25 @@
       <!-- 倒计时 -->
       <div style="display: flex; justify-content: center; gap: 4px; margin-top: 1vw">
         <div style="width: 20%">
-          <itemCenter :imgUrl="images.timeDayBg">
+          <itemCenter :imgUrl="imageUrl('timeDayBg')">
             <div class="timeText" style="margin-bottom: 20%">{{ Days }}D</div>
           </itemCenter>
         </div>
         <div class="timeText timeGap" style="width: 6px"></div>
         <div style="width: 20%">
-          <itemCenter :imgUrl="images.timeHourBg">
+          <itemCenter :imgUrl="imageUrl('timeHourBg')">
             <div class="timeText" style="margin-bottom: 20%">{{ Hours }}</div>
           </itemCenter>
         </div>
         <div class="timeText timeGap">:</div>
         <div style="width: 20%">
-          <itemCenter :imgUrl="images.timeMinBg">
+          <itemCenter :imgUrl="imageUrl('timeMinBg')">
             <div class="timeText" style="margin-bottom: 20%">{{ Minutes }}</div>
           </itemCenter>
         </div>
         <div class="timeText timeGap">:</div>
         <div style="width: 20%">
-          <itemCenter :imgUrl="images.timeSecBg">
+          <itemCenter :imgUrl="imageUrl('timeSecBg')">
             <div class="timeText" style="margin-bottom: 20%">{{ Second }}</div>
           </itemCenter>
         </div>
@@ -49,21 +49,22 @@
 
       <!-- 每周礼物 -->
       <div style="display: flex; justify-content: center; margin-top: 10px">
-        <itemCenter :imgUrl="images.giftsBg" :contentStyle="'paddingTop: 10%;'">
+        <itemCenter :imgUrl="imageUrl('giftsBg')" :contentStyle="'paddingTop: 10%;'">
           <div style="width: 85%; display: flex; justify-content: space-around; margin-top: 10%">
             <div
               v-for="(gift, index) in gifts"
               :key="index"
               style="width: 30%; display: flex; flex-direction: column"
             >
-              <itemCenter :imgUrl="images.giftItemBg"
-                ><img
+              <itemCenter :imgUrl="imageUrl('giftItemBg')">
+                <img
                   v-smart-img
                   :src="gift.giftPhoto"
                   alt=""
                   width="70%"
                   style="display: block; object-fit: cover"
-              /></itemCenter>
+                />
+              </itemCenter>
               <div style="display: flex; justify-content: center; align-items: center; gap: 5px">
                 <img
                   v-smart-img
@@ -84,14 +85,14 @@
       <div style="display: flex; justify-content: space-around">
         <img
           v-smart-img
-          :src="rankingShow ? images.rankingBtActive : images.rankingBt"
+          :src="rankingShow ? imageUrl('rankingBtActive') : imageUrl('rankingBt')"
           alt=""
           style="display: block; width: 40%"
           @click="rankingShow = true"
         />
         <img
           v-smart-img
-          :src="!rankingShow ? images.rewardBtActive : images.rewardsBt"
+          :src="!rankingShow ? imageUrl('rewardBtActive') : imageUrl('rewardsBt')"
           alt=""
           style="display: block; width: 40%"
           @click="rankingShow = false"
@@ -113,12 +114,12 @@
           ></div>
           <div style="position: relative; z-index: 1">
             <!-- 前三名 -->
-            <itemCenter :imgUrl="images.RankingMain" :contentStyle="`padding: 25% 7% 10%`">
+            <itemCenter :imgUrl="imageUrl('RankingMain')" :contentStyle="`padding: 25% 7% 10%`">
               <div style="margin-top: 13%">
                 <!-- 第一 -->
                 <div style="display: flex; justify-content: center">
                   <TopUser
-                    :BorderImgUrl="images.topOne"
+                    :BorderImgUrl="imageUrl('topOne')"
                     :avatarUrl="RankingHasTop3[0].avatar"
                     :name="RankingHasTop3[0].nickname"
                     :distributionValue="RankingHasTop3[0].quantity"
@@ -131,7 +132,7 @@
                   <TopUser
                     :isTopOne="false"
                     ranking="2"
-                    :BorderImgUrl="images.topTwo"
+                    :BorderImgUrl="imageUrl('topTwo')"
                     :avatarUrl="RankingHasTop3[1].avatar"
                     :name="RankingHasTop3[1].nickname"
                     :distributionValue="RankingHasTop3[1].quantity"
@@ -141,7 +142,7 @@
                   <TopUser
                     :isTopOne="false"
                     ranking="3"
-                    :BorderImgUrl="images.topThree"
+                    :BorderImgUrl="imageUrl('topThree')"
                     :avatarUrl="RankingHasTop3[2].avatar"
                     :name="RankingHasTop3[2].nickname"
                     :distributionValue="RankingHasTop3[2].quantity"
@@ -156,8 +157,11 @@
             <div v-if="showRanking.length > 0" style="margin-bottom: 6vw; margin-top: -10vw">
               <itemCenter
                 v-for="listItem in showRanking"
-                :imgUrl="images.RankingItem"
+                :key="listItem.userId"
+                :imgUrl="imageUrl('RankingItem')"
                 :contentStyle="`padding: 0 10%`"
+                :lazy="true"
+                :immediate="index < 2"
                 @click="viewUserInfo(listItem.userId)"
               >
                 <div style="width: 75%; min-width: 0; display: flex; align-items: center">
@@ -223,7 +227,7 @@
             <!-- 底框 -->
             <img
               v-smart-img
-              :src="images.RankingBottomBorder"
+              :src="imageUrl('RankingBottomBorder')"
               alt=""
               width="100%"
               style="display: block; margin-top: -22vw; position: relative; z-index: 9"
@@ -250,7 +254,7 @@
                 :key="rewardIndex"
                 style="width: 100%"
               >
-                <itemCenter :imgUrl="images.giftItemBg">
+                <itemCenter :imgUrl="imageUrl('giftItemBg')">
                   <img
                     v-smart-img
                     :src="reward.cover || ''"
@@ -284,7 +288,7 @@
           background: linear-gradient(0deg, #6e1116 0%, #6e1116 100%), #d9d9d9;
           z-index: 2;
         "
-        :imgUrl="images.myRankingBg"
+        :imgUrl="imageUrl('myRankingBg')"
         :contentStyle="`padding: 2% 5% 0`"
       >
         <div
@@ -360,7 +364,7 @@
       <maskLayer :maskLayerShow="maskLayerShow" @click="maskLayerShow = false">
         <!-- help弹窗 -->
         <div style="margin: 20% 0" @click.stop>
-          <img v-smart-img :src="images.helpInfo" alt="" style="display: block; width: 100%" />
+          <img v-smart-img :src="imageUrl('helpInfo')" alt="" style="display: block; width: 100%" />
         </div>
       </maskLayer>
     </div>
@@ -368,28 +372,20 @@
 </template>
 
 <script setup>
-import { isInApp, viewUserInfo } from '@/utils/appBridge.js'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { isInApp, viewUserInfo } from '@/utils/appBridge.js'
+import { connectToApp } from '@/utils/appConnector.js'
+import { getPngUrl } from '@/config/imagePaths.js'
+import { preloadImages } from '@/utils/imagePreloader.js'
+
+import { getThisWeekRewardsAndGifts, getRankingListAndMyRanking } from '@/api/activity.js'
+
 import itemCenter from '@/components/itemCenter.vue'
 import TopUser from './components/topUser.vue'
 import maskLayer from '@/components/MaskLayer.vue'
-import { getThisWeekRewardsAndGifts, getRankingListAndMyRanking } from '@/api/activity.js'
-import { connectToApp } from '@/utils/appConnector.js'
 
-// vite动态批量导入图片
-const imageModules = import.meta.glob(
-  '@/assets/images/Activities/Oman/NationalDay/*.{png,jpg,svg}',
-  {
-    eager: true,
-  }
-)
-// 生成文件名映射对象（自动移除路径和扩展名）
-const images = Object.fromEntries(
-  Object.entries(imageModules).map(([path, module]) => {
-    const fileName = path.split('/').pop().split('.')[0]
-    return [fileName, module.default]
-  })
-)
+// 获取OSS图片URL的函数
+const imageUrl = (filename) => getPngUrl('Activities/Oman/NationalDay/', filename)
 
 const isInAppEnvironment = ref(false) // 检测是否在APP环境中
 const maskLayerShow = ref(false) //帮助模块
@@ -409,7 +405,7 @@ const myRanking = ref({}) // 我的排名
 const rewardsList = ref([]) // 奖励列表
 const gifts = ref([]) // 本周礼物
 
-const topImg = ref([images.top1RewardBg, images.top2RewardBg, images.top3RewardBg]) // top图片
+const topImg = ref([imageUrl('top1RewardBg'), imageUrl('top2RewardBg'), imageUrl('top3RewardBg')]) // top图片
 
 // 处理排行榜小于3人时的情况
 const RankingHasTop3 = computed(() => {
@@ -428,7 +424,6 @@ const RankingHasTop3 = computed(() => {
 // 展示用的榜单
 const showRanking = computed(() => {
   return Ranking.value.filter((_, index) => index >= 3)
-  // return []
 })
 
 // 奖励图片资源出错处理
@@ -522,11 +517,42 @@ const initData = () => {
   getRewardsAndGifts() //获取本周的礼物和奖励列表
 }
 
+// 预加载关键图片
+const preloadCriticalImages = () => {
+  const criticalImages = [
+    imageUrl('bg'),
+    imageUrl('timeDayBg'),
+    imageUrl('timeHourBg'),
+    imageUrl('timeMinBg'),
+    imageUrl('timeSecBg'),
+    imageUrl('giftsBg'),
+    imageUrl('giftItemBg'),
+    imageUrl('rankingBt'),
+    imageUrl('rankingBtActive'),
+    imageUrl('rewardBtActive'),
+    imageUrl('rewardsBt'),
+    imageUrl('RankingMain'),
+    imageUrl('topOne'),
+    imageUrl('topTwo'),
+    imageUrl('topThree'),
+    imageUrl('RankingItem'),
+    imageUrl('RankingBottomBorder'),
+    imageUrl('myRankingBg'),
+    imageUrl('helpInfo'),
+    imageUrl('top1RewardBg'),
+    imageUrl('top2RewardBg'),
+    imageUrl('top3RewardBg'),
+  ]
+
+  preloadImages(criticalImages, { useSmartCache: true })
+}
+
 // 使用工具函数连接APP
 const connectToAppHandler = async () => {
   await connectToApp(() => {
     // 连接成功回调
     initData() //初始化数据
+    preloadCriticalImages() //预加载关键图片
   })
 }
 
@@ -568,7 +594,7 @@ onUnmounted(() => {
 .bg {
   width: 100vw;
   min-height: 100vh;
-  background-image: url(../../../../assets/images/Activities/Oman/NationalDay/bg.png);
+  background-image: var(--bg-url);
   background-size: 100% auto;
   background-repeat: no-repeat;
   position: relative;