From 076455944eda20cad6a820fa66dafb3b2505a2f2 Mon Sep 17 00:00:00 2001
From: jacy-dukang <moonjie444@163.com>
Date: Sun, 12 Jul 2026 16:24:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(partner):=20=E4=BF=AE=E6=AD=A3=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E9=80=89=E5=9B=BE=20JSSDK=20=E7=AD=BE=E5=90=8D=20URL?=
 =?UTF-8?q?=20=E5=90=AB=20query=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

录店页 ?step= 变化时重新 wx.config，微信内上传仅走 chooseImage 接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../src/components/OssUploadField.tsx         | 53 +++++-----------
 packages/weixin-sdk/src/chooseImage.ts        |  1 +
 packages/weixin-sdk/src/jssdk.ts              | 60 ++++++++++---------
 .../src/modules/common/wechat.controller.ts   |  8 ++-
 4 files changed, 54 insertions(+), 68 deletions(-)

diff --git a/apps/h5-partner/src/components/OssUploadField.tsx b/apps/h5-partner/src/components/OssUploadField.tsx
index 84b6990..2e12feb 100644
--- a/apps/h5-partner/src/components/OssUploadField.tsx
+++ b/apps/h5-partner/src/components/OssUploadField.tsx
@@ -39,10 +39,6 @@ function formatWechatUploadError(e: unknown): string {
   return msg;
 }
 
-function shouldFallbackToNativePicker(msg: string): boolean {
-  return /permission|denied|接口未就绪|signature|JSSDK|签名校验|invalid signature|config:fail|未授权/i.test(msg);
-}
-
 function acceptsImages(accept: string) {
   return accept.includes('image');
 }
