@hlw-uni/mp-vue 2.0.6 → 2.0.8

package/dist/index.js

@@ -639,6 +639,7 @@ var __publicField = (obj, key, value) => {
     popup_unit_id: ""
   };
   let adapter$1 = null;
+  let pending$1 = null;
   function setConfigAd(a) {
     adapter$1 = a;
   }
@@ -657,24 +658,35 @@ var __publicField = (obj, key, value) => {
     async function loadConfig2(force = false) {
       if (loaded.value && !force)
         return;
+      if (pending$1 && !force)
+        return pending$1;
       if (!(adapter$1 == null ? void 0 : adapter$1.getConfig)) {
         console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
         return;
       }
-      try {
-        const cfg = unwrapPayload(await adapter$1.getConfig());
-        if (cfg) {
-          store.config = cfg;
-          store.loaded = true;
+      const fn = adapter$1.getConfig;
+      const flight = (async () => {
+        try {
+          const cfg = unwrapPayload(await fn());
+          if (cfg) {
+            store.config = cfg;
+            store.loaded = true;
+          }
+        } catch (e) {
+          console.warn("[useAd] load config failed", e);
+        } finally {
+          if (pending$1 === flight)
+            pending$1 = null;
         }
-      } catch (e) {
-        console.warn("[useAd] load config failed", e);
-      }
+      })();
+      pending$1 = flight;
+      return flight;
     }
     function getUnitId(type) {
       return store.config[`${type}_unit_id`] || "";
     }
     async function showReward(onClose) {
+      await loadConfig2();
       const unitId = getUnitId("reward");
       if (!unitId) {
         msg().toast("激励广告未配置");
@@ -689,6 +701,7 @@ var __publicField = (obj, key, value) => {
         await onClose(closeRes);
     }
     async function showPopup() {
+      await loadConfig2();
       const unitId = getUnitId("popup");
       if (!unitId)
         return false;
@@ -802,6 +815,11 @@ var __publicField = (obj, key, value) => {
       var _a;
       let ad = interstitialCache.get(unitId);
       if (!ad) {
+        if (typeof uni.createInterstitialAd !== "function") {
+          console.warn("[useAd] 当前基础库不支持插屏广告");
+          resolve(false);
+          return;
+        }
         ad = uni.createInterstitialAd({ adUnitId: unitId });
         if (!ad) {
           resolve(false);
@@ -812,12 +830,9 @@ var __publicField = (obj, key, value) => {
         });
         interstitialCache.set(unitId, ad);
       }
-      ad.show().then(() => resolve(true)).catch(() => {
-        if (typeof ad.load !== "function") {
-          resolve(false);
-          return;
-        }
-        ad.load().then(() => ad.show()).then(() => resolve(true)).catch(() => resolve(false));
+      ad.show().then(() => resolve(true)).catch((err) => {
+        console.warn(`[useAd] popup show error (${unitId})`, err);
+        resolve(false);
       });
     });
   }

package/dist/index.mjs

@@ -638,6 +638,7 @@ const EMPTY = {
   popup_unit_id: ""
 };
 let adapter$1 = null;
+let pending$1 = null;
 function setConfigAd(a) {
   adapter$1 = a;
 }
@@ -656,24 +657,35 @@ function useAd() {
   async function loadConfig2(force = false) {
     if (loaded.value && !force)
       return;
+    if (pending$1 && !force)
+      return pending$1;
     if (!(adapter$1 == null ? void 0 : adapter$1.getConfig)) {
       console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
       return;
     }
-    try {
-      const cfg = unwrapPayload(await adapter$1.getConfig());
-      if (cfg) {
-        store.config = cfg;
-        store.loaded = true;
+    const fn = adapter$1.getConfig;
+    const flight = (async () => {
+      try {
+        const cfg = unwrapPayload(await fn());
+        if (cfg) {
+          store.config = cfg;
+          store.loaded = true;
+        }
+      } catch (e) {
+        console.warn("[useAd] load config failed", e);
+      } finally {
+        if (pending$1 === flight)
+          pending$1 = null;
       }
-    } catch (e) {
-      console.warn("[useAd] load config failed", e);
-    }
+    })();
+    pending$1 = flight;
+    return flight;
   }
   function getUnitId(type) {
     return store.config[`${type}_unit_id`] || "";
   }
   async function showReward(onClose) {
+    await loadConfig2();
     const unitId = getUnitId("reward");
     if (!unitId) {
       msg().toast("激励广告未配置");
@@ -688,6 +700,7 @@ function useAd() {
       await onClose(closeRes);
   }
   async function showPopup() {
+    await loadConfig2();
     const unitId = getUnitId("popup");
     if (!unitId)
       return false;
@@ -801,6 +814,11 @@ function showInterstitialAd(unitId) {
     var _a;
     let ad = interstitialCache.get(unitId);
     if (!ad) {
+      if (typeof uni.createInterstitialAd !== "function") {
+        console.warn("[useAd] 当前基础库不支持插屏广告");
+        resolve(false);
+        return;
+      }
       ad = uni.createInterstitialAd({ adUnitId: unitId });
       if (!ad) {
         resolve(false);
@@ -811,12 +829,9 @@ function showInterstitialAd(unitId) {
       });
       interstitialCache.set(unitId, ad);
     }
-    ad.show().then(() => resolve(true)).catch(() => {
-      if (typeof ad.load !== "function") {
-        resolve(false);
-        return;
-      }
-      ad.load().then(() => ad.show()).then(() => resolve(true)).catch(() => resolve(false));
+    ad.show().then(() => resolve(true)).catch((err) => {
+      console.warn(`[useAd] popup show error (${unitId})`, err);
+      resolve(false);
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.0.6",
+    "version": "2.0.8",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/components/hlw-notice-popup/index.vue

@@ -0,0 +1,238 @@
+<template>
+    <view v-if="mounted" class="hlw-notice-mask" :class="{ 'hlw-notice-mask--in': visible }" @tap.self>
+        <view class="hlw-notice-card" :class="{ 'hlw-notice-card--in': visible }" @tap.stop>
+            <view class="hlw-notice-head">
+                <view class="hlw-notice-icon" :style="{ background: iconTint }">
+                    <view class="hlw-notice-icon-i" :class="iconClass" :style="{ color: iconColor }" />
+                </view>
+                <text class="hlw-notice-title">{{ title }}</text>
+            </view>
+
+            <scroll-view
+                class="hlw-notice-body"
+                scroll-y
+                :show-scrollbar="false"
+                :enhanced="true"
+            >
+                <rich-text class="hlw-notice-text" :nodes="contentNodes" />
+            </scroll-view>
+
+            <view
+                class="hlw-notice-btn"
+                :style="{ background: iconColor }"
+                hover-class="hlw-notice-btn--hover"
+                @tap="onConfirm"
+            >
+                <text class="hlw-notice-btn-text">{{ confirmText }}</text>
+            </view>
+
+            <view
+                v-if="showCancel"
+                class="hlw-notice-dismiss"
+                hover-class="hlw-notice-dismiss--hover"
+                @tap="onCancel"
+            >
+                <text class="hlw-notice-dismiss-text">{{ cancelText }}</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from "vue";
+
+interface Props {
+    show?: boolean;
+    title?: string;
+    /** 内容：HTML 原样渲染，纯文本自动 \n -> <br/> */
+    content?: string;
+    /** iconify class，例：i-fa6-solid-bell */
+    iconClass?: string;
+    /** 图标 + 主按钮颜色 */
+    iconColor?: string;
+    /** 图标背景色 */
+    iconTint?: string;
+    confirmText?: string;
+    cancelText?: string;
+    showCancel?: boolean;
+    /** 进出场动画时长（ms），需与 CSS transition 一致 */
+    animMs?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    show: false,
+    title: "",
+    content: "",
+    iconClass: "i-fa6-solid-bell",
+    iconColor: "#1C1C1E",
+    iconTint: "#F2F2F7",
+    confirmText: "我知道了",
+    cancelText: "稍后再看",
+    showCancel: false,
+    animMs: 260,
+});
+
+const emit = defineEmits<{ confirm: []; cancel: [] }>();
+
+const mounted = ref(false);
+const visible = ref(false);
+let timer: ReturnType<typeof setTimeout> | null = null;
+
+const contentNodes = computed(() => {
+    const raw = props.content;
+    return /<[a-z][\s\S]*>/i.test(raw) ? raw : raw.replace(/\n/g, "<br/>");
+});
+
+watch(
+    () => props.show,
+    async (next) => {
+        if (timer) {
+            clearTimeout(timer);
+            timer = null;
+        }
+        if (next) {
+            mounted.value = true;
+            await nextTick();
+            visible.value = true;
+        } else {
+            visible.value = false;
+            timer = setTimeout(() => {
+                mounted.value = false;
+                timer = null;
+            }, props.animMs);
+        }
+    },
+    { immediate: true },
+);
+
+function onConfirm() {
+    emit("confirm");
+}
+
+function onCancel() {
+    emit("cancel");
+}
+</script>
+
+<style lang="scss" scoped>
+.hlw-notice-mask {
+    position: fixed;
+    inset: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 40rpx;
+    background: rgba(0, 0, 0, 0);
+    transition: background 0.25s ease-out;
+
+    &--in {
+        background: rgba(0, 0, 0, 0.4);
+    }
+}
+
+.hlw-notice-card {
+    width: 100%;
+    max-width: 540rpx;
+    background: var(--surface-card, #ffffff);
+    border-radius: var(--radius-xl, 36rpx);
+    padding: 40rpx 36rpx 32rpx;
+    box-shadow: 0 40rpx 80rpx rgba(0, 0, 0, 0.1);
+    transform: scale(0.92);
+    opacity: 0;
+    transition: transform 0.28s cubic-bezier(0.34, 1.2, 0.64, 1), opacity 0.22s ease-out;
+
+    &--in {
+        transform: scale(1);
+        opacity: 1;
+    }
+}
+
+.hlw-notice-head {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 14rpx;
+    margin-bottom: 24rpx;
+}
+
+.hlw-notice-icon {
+    width: 48rpx;
+    height: 48rpx;
+    border-radius: var(--radius-sm, 12rpx);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+}
+
+.hlw-notice-icon-i {
+    font-size: 24rpx;
+}
+
+.hlw-notice-title {
+    font-size: var(--font-md, 30rpx);
+    font-weight: 700;
+    color: var(--text-primary, #1c1c1e);
+    line-height: 1.3;
+    word-break: break-word;
+}
+
+.hlw-notice-body {
+    width: 100%;
+    max-height: 560rpx;
+    margin-bottom: 36rpx;
+    padding-right: 6rpx;
+}
+
+.hlw-notice-text {
+    display: block;
+    font-size: var(--font-sm, 26rpx);
+    line-height: 1.65;
+    color: var(--text-secondary, #5c5c5e);
+    text-align: left;
+    white-space: pre-wrap;
+    word-break: break-word;
+}
+
+.hlw-notice-btn {
+    width: 100%;
+    padding: 22rpx 0;
+    border-radius: 9999rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.06);
+    transition: transform 0.15s ease-out, filter 0.15s ease-out;
+
+    &--hover {
+        transform: scale(0.97);
+        filter: brightness(0.92);
+    }
+}
+
+.hlw-notice-btn-text {
+    color: #ffffff;
+    font-size: var(--font-base, 28rpx);
+    font-weight: 600;
+    letter-spacing: 1rpx;
+}
+
+.hlw-notice-dismiss {
+    margin-top: 16rpx;
+    padding: 10rpx 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &--hover {
+        opacity: 0.5;
+    }
+}
+
+.hlw-notice-dismiss-text {
+    font-size: var(--font-xs, 24rpx);
+    color: var(--text-muted, #8e8e93);
+    font-weight: 500;
+}
+</style>

package/src/composables/ad/index.ts

@@ -99,6 +99,9 @@ const EMPTY: AdConfig = {
 
 let adapter: AdAdapter | null = null;
 
+/** 进行中的 loadConfig promise；并发调用时复用，避免冷启动多发请求 */
+let pending: Promise<void> | null = null;
+
 /**
  * 注入业务回调，应用启动时调用一次。
  * 不调用也不会崩，但 loadConfig / showReward 会无效。
@@ -136,22 +139,33 @@ export function useAd() {
     const store = useAdStore();
     const { config, loaded } = storeToRefs(store);
 
-    /** 拉取广告配置（小程序冷启动后调一次即可） */
+    /**
+     * 拉取广告配置（小程序冷启动后调一次即可）。
+     * 并发调用复用同一次请求；`force=true` 跳过 loaded/pending 短路重新拉。
+     */
     async function loadConfig(force = false): Promise<void> {
         if (loaded.value && !force) return;
+        if (pending && !force) return pending;
         if (!adapter?.getConfig) {
             console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
             return;
         }
-        try {
-            const cfg = unwrapPayload(await adapter.getConfig());
-            if (cfg) {
-                store.config = cfg;
-                store.loaded = true;
+        const fn = adapter.getConfig;
+        const flight = (async () => {
+            try {
+                const cfg = unwrapPayload(await fn());
+                if (cfg) {
+                    store.config = cfg;
+                    store.loaded = true;
+                }
+            } catch (e) {
+                console.warn("[useAd] load config failed", e);
+            } finally {
+                if (pending === flight) pending = null;
             }
-        } catch (e) {
-            console.warn("[useAd] load config failed", e);
-        }
+        })();
+        pending = flight;
+        return flight;
     }
 
     /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用） */
@@ -170,6 +184,7 @@ export function useAd() {
      * @param onClose 关闭回调；不传则只播。retry / toast / 发奖全在业务侧自己写。
      */
     async function showReward(onClose?: (res: AdCloseResult) => void | Promise<void>): Promise<void> {
+        await loadConfig();
         const unitId = getUnitId("reward");
         if (!unitId) {
             msg().toast("激励广告未配置");
@@ -188,6 +203,7 @@ export function useAd() {
      * @returns true=展示成功；false=配置缺失 / show 失败（如近期已展示过）
      */
     async function showPopup(): Promise<boolean> {
+        await loadConfig();
         const unitId = getUnitId("popup");
         if (!unitId) return false;
         return await showInterstitialAd(unitId);
@@ -316,11 +332,17 @@ function showRewardedAd(unitId: string, hooks?: { onShown?: () => void }): Promi
     });
 }
 
-/** 底层插屏广告包装：show 失败兜底 load → 再 show */
+/** 底层插屏广告包装：实例按 unitId 缓存复用，show 失败 console.warn 不重试（频控/网络等失败重试也救不了） */
 function showInterstitialAd(unitId: string): Promise<boolean> {
     return new Promise((resolve) => {
         let ad: any = interstitialCache.get(unitId);
         if (!ad) {
+            // 老基础库可能没有这个 API（对应官方 if (wx.createInterstitialAd)）
+            if (typeof uni.createInterstitialAd !== "function") {
+                console.warn("[useAd] 当前基础库不支持插屏广告");
+                resolve(false);
+                return;
+            }
             ad = uni.createInterstitialAd({ adUnitId: unitId });
             if (!ad) { resolve(false); return; }
             ad.onError?.((err: AdError) => {
@@ -328,15 +350,11 @@ function showInterstitialAd(unitId: string): Promise<boolean> {
             });
             interstitialCache.set(unitId, ad);
         }
-
         ad.show()
             .then(() => resolve(true))
-            .catch(() => {
-                if (typeof ad.load !== "function") { resolve(false); return; }
-                ad.load()
-                    .then(() => ad.show())
-                    .then(() => resolve(true))
-                    .catch(() => resolve(false));
+            .catch((err: any) => {
+                console.warn(`[useAd] popup show error (${unitId})`, err);
+                resolve(false);
             });
     });
 }