Merge branch 'aigc' of https://git.nianxx.cn/zoujing/YGChatCS into home3.0

src/pages-aigc/detail/detail.vue

@@ -32,6 +32,7 @@ import { onLoad, onShareAppMessage, onShow } from "@dcloudio/uni-app";
 import Privacy from "@/components/Privacy/index.vue";
 import AigcTopBar from "@/pages-aigc/components/AigcTopBar/index.vue";
 import { useCurrentCredit } from "@/pages-aigc/hooks/useCurrentCredit.js";
+import { getWechatLoginCode } from "@/pages-aigc/services/wechatLogin.js";
 import {
   createAigcGeneratorTask,
   createAigcGeneratorTaskShare,
@@ -535,9 +536,11 @@ const handleConfirmRegenerate = async () => {
   });
 
   try {
+    const wxLoginCode = await getWechatLoginCode();
     const res = await createAigcGeneratorTask({
       templateItemId,
       imageUrlList: [imageResultUrl],
+      wxLoginCode,
     });
     const nextTaskId = String(res?.data || "").trim();
 

src/pages-aigc/recharge/services/wechatVirtualPayment.js

@@ -3,6 +3,8 @@ import {
   normalizeWechatClientPlatform,
 } from "../utils/virtualRecharge.js";
 
+export { getWechatLoginCode } from "../../services/wechatLogin.js";
+
 const MIN_VIRTUAL_PAYMENT_SDK_VERSION = "2.19.2";
 
 const getWechatApi = () => {
@@ -65,26 +67,6 @@ export function getWechatClientPlatform(wechatApi = getWechatApi()) {
   return clientPlatform;
 }
 
-export function getWechatLoginCode(wechatApi = getWechatApi()) {
-  if (!wechatApi || typeof wechatApi.login !== "function") {
-    return Promise.reject(new Error("当前环境无法获取微信登录凭证"));
-  }
-
-  return new Promise((resolve, reject) => {
-    wechatApi.login({
-      success: (result) => {
-        const code = String(result?.code || "").trim();
-        if (code) {
-          resolve(code);
-          return;
-        }
-        reject(new Error("微信登录凭证获取失败"));
-      },
-      fail: () => reject(new Error("微信登录凭证获取失败")),
-    });
-  });
-}
-
 export function requestWechatVirtualPayment(paymentData, wechatApi = getWechatApi()) {
   assertWechatVirtualPaymentCapability(wechatApi);
   const order = normalizeVirtualPaymentOrder(paymentData);

src/pages-aigc/services/wechatLogin.js

@@ -0,0 +1,26 @@
+const getWechatApi = () => {
+  // #ifdef MP-WEIXIN
+  if (typeof wx !== "undefined") return wx;
+  // #endif
+  return null;
+};
+
+export function getWechatLoginCode(wechatApi = getWechatApi()) {
+  if (!wechatApi || typeof wechatApi.login !== "function") {
+    return Promise.reject(new Error("当前环境无法获取微信登录凭证"));
+  }
+
+  return new Promise((resolve, reject) => {
+    wechatApi.login({
+      success: (result) => {
+        const code = String(result?.code || "").trim();
+        if (code) {
+          resolve(code);
+          return;
+        }
+        reject(new Error("微信登录凭证获取失败"));
+      },
+      fail: () => reject(new Error("微信登录凭证获取失败")),
+    });
+  });
+}

src/pages-aigc/useTemplate/useTemplate.vue

@@ -46,6 +46,7 @@ import { onLoad, onShow } from "@dcloudio/uni-app";
 import Privacy from "@/components/Privacy/index.vue";
 import AigcTopBar from "@/pages-aigc/components/AigcTopBar/index.vue";
 import { useCurrentCredit } from "@/pages-aigc/hooks/useCurrentCredit.js";
+import { getWechatLoginCode } from "@/pages-aigc/services/wechatLogin.js";
 import {
   createAigcGeneratorTask,
   getAigcTemplateItemList,
@@ -356,9 +357,11 @@ const handleGenerate = async () => {
   });
 
   try {
+    const wxLoginCode = await getWechatLoginCode();
     const res = await createAigcGeneratorTask({
       templateItemId,
       imageUrlList: [uploadedImageUrl.value],
+      wxLoginCode,
     });
 
     const taskId = String(res?.data || "").trim();

src/request/api/AigcApi.js

@@ -17,7 +17,11 @@ function getAigcGeneratorTaskDetail(args) {
 }
 
 function createAigcGeneratorTask(args) {
-  return request.post("/hotelBiz/aigcGeneratorTask/createAigcGeneratorTask", args);
+  return request.post(
+    "/hotelBiz/aigcGeneratorTask/createAigcGeneratorTask",
+    args,
+    { sensitive: true }
+  );
 }
 
 function getCurrentCredit() {