@hlw-uni/mp-vue 2.0.9 → 2.1.11

package/dist/composables/ad/index.d.ts

@@ -62,7 +62,7 @@ export declare function useAd(): {
     loadConfig: (force?: boolean) => Promise<void>;
     getUnitId: (type: AdType) => string;
     showReward: (onClose?: ((res: AdCloseResult) => void | Promise<void>) | undefined) => Promise<void>;
-    showPopup: () => Promise<boolean>;
+    showPopup: (delayMs?: number) => Promise<boolean>;
     confirm: typeof confirmModal;
 };
 /**

package/dist/composables/navigator/index.d.ts

@@ -15,12 +15,12 @@ export interface NavigateOptions {
     onFail?: (errMsg: string) => void;
     /** 是否禁用默认的 Toast 错误提示，默认 false */
     silent?: boolean;
-    /** 仅 miniprogram：目标小程序的页面路径（如 pages/index/index?id=1），留空则打开首页 */
-    path?: string;
+    /** 仅 miniprogram：目标小程序的页面路径（如 pages/index/index?id=1），留空/null 则打开首页 */
+    path?: string | null;
     /** 仅 miniprogram：目标小程序版本，默认 release */
     envVersion?: "develop" | "trial" | "release";
     /** 仅 miniprogram：传给目标小程序的额外数据，对方从 onLaunch/onShow 读取 */
-    extraData?: Record<string, unknown>;
+    extraData?: Record<string, unknown> | null;
 }
 /**
  * 根据 type + value 调用对应的 uni API，屏蔽参数差异。

package/dist/index.js

@@ -630,6 +630,7 @@ var __publicField = (obj, key, value) => {
     }
     return raw;
   }
+  const DEFAULT_POPUP_DELAY_MS = 3e3;
   const EMPTY = {
     banner_unit_id: "",
     grid_unit_id: "",
@@ -686,7 +687,6 @@ var __publicField = (obj, key, value) => {
       return store.config[`${type}_unit_id`] || "";
     }
     async function showReward(onClose) {
-      await loadConfig2();
       const unitId = getUnitId("reward");
       if (!unitId) {
         msg().toast("激励广告未配置");
@@ -700,12 +700,19 @@ var __publicField = (obj, key, value) => {
       if (onClose)
         await onClose(closeRes);
     }
-    async function showPopup() {
-      await loadConfig2();
-      const unitId = getUnitId("popup");
-      if (!unitId)
-        return false;
-      return await showInterstitialAd(unitId);
+    function showPopup(delayMs = DEFAULT_POPUP_DELAY_MS) {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          loadConfig2().then(() => {
+            const unitId = getUnitId("popup");
+            if (!unitId) {
+              resolve(false);
+              return;
+            }
+            showInterstitialAd(unitId).then(resolve);
+          });
+        }, delayMs);
+      });
     }
     return {
       // 状态
@@ -1115,7 +1122,7 @@ var __publicField = (obj, key, value) => {
           appId: value,
           path: options.path || "",
           envVersion: options.envVersion,
-          extraData: options.extraData,
+          extraData: options.extraData ?? void 0,
           fail
         });
         break;

package/dist/index.mjs

@@ -629,6 +629,7 @@ function unwrapPayload(raw) {
   }
   return raw;
 }
+const DEFAULT_POPUP_DELAY_MS = 3e3;
 const EMPTY = {
   banner_unit_id: "",
   grid_unit_id: "",
@@ -685,7 +686,6 @@ function useAd() {
     return store.config[`${type}_unit_id`] || "";
   }
   async function showReward(onClose) {
-    await loadConfig2();
     const unitId = getUnitId("reward");
     if (!unitId) {
       msg().toast("激励广告未配置");
@@ -699,12 +699,19 @@ function useAd() {
     if (onClose)
       await onClose(closeRes);
   }
-  async function showPopup() {
-    await loadConfig2();
-    const unitId = getUnitId("popup");
-    if (!unitId)
-      return false;
-    return await showInterstitialAd(unitId);
+  function showPopup(delayMs = DEFAULT_POPUP_DELAY_MS) {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        loadConfig2().then(() => {
+          const unitId = getUnitId("popup");
+          if (!unitId) {
+            resolve(false);
+            return;
+          }
+          showInterstitialAd(unitId).then(resolve);
+        });
+      }, delayMs);
+    });
   }
   return {
     // 状态
@@ -1114,7 +1121,7 @@ function doNavigate(type, value, options = {}) {
         appId: value,
         path: options.path || "",
         envVersion: options.envVersion,
-        extraData: options.extraData,
+        extraData: options.extraData ?? void 0,
         fail
       });
       break;

package/package.json

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

package/src/composables/ad/index.ts

@@ -47,6 +47,9 @@ import { ref } from "vue";
 import { useMsg, type HlwMsg } from "../msg";
 import { unwrapPayload, type AdapterPayload } from "../_internal/unwrap";
 
+/** showPopup 默认延迟（ms）：避免一进页面就弹打扰用户 */
+const DEFAULT_POPUP_DELAY_MS = 3000;
+
 /** 6 种广告类型 */
 export type AdType = "banner" | "grid" | "custom" | "video" | "reward" | "popup";
 
@@ -184,7 +187,6 @@ 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("激励广告未配置");
@@ -202,11 +204,28 @@ 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);
+    /**
+     * 显示插屏广告，默认延迟 3000ms 避免一进页面就弹打扰；传 0 立即弹。
+     * @returns true=展示成功；false=配置缺失 / show 失败（如近期已展示过）
+     *
+     * 实现注意：用 setTimeout + .then() 串接而非 async/await，保持 WX 插屏
+     * ad.show() 的调用栈跟 setTimeout 回调一致 —— 小程序引擎对插屏的合法
+     * 触发时机敏感，async/await 多插的 microtask 会被判为"非合法触发"导致
+     * 静默不弹。
+     */
+    function showPopup(delayMs: number = DEFAULT_POPUP_DELAY_MS): Promise<boolean> {
+        return new Promise<boolean>((resolve) => {
+            setTimeout(() => {
+                loadConfig().then(() => {
+                    const unitId = getUnitId("popup");
+                    if (!unitId) {
+                        resolve(false);
+                        return;
+                    }
+                    showInterstitialAd(unitId).then(resolve);
+                });
+            }, delayMs);
+        });
     }
 
     return {

package/src/composables/navigator/index.ts

@@ -24,12 +24,12 @@ export interface NavigateOptions {
     onFail?: (errMsg: string) => void;
     /** 是否禁用默认的 Toast 错误提示，默认 false */
     silent?: boolean;
-    /** 仅 miniprogram：目标小程序的页面路径（如 pages/index/index?id=1），留空则打开首页 */
-    path?: string;
+    /** 仅 miniprogram：目标小程序的页面路径（如 pages/index/index?id=1），留空/null 则打开首页 */
+    path?: string | null;
     /** 仅 miniprogram：目标小程序版本，默认 release */
     envVersion?: "develop" | "trial" | "release";
     /** 仅 miniprogram：传给目标小程序的额外数据，对方从 onLaunch/onShow 读取 */
-    extraData?: Record<string, unknown>;
+    extraData?: Record<string, unknown> | null;
 }
 
 /**
@@ -78,7 +78,7 @@ function doNavigate(type: NavigateType, value: string, options: NavigateOptions
                 appId: value,
                 path: options.path || "",
                 envVersion: options.envVersion,
-                extraData: options.extraData,
+                extraData: options.extraData ?? undefined,
                 fail,
             });
             break;