@@ -93,6 +89,7 @@ export default function OssUploadField({
 
   useEffect(() => {
     if (!useWechatPicker || needsAuth) return;
+    weixinSdk.reset();
     void weixinSdk.init().catch(() => {
       /* 点击上传时会再次初始化 */
     });
@@ -135,10 +132,6 @@ export default function OssUploadField({
     }
   }
 
-  function openNativeFilePicker() {
-    inputRef.current?.click();
-  }
-
   async function pickWechatImage() {
     setUploading(true);
     setError('');
@@ -150,21 +143,9 @@ export default function OssUploadField({
           count: 1,
           sourceType: ['album', 'camera'],
         });
-        if (!files) {
-          openNativeFilePicker();
-          return;
-        }
-        if (!files[0]) return;
+        if (!files?.[0]) return;
         await uploadSelectedFile(files[0]);
       });
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : '无法打开相册';
-      if (/cancel/i.test(msg)) return;
-      if (shouldFallbackToNativePicker(msg)) {
-        openNativeFilePicker();
-        return;
-      }
-      throw e;
     } finally {
       setUploading(false);
     }
@@ -186,16 +167,12 @@ export default function OssUploadField({
       } catch (e) {
         const msg = e instanceof Error ? e.message : '无法打开相册';
         if (/cancel/i.test(msg)) return;
-        if (shouldFallbackToNativePicker(msg)) {
-          openNativeFilePicker();
-          return;
-        }
         showUploadError(formatWechatUploadError(e));
       }
       return;
     }
 
-    openNativeFilePicker();
+    inputRef.current?.click();
   }
 
   const isImage = mediaType === 'IMAGE' && value;
@@ -225,17 +202,19 @@ export default function OssUploadField({
           </button>
         </div>
       )}
-      <input
-        ref={inputRef}
-        type="file"
-        accept={resolvedAccept}
-        className="partner-oss-upload-input"
-        disabled={busy}
-        onChange={(e) => {
-          const file = e.target.files?.[0];
-          if (file) void uploadSelectedFile(file);
-        }}
-      />
+      {!useWechatPicker && (
+        <input
+          ref={inputRef}
+          type="file"
+          accept={resolvedAccept}
+          className="partner-oss-upload-input"
+          disabled={busy}
+          onChange={(e) => {
+            const file = e.target.files?.[0];
+            if (file) void uploadSelectedFile(file);
+          }}
+        />
+      )}
       {isImage ? (
         <button {...triggerProps} className={`partner-upload-preview${wide ? ' partner-upload-preview--wide' : ''}`}>
           <img src={value} alt={label ?? '已上传'} />
diff --git a/packages/weixin-sdk/src/chooseImage.ts b/packages/weixin-sdk/src/chooseImage.ts
index cb8576d..fa13151 100644
--- a/packages/weixin-sdk/src/chooseImage.ts
+++ b/packages/weixin-sdk/src/chooseImage.ts
@@ -71,6 +71,7 @@ async function reportChooseImageEvent(
         sourceType: payload.sourceType,
         stage: payload.stage,
         pageUrl: typeof window !== 'undefined' ? normalizeJssdkPageUrl(window.location.href) : undefined,
+        signUrl: typeof window !== 'undefined' ? getJssdkSignUrl() : undefined,
       }),
     });
   } catch {
diff --git a/packages/weixin-sdk/src/jssdk.ts b/packages/weixin-sdk/src/jssdk.ts
index fb3893b..17dd21c 100644
--- a/packages/weixin-sdk/src/jssdk.ts
+++ b/packages/weixin-sdk/src/jssdk.ts
@@ -1,64 +1,66 @@
 import type { WechatJssdkConfig } from '@dukang/shared-types';
-import { isIosDevice, isWechatBrowser, isWechatDevTools } from './env';
+import { isWechatBrowser, isWechatDevTools } from './env';
 import { DEFAULT_JS_API_LIST } from './types';
 
 const JSSDK_URL = 'https://res.wx.qq.com/open/js/jweixin-1.6.0.js';
-const IOS_ENTRY_URL_KEY = 'dukang_wx_ios_entry_url';
+const SIGN_URL_CACHE_KEY = 'dukang_wx_sign_url_v2';
 
 let scriptPromise: Promise<void> | null = null;
 let configured = false;
 let configuredUrl: string | null = null;
 
-function pathnameOf(url: string): string {
-  try {
-    return new URL(url).pathname;
-  } catch {
-    return url.split('?')[0];
-  }
-}
-
 /** 清除 JSSDK 配置缓存（路由切换后须重新 wx.config） */
 export function resetJssdkConfig(): void {
   configured = false;
   configuredUrl = null;
 }
 
-/** 参与 JSSDK 签名的页面 URL（去掉 hash、query；SPA 步骤参数不参与签名） */
+/** 参与 JSSDK 签名的页面 URL：与微信文档一致，取 location.href 去掉 # 后的部分；剔除 OAuth 回调参数 */
 export function normalizeJssdkPageUrl(rawUrl: string): string {
   try {
     const url = new URL(rawUrl);
-    return `${url.origin}${url.pathname}`;
+    url.hash = '';
+    url.searchParams.delete('code');
+    url.searchParams.delete('state');
+    const query = url.searchParams.toString();
+    return `${url.origin}${url.pathname}${query ? `?${query}` : ''}`;
   } catch {
-    return rawUrl.split('#')[0].split('?')[0];
+    const noHash = rawUrl.split('#')[0];
+    try {
+      const url = new URL(noHash, typeof window !== 'undefined' ? window.location.origin : 'https://localhost');
+      url.searchParams.delete('code');
+      url.searchParams.delete('state');
+      const query = url.searchParams.toString();
+      return `${url.origin}${url.pathname}${query ? `?${query}` : ''}`;
+    } catch {
+      return noHash;
+    }
   }
 }
 
-/** iOS 微信内 SPA：同 pathname 内复用入口 URL；跨路由时更新入口并失效旧签名 */
+function signUrlChanged(prev: string | null, current: string): boolean {
+  return prev !== current;
+}
+
+/** 记录最近一次签名 URL；SPA 路由或 ?step= 变化时须重新 wx.config */
 export function captureIosJssdkEntryUrl(): void {
   if (typeof window === 'undefined') return;
-  if (!isIosDevice() || !isWechatBrowser() || isWechatDevTools()) return;
+  if (!isWechatBrowser() || isWechatDevTools()) return;
   const current = normalizeJssdkPageUrl(window.location.href);
-  const existing = sessionStorage.getItem(IOS_ENTRY_URL_KEY);
+  const existing = sessionStorage.getItem(SIGN_URL_CACHE_KEY);
   if (!existing) {
-    sessionStorage.setItem(IOS_ENTRY_URL_KEY, current);
+    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
     return;
   }
-  if (pathnameOf(existing) !== pathnameOf(current)) {
-    sessionStorage.setItem(IOS_ENTRY_URL_KEY, current);
+  if (signUrlChanged(existing, current)) {
+    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
     resetJssdkConfig();
   }
 }
 
-/** 获取参与 JSSDK 签名的 URL */
+/** 获取参与 JSSDK 签名的 URL（始终为当前页完整 URL，含 query） */
 export function getJssdkSignUrl(rawUrl?: string): string {
-  const current = normalizeJssdkPageUrl(rawUrl ?? (typeof window !== 'undefined' ? window.location.href : ''));
-  if (typeof window !== 'undefined' && isIosDevice() && isWechatBrowser() && !isWechatDevTools()) {
-    const entry = sessionStorage.getItem(IOS_ENTRY_URL_KEY);
-    if (entry && pathnameOf(entry) === pathnameOf(current)) {
-      return entry;
-    }
-  }
-  return current;
+  return normalizeJssdkPageUrl(rawUrl ?? (typeof window !== 'undefined' ? window.location.href : ''));
 }
 
 function isJssdkDebugEnabled(): boolean {
@@ -163,7 +165,7 @@ export async function ensureJssdkReady(options: {
 }): Promise<void> {
   captureIosJssdkEntryUrl();
   const pageUrl = options.url ?? getJssdkSignUrl();
-  if (configuredUrl && pathnameOf(configuredUrl) !== pathnameOf(pageUrl)) {
+  if (configuredUrl && signUrlChanged(configuredUrl, pageUrl)) {
     resetJssdkConfig();
   }
   if (!isJssdkReady()) {
diff --git a/server/dukang-api/src/modules/common/wechat.controller.ts b/server/dukang-api/src/modules/common/wechat.controller.ts
index 7a21a37..689603d 100644
--- a/server/dukang-api/src/modules/common/wechat.controller.ts
+++ b/server/dukang-api/src/modules/common/wechat.controller.ts
@@ -86,9 +86,13 @@ export class WechatController {
   private normalizeJssdkUrl(rawUrl: string): string {
     try {
       const parsed = new URL(rawUrl);
-      return `${parsed.origin}${parsed.pathname}`;
+      parsed.hash = '';
+      parsed.searchParams.delete('code');
+      parsed.searchParams.delete('state');
+      const query = parsed.searchParams.toString();
+      return `${parsed.origin}${parsed.pathname}${query ? `?${query}` : ''}`;
     } catch {
-      return rawUrl.split('#')[0].split('?')[0];
+      return rawUrl.split('#')[0];
     }
   }