diff --git a/pages/avatar/index.vue b/pages/avatar/index.vue
index 5aa8d1a..7d3c30a 100644
--- a/pages/avatar/index.vue
+++ b/pages/avatar/index.vue
@@ -728,30 +728,36 @@ const completeCardInfo = async (id) => {
   return imageUrl;
 };
 
-onShareAppMessage(async () => {
+onShareAppMessage(async (options) => {
   getShareReward({ scene: "avatar_download" });
-  if (!isLoggedIn.value) {
+  if (options.from === "button") {
+    if (!isLoggedIn.value) {
+      loginPopupRef.value.open();
+      return;
+    }
+    uni.showLoading({ title: "分享中...", mask: true });
+    const id = createAvatarId();
+    const [shareToken, imageUrl] = await Promise.all([
+      getShareToken("avatar_download", id),
+      completeCardInfo(id),
+    ]);
+    uni.hideLoading();
+    return {
+      title: "3 秒生成新春专属头像，真的好看😆",
+      path: `/pages/avatar/detail?shareToken=${shareToken}`,
+      imageUrl:
+        imageUrl +
+        "?imageMogr2/thumbnail/!500x400r/gravity/Center/crop/500x400",
+    };
+  } else {
     const shareToken = await getShareToken("avatar_download_not_login", "");
     return {
-      title: "新春祝福",
-      path: `/pages/index/index?shareToken=${shareToken}`,
+      title: "3 秒生成新春专属头像，真的好看😆",
+      path: `/pages/avatar/index?shareToken=${shareToken}`,
       imageUrl:
         "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png",
     };
   }
-  uni.showLoading({ title: "分享中...", mask: true });
-  const id = createAvatarId();
-  const [shareToken, imageUrl] = await Promise.all([
-    getShareToken("avatar_download", id),
-    completeCardInfo(id),
-  ]);
-  uni.hideLoading();
-  return {
-    title: "我做了一个新头像，真的太好看了",
-    path: `/pages/avatar/detail?shareToken=${shareToken}`,
-    imageUrl:
-      imageUrl + "?imageMogr2/thumbnail/!500x400r/gravity/Center/crop/500x400",
-  };
 });
 
 onShareTimeline(async () => {
diff --git a/pages/make/index.vue b/pages/make/index.vue
index 706b23e..29fb05d 100644
--- a/pages/make/index.vue
+++ b/pages/make/index.vue
@@ -994,18 +994,12 @@ const onPanelScrollToLower = () => {
 };
 
 onShareAppMessage(async (options) => {
-  if (!isLoggedIn.value) {
-    const shareToken = await getShareToken("card_generate_not_login", "");
-    return {
-      title: "快来制作新春祝福卡片🎉",
-      path: "/pages/make/index?shareToken=" + shareToken,
-      imageUrl:
-        "https://file.lihailezzc.com/resource/8dd026d76ef7a63d123b7fd698fb989b.png",
-    };
-  }
-
   getShareReward({ scene: "card_generate" });
   if (options.from === "button") {
+    if (!isLoggedIn.value) {
+      loginPopupRef.value.open();
+      return;
+    }
     // 1. 确保有 cardId (如果内容有变动，最好是新建)
     const id = createCard();