fix:增加小程序客服

fix(mini-user): address review blockers
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:24:53 +08:00 · 2026-07-21 13:03:02 +08:00 · 2026-07-21 11:41:06 +08:00 · 2026-07-21 11:18:51 +08:00 · 2026-07-21 10:51:23 +08:00 · 2026-07-21 10:41:17 +08:00
41 changed files with 1050 additions and 1075 deletions
@@ -15,3 +15,4 @@ coverage/
 server/dukang-api/prisma/migrations/
 debug_v3.xlsx
 ~$debug_v3.xlsx
+deploy/auto-release.env
@@ -1,5 +1,5 @@
 import { Navigate, useLocation } from 'react-router-dom';
-import { getPartnerProfile, hasPartnerWxSession } from '../lib/api';
+import { getPartnerProfile } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';

@@ -18,10 +18,6 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
  }

  if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
-    const profile = getPartnerProfile();
-    if (profile && hasPartnerWxSession() && profile.hasWechat) {
-      return <Navigate to="/login?quick=1" replace state={{ from: location }} />;
-    }
    return <Navigate to="/login" replace state={{ from: location }} />;
  }

@@ -1,17 +1,7 @@
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { uploadFileToOss, type OssMediaType } from '../lib/upload';
 import { enqueueUpload } from '../lib/upload-lock';
-import {
-  authorizePartnerWechat,
-  fetchClientConfig,
-  fetchPartnerProfile,
-  needsWechatAuth,
-  type PartnerProfile,
-} from '../lib/wechat-auth';
-import { formatChooseImageFailMessage } from '@dukang/weixin-sdk';
-import { isWechatEnv, weixinSdk } from '../lib/weixin';
 import { toastError } from '../lib/toast';
-import type { ClientRuntimeConfig } from '@dukang/shared-types';

 type OssUploadFieldProps = {
  value?: string;
@@ -22,27 +12,10 @@ type OssUploadFieldProps = {
  wide?: boolean;
  compact?: boolean;
  label?: string;
-  /** 父级已确认微信授权时可跳过检查 */
-  wechatReady?: boolean;
-  onWechatReadyChange?: (ready: boolean) => void;
 };

 const DEFAULT_MAX_MB = 10;

-function formatWechatUploadError(e: unknown): string {
-  const msg = e instanceof Error ? e.message : '无法打开相册';
-  const formatted = formatChooseImageFailMessage(msg);
-  if (formatted) return formatted;
-  if (/invalid signature/i.test(msg)) {
-    return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名，并刷新页面后重试';
-  }
-  return msg;
-}
-
-function acceptsImages(accept: string) {
-  return accept.includes('image');
-}
-
 export default function OssUploadField({
  value,
  onChange,
@@ -52,15 +25,10 @@ export default function OssUploadField({
  wide,
  compact,
  label,
-  wechatReady,
-  onWechatReadyChange,
 }: OssUploadFieldProps) {
  const inputRef = useRef<HTMLInputElement>(null);
  const [uploading, setUploading] = useState(false);
-  const [authorizing, setAuthorizing] = useState(false);
  const [error, setError] = useState('');
-  const [profile, setProfile] = useState<PartnerProfile | null>(null);
-  const [clientConfig, setClientConfig] = useState<ClientRuntimeConfig | null>(null);

  function showUploadError(text: string) {
    setError(text);
@@ -69,35 +37,6 @@ export default function OssUploadField({

  const resolvedAccept =
    accept ?? (mediaType === 'VIDEO' ? 'video/*' : mediaType === 'FILE' ? 'image/*,.pdf' : 'image/*');
-  const inWechat = isWechatEnv();
-  const useWechatPicker =
-    inWechat && (mediaType === 'IMAGE' || (mediaType === 'FILE' && acceptsImages(resolvedAccept)));
-  const needsAuth = useWechatPicker && needsWechatAuth(profile, clientConfig) && wechatReady !== true;
-  const onWechatReadyChangeRef = useRef(onWechatReadyChange);
-  onWechatReadyChangeRef.current = onWechatReadyChange;
-
-  useEffect(() => {
-    if (!useWechatPicker) return;
-    void fetchClientConfig()
-      .then(setClientConfig)
-      .catch(() => {
-        /* 未登录等场景由上传接口报错 */
-      });
-    if (wechatReady === true) return;
-    void fetchPartnerProfile()
-      .then(setProfile)
-      .catch(() => {
-        /* 未登录等场景由上传接口报错 */
-      });
-  }, [useWechatPicker, wechatReady]);
-
-  useEffect(() => {
-    if (!useWechatPicker || needsAuth) return;
-    weixinSdk.reset();
-    void weixinSdk.init().catch(() => {
-      /* 点击上传时会再次初始化 */
-    });
-  }, [useWechatPicker, needsAuth]);

  async function persistUpload(file: File) {
    if (!file.size) {
@@ -125,112 +64,38 @@ export default function OssUploadField({
    }
  }

-  async function startWechatAuth() {
-    setAuthorizing(true);
+  function pickFile() {
+    if (uploading) return;
    setError('');
-    try {
-      const result = await authorizePartnerWechat();
-      if (result) {
-        const me = await fetchPartnerProfile();
-        setProfile(me);
-        if (me.hasWechat) onWechatReadyChangeRef.current?.(true);
-      }
-    } catch (e) {
-      const text = e instanceof Error ? e.message : '微信授权失败';
-      showUploadError(text);
-    } finally {
-      setAuthorizing(false);
-    }
-  }
-
-  async function pickWechatImage() {
-    setUploading(true);
-    setError('');
-    try {
-      weixinSdk.reset();
-      await weixinSdk.init();
-      // 选图 + 上传须在同一个队列任务内完成，避免嵌套 enqueueUpload 死锁
-      await enqueueUpload(async () => {
-        const files = await weixinSdk.chooseImages({
-          count: 1,
-          sourceType: ['album', 'camera'],
-        });
-        if (!files?.[0]) return;
-        await persistUpload(files[0]);
-      });
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : '无法打开相册';
-      if (/cancel/i.test(msg)) return;
-      showUploadError(formatWechatUploadError(e));
-    } finally {
-      setUploading(false);
-    }
-  }
-
-  async function pickFile() {
-    if (uploading || authorizing) return;
-    setError('');
-
-    if (useWechatPicker && needsAuth) {
-      const text = '请先完成微信授权后再上传照片';
-      showUploadError(text);
-      return;
-    }
-
-    if (useWechatPicker) {
-      try {
-        await pickWechatImage();
-      } catch (e) {
-        const msg = e instanceof Error ? e.message : '无法打开相册';
-        if (/cancel/i.test(msg)) return;
-        showUploadError(formatWechatUploadError(e));
-      }
-      return;
-    }
-
    inputRef.current?.click();
  }

  const isImage = mediaType === 'IMAGE' && value;
  const isFile = mediaType === 'FILE' && value;
-  const busy = uploading || authorizing;
-  const pickerLabel = label ?? (useWechatPicker ? '拍照 / 从相册选择' : '点击上传');
+  const busy = uploading;
+  const pickerLabel = label ?? (mediaType === 'IMAGE' ? '从系统相册选择' : '点击上传');

  const triggerProps = {
    type: 'button' as const,
-    disabled: busy || needsAuth,
-    onClick: () => void pickFile(),
+    disabled: busy,
+    onClick: pickFile,
  };

  return (
    <div className="partner-oss-upload">
-      {needsAuth && (
-        <div className="partner-wechat-auth-hint" role="status">
-          <p className="body-md">上传照片需先完成微信授权绑定</p>
-          <button
-            type="button"
-            className="partner-btn-outline"
-            style={{ marginTop: 8, width: '100%' }}
-            disabled={authorizing}
-            onClick={() => void startWechatAuth()}
-          >
-            {authorizing ? '跳转授权中…' : '微信授权绑定'}
-          </button>
-        </div>
-      )}
-      {!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);
-          }}
-        />
-      )}
+      <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 ?? '已上传'} />
@@ -255,10 +120,10 @@ export default function OssUploadField({
          className={`partner-upload-dashed${wide ? ' partner-upload-dashed--wide' : ''}${compact ? ' partner-upload-dashed--compact' : ''}`}
        >
          <span className="material-symbols-outlined text-primary" style={{ fontSize: compact ? 28 : 36 }}>
-            {busy ? 'hourglass_top' : 'add_a_photo'}
+            {busy ? 'hourglass_top' : 'photo_library'}
          </span>
          <span className="text-primary" style={{ fontWeight: 500 }}>
-            {uploading ? '上传中…' : needsAuth ? '请先微信授权' : pickerLabel}
+            {uploading ? '上传中…' : pickerLabel}
          </span>
        </button>
      )}
@@ -12,7 +12,7 @@ const PARTNER_PROFILE = 'partnerProfile';
 const SESSION_EXPIRES_AT = 'partnerSessionExpiresAt';
 export const PARTNER_WX_BOUND = 'partnerWxBound';

-/** 微信验证通过后的免登录时长 */
+/** 手机号或微信验证通过后的免登录时长 */
 export const PARTNER_SESSION_TTL_MS = 7 * 24 * 60 * 60 * 1000;

 const AUTH_RECOVERY_EXEMPT_PATHS = [
@@ -77,7 +77,7 @@ export function isPartnerSessionExpired() {
 }

 export function touchPartnerSession() {
-  if (!hasPartnerWxSession()) return;
+  if (!localStorage.getItem(REFRESH_TOKEN)) return;
  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
 }

@@ -90,11 +90,16 @@ export function saveAuth(data: PartnerSessionPayload) {
  }
 }

+/** 手机号验证成功后写入 7 天免验证码会话 */
+export function saveRememberedSession(data: PartnerSessionPayload) {
+  saveAuth(data);
+  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
+}
+
 /** 微信登录/绑定成功后写入 7 天免登录 session */
 export function saveWechatSession(data: PartnerSessionPayload) {
-  saveAuth(data);
+  saveRememberedSession(data);
  localStorage.setItem(PARTNER_WX_BOUND, '1');
-  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
 }

 export function clearAuth(options?: { keepProfile?: boolean }) {
@@ -1,25 +1,14 @@
-import { useEffect, useRef, useState, type RefObject } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
-import { isWxAuthorizeEnabled } from '@dukang/shared-types';
-import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
+import { useRef, useState, type RefObject } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
 import {
  getLastPhone,
  getPartnerProfile,
-  hasPartnerWxSession,
  request,
-  saveAuth,
+  saveRememberedSession,
  type PartnerSessionPayload,
 } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
-import {
-  bindPartnerWechatAfterSmsLogin,
-  canPartnerUseWechatLogin,
-  fetchClientConfig,
-  loginPartnerWithWechat,
-  PARTNER_WECHAT_LOGIN_HINT,
-} from '../lib/wechat-auth';
-import { isWechatEnv } from '../lib/weixin';

 const REMEMBER_PHONE_KEY = 'partner_remember_phone';
 const REMEMBER_FLAG_KEY = 'partner_remember_account';
@@ -31,7 +20,7 @@ function AgreementCheckbox({
 }: {
  agreed: boolean;
  onChange: (next: boolean) => void;
-  inputRef?: RefObject<HTMLLabelElement | null>;
+  inputRef?: RefObject<HTMLLabelElement>;
 }) {
  return (
    <label className="partner-checkbox-row partner-checkbox-row--agreement" ref={inputRef}>
@@ -50,11 +39,6 @@ function AgreementCheckbox({
  );
 }

-function maskPhone(phone: string) {
-  if (phone.length < 7) return phone;
-  return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
-}
-
 function loadRememberedPhone(): { phone: string; remember: boolean } {
  try {
    const remember = localStorage.getItem(REMEMBER_FLAG_KEY) === '1';
@@ -76,19 +60,9 @@ function formatPartnerError(e: unknown): string {
  return text;
 }

-function formatWechatError(e: unknown): string {
-  const text = e instanceof Error ? e.message : '微信登录失败';
-  if (text.includes('首次登录') || text.includes('手机验证码')) {
-    return '该微信尚未绑定合伙人账号，请先使用手机验证码登录，登录后将自动关联微信';
-  }
-  return text;
-}
-
 export default function LoginPage() {
  const navigate = useNavigate();
  const { applySession, refresh, account } = usePartnerSession();
-  const [params] = useSearchParams();
-  const quick = params.get('quick') === '1';
  const savedProfile = getPartnerProfile();
  const remembered = loadRememberedPhone();
  const [phone, setPhone] = useState(remembered.phone || getLastPhone());
@@ -96,22 +70,10 @@ export default function LoginPage() {
  const [rememberAccount, setRememberAccount] = useState(remembered.remember);
  const [agreed, setAgreed] = useState(false);
  const [loading, setLoading] = useState(false);
-  const [wxLoading, setWxLoading] = useState(false);
  const [msg, setMsg] = useState('');
  const [codeCooldown, setCodeCooldown] = useState(0);
-  const [wxAuthorize, setWxAuthorize] = useState(false);
  const agreementRef = useRef<HTMLLabelElement>(null);

-  useEffect(() => {
-    fetchClientConfig()
-      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
-      .catch(() => setWxAuthorize(false));
-  }, []);
-
-  const quickName = savedProfile?.name ?? '城市合伙人';
-  const quickCompany = savedProfile?.companyName ?? '';
-  const quickPhone = savedProfile?.phone || phone;
-
  function ensureAgreed() {
    if (!agreed) {
      setMsg('请先勾选并同意用户协议');
@@ -175,14 +137,9 @@ export default function LoginPage() {
        body: JSON.stringify({ phone, code }),
        silent: true,
      });
-      saveAuth(data);
+      saveRememberedSession(data);
      applySession(data);
      persistRememberAccount(phone);
-      if (isWechatEnv() && wxAuthorize) {
-        setMsg('登录成功，正在关联微信…');
-        await bindPartnerWechatAfterSmsLogin();
-        return;
-      }
      await finishLoginNavigate();
    } catch (e) {
      setMsg(formatPartnerError(e));
@@ -191,116 +148,6 @@ export default function LoginPage() {
    }
  }

-  async function wechatLogin() {
-    if (!ensureAgreed()) return;
-    setMsg('');
-    if (!isWechatEnv()) {
-      setMsg(WECHAT_INAPP_REQUIRED_MSG);
-      return;
-    }
-    const canUseWechat = await canPartnerUseWechatLogin({
-      profile: savedProfile,
-      phone,
-    });
-    if (!canUseWechat) {
-      setMsg(PARTNER_WECHAT_LOGIN_HINT);
-      return;
-    }
-    setWxLoading(true);
-    try {
-      const session = await loginPartnerWithWechat();
-      if (session) {
-        applySession(session);
-        await finishLoginNavigate();
-      }
-    } catch (e) {
-      setMsg(formatWechatError(e));
-    } finally {
-      setWxLoading(false);
-    }
-  }
-
-  if (quick) {
-    const canWechatQuick =
-      wxAuthorize &&
-      isWechatEnv() &&
-      hasPartnerWxSession() &&
-      !!savedProfile &&
-      savedProfile.hasWechat === true;
-
-    return (
-      <div className="partner-auth-page partner-auth-page--quick">
-        <header className="partner-auth-brand">
-          <div className="partner-quick-avatar" style={{ width: 120, height: 120, margin: '0 auto 16px' }}>
-            <span className="material-symbols-outlined" style={{ fontSize: 48 }}>wine_bar</span>
-          </div>
-          <h1 className="partner-auth-title" style={{ fontSize: 20 }}>杜康好客</h1>
-          <p className="partner-auth-subtitle" style={{ fontSize: 12, letterSpacing: '0.2em', textTransform: 'uppercase' }}>城市合伙人端</p>
-        </header>
-
-        <section className="partner-glass-card">
-          <div className="partner-quick-badge">已识别账号</div>
-          <div className="partner-quick-avatar">
-            <span className="material-symbols-outlined">person</span>
-          </div>
-          <div style={{ textAlign: 'center' }}>
-            <h2 className="headline-md">
-              {quickName}
-              {quickCompany ? (
-                <span className="text-muted body-md" style={{ fontWeight: 400 }}> ({quickCompany})</span>
-              ) : null}
-            </h2>
-            <p className="text-muted body-md" style={{ letterSpacing: '0.1em', marginTop: 4 }}>
-              {quickPhone ? maskPhone(quickPhone) : '暂无已保存账号'}
-            </p>
-          </div>
-        </section>
-
-        <nav style={{ width: '100%', maxWidth: 384, marginTop: 16 }}>
-          {msg && <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center', marginBottom: 12 }}>{msg}</p>}
-          <AgreementCheckbox
-            agreed={agreed}
-            onChange={setAgreed}
-            inputRef={agreementRef}
-          />
-          {canWechatQuick ? (
-            <button
-              type="button"
-              className="partner-btn-primary"
-              style={{ marginTop: 16 }}
-              disabled={wxLoading}
-              onClick={() => void wechatLogin()}
-            >
-              <span className="material-symbols-outlined">chat</span>
-              <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-            </button>
-          ) : (
-            <p className="partner-auth-msg" style={{ textAlign: 'center', marginTop: 12, marginBottom: 12 }}>
-              {wxAuthorize && !isWechatEnv()
-                ? '请在微信内打开以使用一键登录'
-                : '请使用验证码登录并绑定微信后，即可 7 天内免登录'}
-            </p>
-          )}
-          {!canWechatQuick && (
-            <Link to="/login" className="partner-btn-primary" style={{ display: 'block', textAlign: 'center', textDecoration: 'none', marginTop: 12 }}>
-              验证码登录
-            </Link>
-          )}
-          <Link to="/login" className="partner-btn-ghost" style={{ display: 'block', marginTop: 12 }}>切换账号</Link>
-        </nav>
-
-        <footer className="partner-auth-footer">
-          <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
-            <span className="material-symbols-outlined">verified_user</span>
-            <span className="label-md" style={{ fontSize: 10, letterSpacing: '0.1em', textTransform: 'uppercase' }}>
-              {canWechatQuick ? '微信验证 · 7 天内免登录' : 'Secured by Dukang Heritage'}
-            </span>
-          </div>
-        </footer>
-      </div>
-    );
-  }
-
  return (
    <div className="partner-auth-page">
      <div className="partner-auth-brand">
@@ -367,25 +214,12 @@ export default function LoginPage() {
            <span>{loading ? '登录中...' : '登录'}</span>
            {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
          </button>
-
-          {wxAuthorize && (
-            <>
-              <div className="partner-auth-divider"><span>其他登录方式</span></div>
-              <button type="button" className="partner-btn-wechat" onClick={() => void wechatLogin()} disabled={wxLoading}>
-                <svg viewBox="0 0 24 24" fill="#07C160" aria-hidden>
-                  <path d="M8.25 4.5C4.52 4.5 1.5 7.04 1.5 10.17c0 1.78.98 3.37 2.5 4.48l-.63 1.88 2.19-1.09c.84.24 1.74.38 2.69.38.25 0 .5 0 .75-.03-.16-.53-.25-1.09-.25-1.66 0-3.13 3.02-5.67 6.75-5.67.57 0 1.13.06 1.66.17C15.17 6.13 12 4.5 8.25 4.5zm10.5 6.33c-3.11 0-5.62 2.12-5.62 4.73 0 2.61 2.51 4.73 5.62 4.73.79 0 1.54-.14 2.24-.38l1.83.91-.53-1.57c1.27-.92 2.08-2.25 2.08-3.73 0-2.61-2.51-4.73-5.62-4.73z" />
-                </svg>
-                <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-              </button>
-            </>
-          )}
+          <p className="partner-auth-msg" style={{ textAlign: 'center' }}>
+            手机号验证成功后，7 天内无需再次输入验证码
+          </p>
        </div>
      </main>

-      {hasPartnerWxSession() && savedProfile?.hasWechat && (
-        <Link to="/login?quick=1" className="partner-link">微信快捷登录</Link>
-      )}
-
      <footer className="partner-auth-footer">
        <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
          <span className="material-symbols-outlined">verified_user</span>
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';

 import { useNavigate, useSearchParams } from 'react-router-dom';

@@ -17,8 +17,6 @@ import { checkStorePhoneAvailable, sendStorePhoneSms } from '../lib/storePhone';

 import { fetchPartnerCities, type OpenCityOption } from '../lib/upload';

-import { isWechatEnv, weixinSdk } from '../lib/weixin';
-
 import { usePartnerSession } from '../contexts/PartnerSessionContext';

 import {
@@ -79,16 +77,10 @@ export default function StoreCreatePage() {

  const navigate = useNavigate();

-  const { account, refresh } = usePartnerSession();
+  const { account } = usePartnerSession();

  const accountId = account?.id;

-  const wechatReady = !!account?.hasWechat;
-
-  const handleWechatReadyChange = useCallback(() => {
-    void refresh();
-  }, [refresh]);
-
  const [params, setParams] = useSearchParams();

  const saved = loadStoreDraft(accountId);
@@ -142,17 +134,6 @@ export default function StoreCreatePage() {



-  useEffect(() => {
-    if (step !== 2 || !isWechatEnv()) return;
-    void refresh();
-    weixinSdk.reset();
-    void weixinSdk.init().catch(() => {
-      /* OssUploadField 点击时会再次初始化 */
-    });
-  }, [step, refresh]);
-
-
-
  useEffect(() => {

    void fetchPartnerCities()
@@ -895,13 +876,9 @@ export default function StoreCreatePage() {

              value={form.coverUrl}

-              wechatReady={wechatReady}
-
-              onWechatReadyChange={handleWechatReadyChange}
-
              onChange={(coverUrl) => patchForm({ coverUrl })}

-              label="点击或拖拽上传"
+              label="从系统相册选择"

            />

@@ -931,10 +908,6 @@ export default function StoreCreatePage() {

                  value={url}

-                  wechatReady={wechatReady}
-
-                  onWechatReadyChange={handleWechatReadyChange}
-
                  onChange={(nextUrl) => patchEnvPhotoUrl(index, nextUrl)}

                />
@@ -951,7 +924,7 @@ export default function StoreCreatePage() {

            <h3 className="headline-md">签约合同 <span className="text-primary">*</span></h3>

-            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>拍照上传签约协议首页与盖章页</p>
+            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>上传签约协议首页与盖章页</p>

            <OssUploadField

@@ -963,10 +936,6 @@ export default function StoreCreatePage() {

              value={form.contractUrl}

-              wechatReady={wechatReady}
-
-              onWechatReadyChange={handleWechatReadyChange}
-
              onChange={(contractUrl) => patchForm({ contractUrl })}

              label="上传合同副本"
@@ -47,7 +47,6 @@ export default function StoreDetailPage() {
  const [saving, setSaving] = useState(false);
  const [mediaSaving, setMediaSaving] = useState(false);
  const [actionError, setActionError] = useState('');
-  const [wechatReady, setWechatReady] = useState(false);

  function applyStore(data: Record<string, unknown>) {
    setStore(data);
@@ -284,10 +283,8 @@ export default function StoreDetailPage() {
                bizType="STORE_TITLE"
                mediaType="IMAGE"
                value={coverUrl}
-                wechatReady={wechatReady}
-                onWechatReadyChange={setWechatReady}
                onChange={setCoverUrl}
-                label="点击更换门头照"
+                label="从系统相册选择"
              />
            </div>
          )}
@@ -336,8 +333,6 @@ export default function StoreDetailPage() {
                    bizType="STORE_ENV"
                    mediaType="IMAGE"
                    value={url}
-                    wechatReady={wechatReady}
-                    onWechatReadyChange={setWechatReady}
                    onChange={(nextUrl) => setEnvPhotoUrls((prev) => patchEnvPhotoAt(prev, index, nextUrl))}
                  />
                ))}
@@ -3,7 +3,8 @@ import react from '@vitejs/plugin-react';
 import path from 'path';

 export default defineConfig({
-  base: '/partner/',
+  // 独立域名 partner.dukanghaoke.com 部署在根路径；旧的子路径部署可显式覆盖。
+  base: process.env.VITE_PUBLIC_BASE ?? '/',
  plugins: [react()],
  resolve: {
    alias: {
@@ -5,7 +5,6 @@ import LoginPage from './pages/LoginPage';
 import LegalPage from './pages/LegalPage';
 import SelectStorePage from './pages/SelectStorePage';
 import HomePage from './pages/HomePage';
-import RedeemConfirmPage from './pages/RedeemConfirmPage';
 import PhoneRedeemPage from './pages/PhoneRedeemPage';
 import RedeemSuccessPage from './pages/RedeemSuccessPage';
 import RecordsPage from './pages/RecordsPage';
@@ -22,7 +21,7 @@ export default function App() {
        <Route path="/legal/privacy-policy" element={<LegalPage docId="privacy-policy" />} />
        <Route path="/select-store" element={<SelectStorePage />} />
        <Route path="/staff" element={<StaffPage />} />
-        <Route path="/redeem" element={<RedeemConfirmPage />} />
+        <Route path="/redeem" element={<Navigate to="/redeem/phone" replace />} />
        <Route path="/redeem/phone" element={<PhoneRedeemPage />} />
        <Route path="/redeem/success" element={<RedeemSuccessPage />} />
        <Route element={<TabLayout />}>
@@ -1,5 +1,4 @@
 import { Navigate, useLocation } from 'react-router-dom';
-import { getStoreProfile, hasShopWxSession } from '../lib/api';
 import { useStoreSession } from '../contexts/StoreSessionContext';

 const PUBLIC_PATHS = new Set(['/login', '/legal/user-agreement', '/legal/privacy-policy']);
@@ -26,10 +25,6 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
  }

  if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
-    const profile = getStoreProfile();
-    if (profile && hasShopWxSession() && location.pathname !== '/login') {
-      return <Navigate to="/login?quick=1" replace state={{ from: location }} />;
-    }
    return <Navigate to="/login" replace state={{ from: location }} />;
  }

@@ -19,6 +19,7 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
  const [photoResourceId, setPhotoResourceId] = useState('');
  const [result, setResult] = useState<RedeemPendingSubmitResult | null>(null);
  const [msg, setMsg] = useState('');
+  const [showAlbumFallback, setShowAlbumFallback] = useState(false);

  async function handleFile(file: File) {
    setUploading(true);
@@ -49,7 +50,11 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
        }
      } catch (e) {
        const text = e instanceof Error ? e.message : '选图失败';
-        if (!/cancel/i.test(text)) setMsg(text);
+        if (!/cancel/i.test(text)) {
+          setMsg(`${text}，可改从系统相册选择`);
+          setShowAlbumFallback(true);
+          inputRef.current?.click();
+        }
      } finally {
        setUploading(false);
      }
@@ -120,11 +125,13 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
            ref={inputRef}
            type="file"
            accept="image/*"
-            capture="environment"
            hidden
            onChange={(e) => {
              const file = e.target.files?.[0];
-              if (file) void handleFile(file);
+              if (file) {
+                setShowAlbumFallback(false);
+                void handleFile(file);
+              }
            }}
          />
          {previewUrl && (
@@ -134,6 +141,16 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
            <button type="button" className="shop-redeem-confirm-btn" disabled={uploading} onClick={() => void pickPhoto()}>
              {uploading ? '上传中…' : previewUrl ? '重新拍照' : '拍照 / 选图'}
            </button>
+            {showAlbumFallback && isWechatEnv() && (
+              <button
+                type="button"
+                className="shop-btn-outline"
+                disabled={uploading}
+                onClick={() => inputRef.current?.click()}
+              >
+                从系统相册选择
+              </button>
+            )}
            <button
              type="button"
              className="shop-redeem-confirm-btn"
@@ -53,7 +53,7 @@ const STORE_PROFILE = 'shopStoreProfile';
 const SESSION_EXPIRES_AT = 'shopSessionExpiresAt';
 export const SHOP_WX_BOUND = 'shopWxBound';

-/** 微信验证通过后的免登录时长 */
+/** 手机号或微信验证通过后的免登录时长 */
 export const SHOP_SESSION_TTL_MS = 7 * 24 * 60 * 60 * 1000;

 const AUTH_RECOVERY_EXEMPT_PATHS = [
@@ -87,7 +87,7 @@ export function isShopSessionExpired() {
 }

 export function touchShopSession() {
-  if (!hasShopWxSession()) return;
+  if (!localStorage.getItem(REFRESH_TOKEN)) return;
  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + SHOP_SESSION_TTL_MS));
 }

@@ -119,11 +119,16 @@ export function saveAuth(data: ShopSessionPayload) {
  }
 }

+/** 手机号验证成功后写入 7 天免验证码会话 */
+export function saveRememberedSession(data: ShopSessionPayload) {
+  saveAuth(data);
+  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + SHOP_SESSION_TTL_MS));
+}
+
 /** 微信登录/绑定成功后写入 7 天免登录 session */
 export function saveWechatSession(data: ShopSessionPayload) {
-  saveAuth(data);
+  saveRememberedSession(data);
  localStorage.setItem(SHOP_WX_BOUND, '1');
-  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + SHOP_SESSION_TTL_MS));
 }

 export function clearAuth(options?: { keepProfile?: boolean }) {
@@ -1,47 +1,15 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
-import { useStoreSession } from '../contexts/StoreSessionContext';
+import { Link, useNavigate } from 'react-router-dom';
 import { request } from '../lib/api';
-import { parseRedeemTokenFromScan } from '../lib/redeem-scan';
-import {
-  authorizeShopWechat,
-  checkNeedsWechatAuth,
-  fetchShopAccount,
-  handleShopWechatCallback,
-  handleShopWechatLoginResult,
-} from '../lib/wechat-auth';
-import { isWechatEnv, weixinSdk } from '../lib/weixin';
-import { stripOAuthParamsFromLocation } from '@dukang/weixin-sdk';
-import WechatScanAuthModal from '../components/WechatScanAuthModal';
-
-const PENDING_SCAN_KEY = 'shop_pending_scan';

 function formatMoney(n: number) {
  return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
 }

-function formatScanError(e: unknown): string {
-  const msg = e instanceof Error ? e.message : '扫码失败，请重试';
-  if (/invalid signature/i.test(msg)) {
-    return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名为 user.runxian.top，并刷新页面后重试';
-  }
-  if (/offline verifying|权限验证中|接口未就绪/i.test(msg)) {
-    return `${msg}（可在 URL 后加 ?wxdebug=1 开启 JSSDK 调试查看详情）`;
-  }
-  return msg;
-}
-
 export default function HomePage() {
  const navigate = useNavigate();
-  const { applySession } = useStoreSession();
-  const [searchParams, setSearchParams] = useSearchParams();
  const [dash, setDash] = useState<Record<string, unknown> | null>(null);
  const [open, setOpen] = useState(true);
-  const [scanMsg, setScanMsg] = useState('');
-  const [scanning, setScanning] = useState(false);
-  const [authModalOpen, setAuthModalOpen] = useState(false);
-  const [authLoading, setAuthLoading] = useState(false);
-  const [authError, setAuthError] = useState('');

  const loadDashboard = useCallback(() => {
    return request<Record<string, unknown>>('SHOP_H5', '/shop/dashboard')
@@ -58,7 +26,6 @@ export default function HomePage() {

  useEffect(() => {
    function onResume() {
-      setScanning(false);
      void loadDashboard();
    }
    function onVisibility() {
@@ -74,88 +41,6 @@ export default function HomePage() {
    };
  }, [loadDashboard]);

-  useEffect(() => {
-    if (!isWechatEnv() || !searchParams.get('code')) return;
-    void handleShopWechatCallback()
-      .then((result) => {
-        if (!result) return;
-        const session = handleShopWechatLoginResult(result);
-        if (session) {
-          applySession(session);
-        }
-        setAuthModalOpen(false);
-        setAuthError('');
-        stripOAuthParamsFromLocation();
-        setSearchParams({}, { replace: true });
-        const shouldScan = sessionStorage.getItem(PENDING_SCAN_KEY) === '1';
-        sessionStorage.removeItem(PENDING_SCAN_KEY);
-        if (shouldScan) {
-          window.setTimeout(() => void runScan(), 0);
-        }
-      })
-      .catch((e) => {
-        setAuthError(e instanceof Error ? e.message : '微信授权失败');
-      });
-  }, [searchParams, applySession, setSearchParams]);
-
-  async function runScan() {
-    if (!isWechatEnv()) {
-      setScanMsg('请在微信内打开门店端进行扫码核销');
-      return;
-    }
-    setScanning(true);
-    setScanMsg('');
-    try {
-      await weixinSdk.init();
-      const raw = await weixinSdk.scanQrCode();
-      if (!raw) {
-        void loadDashboard();
-        return;
-      }
-      const token = parseRedeemTokenFromScan(raw);
-      if (!token) {
-        setScanMsg('无法识别核销码，请扫描用户出示的核销二维码');
-        return;
-      }
-      navigate(`/redeem?token=${encodeURIComponent(token)}`);
-    } catch (e) {
-      setScanMsg(formatScanError(e));
-    } finally {
-      setScanning(false);
-    }
-  }
-
-  async function handleScan() {
-    setScanMsg('');
-    if (!isWechatEnv()) {
-      setScanMsg('请在微信内打开门店端进行扫码核销');
-      return;
-    }
-    try {
-      const profile = await fetchShopAccount();
-      if (await checkNeedsWechatAuth(profile)) {
-        setAuthModalOpen(true);
-        return;
-      }
-      await runScan();
-    } catch (e) {
-      setScanMsg(e instanceof Error ? e.message : '无法发起扫码');
-    }
-  }
-
-  async function startWechatAuth() {
-    setAuthLoading(true);
-    setAuthError('');
-    try {
-      sessionStorage.setItem(PENDING_SCAN_KEY, '1');
-      await authorizeShopWechat();
-    } catch (e) {
-      sessionStorage.removeItem(PENDING_SCAN_KEY);
-      setAuthError(e instanceof Error ? e.message : '微信授权失败');
-      setAuthLoading(false);
-    }
-  }
-
  const store = dash?.store as Record<string, unknown> | undefined;
  const recent = (dash?.recentRecords as Array<Record<string, unknown>>) || [];
  const openTime = String(store?.openTime || '10:00');
@@ -189,20 +74,13 @@ export default function HomePage() {
        </section>

        <section className="shop-home-scan">
-          <button
-            type="button"
+          <Link
+            to="/redeem/phone"
            className="shop-home-scan-btn"
-            disabled={scanning}
-            onClick={() => void handleScan()}
          >
-            <span className="material-symbols-outlined">qr_code_scanner</span>
-          </button>
-          <p className="shop-home-scan-label">{scanning ? '正在打开相机…' : '扫码核销'}</p>
-          {scanMsg && <p className="shop-home-scan-msg" role="alert">{scanMsg}</p>}
-          <Link to="/redeem/phone" className="shop-home-phone-link">
            <span className="material-symbols-outlined">smartphone</span>
-            手机号核销
          </Link>
+          <p className="shop-home-scan-label">手机号核销</p>
        </section>

        <section className="shop-home-status">
@@ -249,17 +127,6 @@ export default function HomePage() {
        </section>
      </div>

-      <WechatScanAuthModal
-        open={authModalOpen}
-        loading={authLoading}
-        error={authError}
-        onAuthorize={() => void startWechatAuth()}
-        onCancel={() => {
-          setAuthModalOpen(false);
-          setAuthError('');
-          sessionStorage.removeItem(PENDING_SCAN_KEY);
-        }}
-      />
    </div>
  );
 }
@@ -1,32 +1,14 @@
-import { useEffect, useRef, useState, type RefObject } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import { useRef, useState, type RefObject } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
 import AppImage from '@dukang/shared-ui/AppImage';
-import { isWxAuthorizeEnabled } from '@dukang/shared-types';
-import { stripOAuthParamsFromLocation } from '@dukang/weixin-sdk';
 import { useStoreSession } from '../contexts/StoreSessionContext';
-import { getLastPhone, getStoreProfile, hasShopWxSession, request, saveAuth, type ShopSessionPayload } from '../lib/api';
-import { routeAfterShopLogin } from './SelectStorePage';
 import {
-  bindShopWechatAfterSmsLogin,
-  fetchClientConfig,
-  handleShopWechatCallback,
-  handleShopWechatLoginResult,
-  loginShopWithWechat,
-} from '../lib/wechat-auth';
-import { isWechatEnv } from '../lib/weixin';
-
-function maskPhone(phone: string) {
-  if (phone.length < 7) return phone;
-  return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
-}
-
-function formatWechatError(e: unknown): string {
-  const text = e instanceof Error ? e.message : '微信登录失败';
-  if (text.includes('首次登录') || text.includes('手机验证码')) {
-    return '该微信尚未绑定门店账号，请先使用手机验证码登录，登录后将自动关联微信';
-  }
-  return text;
-}
+  getLastPhone,
+  request,
+  saveRememberedSession,
+  type ShopSessionPayload,
+} from '../lib/api';
+import { routeAfterShopLogin } from './SelectStorePage';

 function ShopAgreementCheckbox({
  agreed,
@@ -35,7 +17,7 @@ function ShopAgreementCheckbox({
 }: {
  agreed: boolean;
  onChange: (next: boolean) => void;
-  labelRef?: RefObject<HTMLLabelElement | null>;
+  labelRef?: RefObject<HTMLLabelElement>;
 }) {
  return (
    <label className="shop-login-agreement" ref={labelRef}>
@@ -61,44 +43,14 @@ function ShopAgreementCheckbox({
 export default function LoginPage() {
  const navigate = useNavigate();
  const { applySession } = useStoreSession();
-  const [params, setSearchParams] = useSearchParams();
-  const quick = params.get('quick') === '1';
-  const savedProfile = getStoreProfile();
  const [phone, setPhone] = useState(getLastPhone());
  const [code, setCode] = useState('');
  const [agreed, setAgreed] = useState(false);
  const [loading, setLoading] = useState(false);
-  const [wxLoading, setWxLoading] = useState(false);
  const [msg, setMsg] = useState('');
  const [codeCooldown, setCodeCooldown] = useState(0);
-  const [wxAuthorize, setWxAuthorize] = useState(false);
  const agreementRef = useRef<HTMLLabelElement>(null);

-  useEffect(() => {
-    fetchClientConfig()
-      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
-      .catch(() => setWxAuthorize(false));
-  }, []);
-
-  useEffect(() => {
-    if (!isWechatEnv() || !wxAuthorize || !params.get('code')) return;
-    void handleShopWechatCallback()
-      .then((result) => {
-        if (!result) return;
-        const session = handleShopWechatLoginResult(result);
-        if (session) {
-          applySession(session);
-          stripOAuthParamsFromLocation();
-          setSearchParams({}, { replace: true });
-          routeAfterShopLogin(session, navigate);
-        }
-      })
-      .catch((e) => setMsg(formatWechatError(e)));
-  }, [applySession, navigate, params, setSearchParams, wxAuthorize]);
-
-  const quickStoreName = savedProfile?.storeName ?? '门店管理中心';
-  const quickPhone = savedProfile?.phone || phone;
-
  function ensureAgreed() {
    if (!agreed) {
      setMsg('请先阅读并同意用户协议');
@@ -141,13 +93,8 @@ export default function LoginPage() {
        method: 'POST',
        body: JSON.stringify({ phone, code }),
      });
-      saveAuth(data);
+      saveRememberedSession(data);
      applySession(data);
-      if (isWechatEnv() && wxAuthorize) {
-        setMsg('登录成功，正在关联微信…');
-        await bindShopWechatAfterSmsLogin();
-        return;
-      }
      routeAfterShopLogin(data, navigate);
    } catch (e) {
      setMsg(e instanceof Error ? e.message : '登录失败');
@@ -156,103 +103,6 @@ export default function LoginPage() {
    }
  }

-  async function wechatLogin() {
-    if (!ensureAgreed()) return;
-    setMsg('');
-    if (!isWechatEnv()) {
-      setMsg('请在微信内打开以使用微信一键登录');
-      return;
-    }
-    setWxLoading(true);
-    try {
-      const session = await loginShopWithWechat();
-      if (session) {
-        applySession(session);
-        routeAfterShopLogin(session, navigate);
-      }
-    } catch (e) {
-      setMsg(formatWechatError(e));
-    } finally {
-      setWxLoading(false);
-    }
-  }
-
-  if (quick) {
-    const canWechatQuick = wxAuthorize && isWechatEnv() && hasShopWxSession() && !!savedProfile;
-
-    return (
-      <div className="shop-quick-login-page">
-        <header className="shop-quick-header">
-          <AppImage src="/logo.png" alt="杜康好客" wrapperClassName="shop-quick-logo" fit="contain" />
-          <h1 className="shop-quick-welcome">欢迎回来</h1>
-          <div className="shop-quick-welcome-line" />
-        </header>
-
-        <section className="shop-quick-store-card">
-          <div className="shop-quick-store-inner">
-            <div className="shop-quick-store-icon">
-              <span className="material-symbols-outlined shop-fill-icon">storefront</span>
-            </div>
-            <div>
-              <h2 className="shop-quick-store-name">{quickStoreName}</h2>
-              <p className="shop-quick-store-phone">{maskPhone(quickPhone)}</p>
-            </div>
-            <span className="shop-quick-verified">
-              <span className="material-symbols-outlined shop-fill-icon" style={{ fontSize: 14 }}>verified_user</span>
-              认证门店
-            </span>
-            <div className="shop-quick-switch">
-              <Link to="/login">
-                <span className="material-symbols-outlined" style={{ fontSize: 18 }}>sync</span>
-                切换账号
-              </Link>
-            </div>
-          </div>
-        </section>
-
-        <div className="shop-quick-actions">
-          {msg && <p className="shop-login-msg">{msg}</p>}
-          <ShopAgreementCheckbox
-            agreed={agreed}
-            onChange={setAgreed}
-            labelRef={agreementRef}
-          />
-          {canWechatQuick ? (
-            <button
-              type="button"
-              className="shop-quick-login-btn shop-quick-login-btn--wechat"
-              disabled={wxLoading}
-              onClick={() => void wechatLogin()}
-            >
-              <span className="material-symbols-outlined">chat</span>
-              <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-            </button>
-          ) : (
-            <p className="shop-login-msg" style={{ textAlign: 'center' }}>
-              {wxAuthorize && !isWechatEnv()
-                ? '请在微信内打开以使用一键登录'
-                : '请使用验证码登录并绑定微信后，即可 7 天内免登录'}
-            </p>
-          )}
-          {!canWechatQuick && (
-            <Link to="/login" className="shop-quick-login-btn" style={{ textAlign: 'center', textDecoration: 'none' }}>
-              验证码登录
-            </Link>
-          )}
-          <div className="shop-quick-secure">
-            <span className="material-symbols-outlined" style={{ fontSize: 16 }}>lock</span>
-            <span>{canWechatQuick ? '微信验证 · 7 天内免登录' : '加密环境安全登录中'}</span>
-          </div>
-        </div>
-
-        <footer className="shop-quick-footer">
-          <p className="shop-login-footer-brand">SECURED BY DUKANG HERITAGE</p>
-          <p style={{ fontSize: 10, fontFamily: 'var(--font-label)' }}>© 2024 杜康酒业门店管理系统</p>
-        </footer>
-      </div>
-    );
-  }
-
  return (
    <div className="shop-login-page">
      <header className="shop-login-hero">
@@ -322,26 +172,9 @@ export default function LoginPage() {
            <span>{loading ? '登录中...' : '登录'}</span>
            {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
          </button>
-
-          {wxAuthorize && (
-            <>
-              <div className="shop-login-divider">
-                <span className="shop-login-divider-line" />
-                <span className="shop-login-divider-text">或者</span>
-                <span className="shop-login-divider-line" />
-              </div>
-
-              <button
-                type="button"
-                className="shop-login-wechat"
-                disabled={wxLoading}
-                onClick={() => void wechatLogin()}
-              >
-                <span className="material-symbols-outlined">chat</span>
-                <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-              </button>
-            </>
-          )}
+          <p className="shop-login-msg" style={{ textAlign: 'center', marginTop: 12 }}>
+            手机号验证成功后，7 天内无需再次输入验证码
+          </p>
        </div>
      </main>

@@ -350,11 +183,6 @@ export default function LoginPage() {
        <span className="material-symbols-outlined shop-fill-icon" style={{ opacity: 0.3, fontSize: 20, color: 'var(--color-outline)' }}>
          security
        </span>
-        {hasShopWxSession() && savedProfile && (
-          <p style={{ marginTop: 16, textAlign: 'center' }}>
-            <Link to="/login?quick=1" className="text-primary body-md">微信快捷登录</Link>
-          </p>
-        )}
      </footer>
    </div>
  );
@@ -1,33 +1,22 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import type { RedeemPhoneDirectPrepareResult } from '@dukang/shared-types';
 import { request } from '../lib/api';

-type BalanceResult = {
-  sessionId: string;
-  totalBalance: number;
-  maskedPhone: string;
-  user?: { nickname?: string; phone?: string; userNo?: string };
-};
-
 function formatAmount(n: number) {
  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }

-type Step = 'lookup' | 'amount' | 'confirm';
-
 export default function PhoneRedeemPage() {
  const navigate = useNavigate();
-  const [step, setStep] = useState<Step>('lookup');
  const [phone, setPhone] = useState('');
-  const [lookupCode, setLookupCode] = useState('');
-  const [confirmCode, setConfirmCode] = useState('');
  const [amount, setAmount] = useState('');
-  const [balance, setBalance] = useState<BalanceResult | null>(null);
+  const [confirmCode, setConfirmCode] = useState('');
+  const [prepared, setPrepared] = useState<RedeemPhoneDirectPrepareResult | null>(null);
  const [storeName, setStoreName] = useState('');
  const [storeClosed, setStoreClosed] = useState(false);
  const [msg, setMsg] = useState('');
  const [loading, setLoading] = useState(false);
-  const [lookupCooldown, setLookupCooldown] = useState(0);
  const [confirmCooldown, setConfirmCooldown] = useState(0);

  useEffect(() => {
@@ -39,62 +28,17 @@ export default function PhoneRedeemPage() {
      .catch(() => setStoreName('当前门店'));
  }, []);

-  useEffect(() => {
-    if (lookupCooldown <= 0) return;
-    const timer = window.setTimeout(() => setLookupCooldown((v) => v - 1), 1000);
-    return () => window.clearTimeout(timer);
-  }, [lookupCooldown]);
-
  useEffect(() => {
    if (confirmCooldown <= 0) return;
    const timer = window.setTimeout(() => setConfirmCooldown((v) => v - 1), 1000);
    return () => window.clearTimeout(timer);
  }, [confirmCooldown]);

-  async function sendLookupSms() {
+  async function sendConfirmSms() {
    if (!/^1\d{10}$/.test(phone.trim())) {
      setMsg('请输入正确的手机号');
      return;
    }
-    setLoading(true);
-    setMsg('');
-    try {
-      await request('SHOP_H5', '/shop/redeem/phone/send-lookup-sms', {
-        method: 'POST',
-        body: JSON.stringify({ phone: phone.trim() }),
-      });
-      setLookupCooldown(60);
-      setMsg('验证码已发送至用户手机');
-    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '发送失败');
-    } finally {
-      setLoading(false);
-    }
-  }
-
-  async function queryBalance() {
-    if (!lookupCode.trim()) {
-      setMsg('请输入验证码');
-      return;
-    }
-    setLoading(true);
-    setMsg('');
-    try {
-      const res = await request<BalanceResult>('SHOP_H5', '/shop/redeem/phone/balance', {
-        method: 'POST',
-        body: JSON.stringify({ phone: phone.trim(), code: lookupCode.trim() }),
-      });
-      setBalance(res);
-      setStep('amount');
-      setMsg('');
-    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '查询失败');
-    } finally {
-      setLoading(false);
-    }
-  }
-
-  async function prepareRedeem() {
    if (storeClosed) {
      setMsg('门店未营业，无法核销');
      return;
@@ -104,28 +48,30 @@ export default function PhoneRedeemPage() {
      setMsg('请输入有效核销金额');
      return;
    }
-    if (balance && value > balance.totalBalance) {
-      setMsg('核销金额不能超过可用权益');
-      return;
-    }
    setLoading(true);
    setMsg('');
    try {
-      await request('SHOP_H5', '/shop/redeem/phone/prepare', {
+      const result = await request<RedeemPhoneDirectPrepareResult>('SHOP_H5', '/shop/redeem/phone/prepare-direct', {
        method: 'POST',
-        body: JSON.stringify({ sessionId: balance?.sessionId, amount: value }),
+        body: JSON.stringify({ phone: phone.trim(), amount: value }),
      });
+      setPrepared(result);
+      setConfirmCode('');
      setConfirmCooldown(60);
-      setStep('confirm');
-      setMsg('确认验证码已发送至用户手机，请向用户索取后输入');
+      setMsg(`验证码已发送至 ${result.maskedPhone}，验证成功后将直接核销`);
    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '发起核销失败');
+      setPrepared(null);
+      setMsg(e instanceof Error ? e.message : '发送验证码失败');
    } finally {
      setLoading(false);
    }
  }

  async function confirmRedeem() {
+    if (!prepared) {
+      setMsg('请先发送核销验证码');
+      return;
+    }
    if (!confirmCode.trim()) {
      setMsg('请输入确认验证码');
      return;
@@ -136,13 +82,13 @@ export default function PhoneRedeemPage() {
      const result = await request<Record<string, unknown>>('SHOP_H5', '/shop/redeem/phone/confirm', {
        method: 'POST',
        body: JSON.stringify({
-          sessionId: balance?.sessionId,
+          sessionId: prepared.sessionId,
          code: confirmCode.trim(),
        }),
      });
      sessionStorage.setItem('lastRedeemResult', JSON.stringify(result));
      navigate('/redeem/success', {
-        state: { result, storeName, user: balance?.user },
+        state: { result, storeName, user: prepared.user },
      });
    } catch (e) {
      setMsg(e instanceof Error ? e.message : '核销失败');
@@ -151,7 +97,9 @@ export default function PhoneRedeemPage() {
    }
  }

-  const userLabel = balance?.user?.nickname || balance?.maskedPhone || '—';
+  const amountValue = Number(amount);
+  const canSendCode =
+    /^1\d{10}$/.test(phone.trim()) && Number.isFinite(amountValue) && amountValue > 0;

  return (
    <div className="shop-redeem-page">
@@ -179,150 +127,77 @@ export default function PhoneRedeemPage() {
          </div>

          <div className="shop-redeem-body">
-            {step === 'lookup' && (
-              <>
-                <div className="shop-phone-field">
-                  <label className="shop-phone-label">用户手机号</label>
-                  <input
-                    className="shop-phone-input"
-                    type="tel"
-                    maxLength={11}
-                    placeholder="请输入用户手机号"
-                    value={phone}
-                    onChange={(e) => setPhone(e.target.value.replace(/\D/g, ''))}
-                  />
-                </div>
-                <div className="shop-phone-field">
-                  <label className="shop-phone-label">验证码</label>
-                  <div className="shop-phone-code-row">
-                    <input
-                      className="shop-phone-input"
-                      type="text"
-                      maxLength={6}
-                      placeholder="用户收到的验证码"
-                      value={lookupCode}
-                      onChange={(e) => setLookupCode(e.target.value.replace(/\D/g, ''))}
-                    />
-                    <button
-                      type="button"
-                      className="shop-phone-code-btn"
-                      disabled={loading || lookupCooldown > 0 || !phone.trim()}
-                      onClick={() => void sendLookupSms()}
-                    >
-                      {lookupCooldown > 0 ? `${lookupCooldown}s` : '获取验证码'}
-                    </button>
-                  </div>
-                </div>
-                <button
-                  type="button"
-                  className="shop-redeem-confirm-btn"
-                  disabled={loading || storeClosed}
-                  onClick={() => void queryBalance()}
-                >
-                  查询权益
-                </button>
-              </>
-            )}
+            <div className="shop-phone-field">
+              <label className="shop-phone-label">用户手机号</label>
+              <input
+                className="shop-phone-input"
+                type="tel"
+                maxLength={11}
+                placeholder="请输入用户手机号"
+                value={phone}
+                disabled={loading}
+                onChange={(e) => {
+                  setPhone(e.target.value.replace(/\D/g, ''));
+                  setPrepared(null);
+                  setConfirmCode('');
+                  setConfirmCooldown(0);
+                }}
+              />
+            </div>

-            {step === 'amount' && balance && (
-              <>
-                <div className="shop-redeem-user">
-                  <div className="shop-redeem-user-left">
-                    <span className="material-symbols-outlined">person</span>
-                    <span>用户</span>
-                  </div>
-                  <span className="headline-md" style={{ fontFamily: 'var(--font-headline)', fontWeight: 600 }}>
-                    {userLabel}
-                  </span>
-                </div>
-                <div className="shop-redeem-amount-section">
-                  <p className="shop-redeem-amount-label">可用好客权益</p>
-                  <div className="shop-redeem-amount">
-                    <span className="shop-redeem-amount-symbol">¥</span>
-                    <span className="shop-redeem-amount-value">{formatAmount(balance.totalBalance)}</span>
-                  </div>
-                </div>
-                <div className="shop-phone-field">
-                  <label className="shop-phone-label">核销金额</label>
-                  <input
-                    className="shop-phone-input"
-                    type="number"
-                    min={0.01}
-                    step={0.01}
-                    placeholder="请输入核销金额"
-                    value={amount}
-                    onChange={(e) => setAmount(e.target.value)}
-                  />
-                </div>
-                <button
-                  type="button"
-                  className="shop-redeem-confirm-btn"
-                  disabled={loading || storeClosed || balance.totalBalance <= 0}
-                  onClick={() => void prepareRedeem()}
-                >
-                  发送确认验证码并核销
-                </button>
-                <button
-                  type="button"
-                  className="shop-phone-link-btn"
-                  onClick={() => {
-                    setStep('lookup');
-                    setBalance(null);
-                    setAmount('');
-                    setLookupCode('');
-                  }}
-                >
-                  更换手机号
-                </button>
-              </>
-            )}
+            <div className="shop-phone-field">
+              <label className="shop-phone-label">待核销金额</label>
+              <input
+                className="shop-phone-input"
+                type="number"
+                min={0.01}
+                step={0.01}
+                placeholder="请输入待核销金额"
+                value={amount}
+                disabled={loading}
+                onChange={(e) => {
+                  setAmount(e.target.value);
+                  setPrepared(null);
+                  setConfirmCode('');
+                  setConfirmCooldown(0);
+                }}
+              />
+            </div>

-            {step === 'confirm' && balance && (
-              <>
-                <div className="shop-redeem-details">
-                  <div className="shop-redeem-detail-row">
-                    <span>用户</span>
-                    <span>{userLabel}</span>
-                  </div>
-                  <div className="shop-redeem-detail-row">
-                    <span>核销金额</span>
-                    <span>¥{formatAmount(Number(amount))}</span>
-                  </div>
-                </div>
-                <div className="shop-phone-field">
-                  <label className="shop-phone-label">核销确认验证码</label>
-                  <input
-                    className="shop-phone-input"
-                    type="text"
-                    maxLength={6}
-                    placeholder="用户手机收到的确认码"
-                    value={confirmCode}
-                    onChange={(e) => setConfirmCode(e.target.value.replace(/\D/g, ''))}
-                  />
-                  <p className="shop-redeem-hint" style={{ marginTop: 8 }}>
-                    {confirmCooldown > 0 ? `${confirmCooldown}s 后可重新发送` : '未收到可向用户确认或返回上一步重发'}
-                  </p>
-                </div>
+            <div className="shop-phone-field">
+              <label className="shop-phone-label">核销验证码</label>
+              <div className="shop-phone-code-row">
+                <input
+                  className="shop-phone-input"
+                  type="text"
+                  inputMode="numeric"
+                  maxLength={6}
+                  placeholder="输入用户收到的验证码"
+                  value={confirmCode}
+                  onChange={(e) => setConfirmCode(e.target.value.replace(/\D/g, ''))}
+                />
                <button
                  type="button"
-                  className="shop-redeem-confirm-btn"
-                  disabled={loading || storeClosed}
-                  onClick={() => void confirmRedeem()}
+                  className="shop-phone-code-btn"
+                  disabled={loading || confirmCooldown > 0 || storeClosed || !canSendCode}
+                  onClick={() => void sendConfirmSms()}
                >
-                  {loading ? '正在核销…' : `确认核销 ¥${formatAmount(Number(amount))}`}
+                  {confirmCooldown > 0 ? `${confirmCooldown}s` : '发送验证码'}
                </button>
-                <button
-                  type="button"
-                  className="shop-phone-link-btn"
-                  onClick={() => {
-                    setStep('amount');
-                    setConfirmCode('');
-                  }}
-                >
-                  返回修改金额
-                </button>
-              </>
-            )}
+              </div>
+              <p className="shop-redeem-hint" style={{ marginTop: 8 }}>
+                验证码将发送到用户手机号，验证成功后直接完成核销。
+              </p>
+            </div>
+
+            <button
+              type="button"
+              className="shop-redeem-confirm-btn"
+              disabled={loading || storeClosed || !prepared || !confirmCode.trim()}
+              onClick={() => void confirmRedeem()}
+            >
+              {loading ? '正在核销…' : `确认核销 ¥${formatAmount(amountValue || 0)}`}
+            </button>

            {msg && <p className="shop-redeem-error">{msg}</p>}
          </div>
@@ -3,7 +3,8 @@ import react from '@vitejs/plugin-react';
 import path from 'path';

 export default defineConfig({
-  base: '/shop/',
+  // 独立域名 shop.dukanghaoke.com 部署在根路径；旧的子路径部署可显式覆盖。
+  base: process.env.VITE_PUBLIC_BASE ?? '/',
  plugins: [react()],
  resolve: {
    alias: {
@@ -0,0 +1,50 @@
+import { Button, Text } from '@tarojs/components';
+import type { ReactNode } from 'react';
+
+export type ContactCsSessionContext = {
+  orderId?: string;
+  orderNo?: string;
+  from?: string;
+};
+
+type ContactCsButtonProps = {
+  className?: string;
+  children?: ReactNode;
+  /** 客服会话来源上下文，便于客服后台识别 */
+  session?: ContactCsSessionContext;
+};
+
+const isWeapp = process.env.TARO_ENV === 'weapp';
+
+/** 组装 session-from（微信限制约 1000 字符） */
+export function buildCsSessionFrom(session?: ContactCsSessionContext): string {
+  if (!session) return 'dukang|from=mini-user';
+  const parts = ['dukang'];
+  if (session.from) parts.push(`from=${session.from}`);
+  if (session.orderNo) parts.push(`orderNo=${session.orderNo}`);
+  if (session.orderId) parts.push(`orderId=${session.orderId}`);
+  return parts.join('|');
+}
+
+/**
+ * 微信小程序客服入口（open-type=contact）。
+ * 非 weapp 环境不渲染，由调用方走电话等兜底。
+ */
+export default function ContactCsButton({
+  className = '',
+  children = '联系在线客服',
+  session,
+}: ContactCsButtonProps) {
+  if (!isWeapp) return null;
+
+  return (
+    <Button
+      className={className}
+      openType="contact"
+      sessionFrom={buildCsSessionFrom(session)}
+      hoverClass="none"
+    >
+      {typeof children === 'string' ? <Text>{children}</Text> : children}
+    </Button>
+  );
+}
@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro';
 import { ClientApp } from '@dukang/shared-types';
-import { goLogin, forceReloadAfterAccountMerge } from './auth-nav';
+import { forceReloadAfterAccountMerge } from './auth-nav';

 function resolveApiBase(): string {
  const origin =
@@ -54,10 +54,6 @@ export function isLoggedIn(): boolean {
  return !!getToken();
 }

-export function redirectToLogin() {
-  goLogin();
-}
-
 export function logout() {
  clearAuth();
  Taro.reLaunch({ url: '/pages/home/index' });
@@ -76,17 +72,6 @@ function parseBody(data: unknown): { code?: number; message?: string } {
  return {};
 }

-function isOnLoginPage(): boolean {
-  try {
-    const pages = Taro.getCurrentPages();
-    const cur = pages[pages.length - 1] as { route?: string } | undefined;
-    const route = cur?.route || '';
-    return route.includes('pages/login');
-  } catch {
-    return false;
-  }
-}
-
 /** 统一请求：注入 CLIENT_APP + Bearer，解包 { code, message, data } */
 export async function request<T = unknown>(path: string, options: ReqOptions = {}): Promise<T> {
  const header: Record<string, string> = {
@@ -115,8 +100,6 @@ export async function request<T = unknown>(path: string, options: ReqOptions = {
      if (/账号已合并/.test(mergedMsg)) {
        // 合并后旧 JWT 失效：强制刷新，不引导「重新登录」
        forceReloadAfterAccountMerge();
-      } else if (!isOnLoginPage()) {
-        redirectToLogin();
      }
    }
    throw new Error(body?.message || '登录已过期，请重新登录');
@@ -7,6 +7,14 @@ const TAB_PAGES = new Set([
  '/pages/mine/index',
 ]);

+let loginNavigationPending = false;
+
+function isLoginPageActive(): boolean {
+  const pages = Taro.getCurrentPages();
+  const current = pages[pages.length - 1] as { route?: string } | undefined;
+  return !!current?.route?.includes('pages/login/');
+}
+
 function currentPagePath(): string {
  const pages = Taro.getCurrentPages();
  const cur = pages[pages.length - 1] as
@@ -25,6 +33,7 @@ function currentPagePath(): string {

 /** 跳转登录页；默认带回当前页作为 return */
 export function goLogin(returnPath?: string, extras?: Record<string, string>) {
+  if (loginNavigationPending || isLoginPageActive()) return;
  const returnTo = returnPath ?? currentPagePath();
  const parts: string[] = [];
  if (returnTo) parts.push(`return=${encodeURIComponent(returnTo)}`);
@@ -34,9 +43,15 @@ export function goLogin(returnPath?: string, extras?: Record<string, string>) {
    }
  }
  const url = parts.length ? `/pages/login/index?${parts.join('&')}` : '/pages/login/index';
-  Taro.navigateTo({ url }).catch(() => {
-    Taro.redirectTo({ url });
-  });
+  loginNavigationPending = true;
+  void Taro.navigateTo({ url })
+    .catch(() => Taro.redirectTo({ url }))
+    .finally(() => {
+      // 等路由栈稳定后再释放，拦截同一轮请求触发的重复登录跳转。
+      setTimeout(() => {
+        loginNavigationPending = false;
+      }, 500);
+    });
 }

 /** 登录成功后回到 return 页，或回退 / 首页 */
@@ -6,6 +6,17 @@ export type MiniWechatProfile = {
  avatarUrl?: string;
 };

+export type MiniWechatProfileUpdate = MiniWechatProfile & {
+  avatarResourceId?: string;
+};
+
+export type UploadedAvatarResource = {
+  resourceId: string;
+  url: string;
+  bucket: string;
+  ossKey: string;
+};
+
 const WX_PROFILE_CACHE_KEY = 'wx_mini_profile_cache';

 export function cacheWxProfile(info: MiniWechatProfile) {
@@ -55,8 +66,8 @@ export function mergeWxDisplayProfile(profile: UserProfile): UserProfile {
  };
 }

-/** 上传 chooseAvatar 临时文件到 OSS，返回永久 URL */
-export async function uploadAvatarTempFile(tempFilePath: string): Promise<string> {
+/** 上传 chooseAvatar 临时文件到 OSS，并返回已登记到当前用户的真实资源。 */
+export async function uploadAvatarTempFile(tempFilePath: string): Promise<UploadedAvatarResource> {
  const { API_BASE, CLIENT_APP, getToken } = await import('./api');
  const token = getToken();
  if (!token) throw new Error('请先登录');
@@ -75,7 +86,11 @@ export async function uploadAvatarTempFile(tempFilePath: string): Promise<string
    },
  });

-  let body: { code?: number; message?: string; data?: { url?: string } } = {};
+  let body: {
+    code?: number;
+    message?: string;
+    data?: { resourceId?: string; url?: string; bucket?: string; ossKey?: string };
+  } = {};
  try {
    body = JSON.parse(String(res.data || '{}')) as typeof body;
  } catch {
@@ -84,14 +99,26 @@ export async function uploadAvatarTempFile(tempFilePath: string): Promise<string
  if (res.statusCode === 401 || body.code === 401) {
    throw new Error(body.message || '登录已过期，请重新登录');
  }
-  if (res.statusCode >= 400 || body.code !== 0 || !body.data?.url) {
+  if (
+    res.statusCode >= 400 ||
+    body.code !== 0 ||
+    !body.data?.resourceId ||
+    !body.data.url ||
+    !body.data.bucket ||
+    !body.data.ossKey
+  ) {
    throw new Error(body.message || '头像上传失败');
  }
-  return body.data.url;
+  return {
+    resourceId: body.data.resourceId,
+    url: body.data.url,
+    bucket: body.data.bucket,
+    ossKey: body.data.ossKey,
+  };
 }

-export async function uploadMiniWechatProfile(info: MiniWechatProfile): Promise<UserProfile | null> {
-  if (!info.nickname && !info.avatarUrl) return null;
+export async function uploadMiniWechatProfile(info: MiniWechatProfileUpdate): Promise<UserProfile | null> {
+  if (!info.nickname && !info.avatarUrl && !info.avatarResourceId) return null;
  const { request } = await import('./api');
  const updated = await request<UserProfile>('/auth/wechat/mini-profile', {
    method: 'POST',
@@ -124,6 +151,7 @@ export async function syncMiniWechatProfile(
  if (process.env.TARO_ENV !== 'weapp') return null;
  const info = prefetched?.nickname || prefetched?.avatarUrl ? prefetched : getCachedWxProfile();
  if (!info?.nickname && !info?.avatarUrl) return null;
-  await uploadMiniWechatProfile(info);
+  // 缓存头像 URL 可能来自历史微信资料，未经过当前 OSS 上传登记；这里只同步昵称。
+  if (info.nickname) await uploadMiniWechatProfile({ nickname: info.nickname });
  return info;
 }
@@ -3,28 +3,42 @@ import Taro from '@tarojs/taro';
 import { CUSTOMER_SERVICE_PHONE } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import SubPageHeader from '../../components/SubPageHeader';
+import ContactCsButton from '../../components/ContactCsButton';
 import { toast } from '../../lib/api';

+const isWeapp = process.env.TARO_ENV === 'weapp';
 const DIAL_PHONE = CUSTOMER_SERVICE_PHONE.replace(/-/g, '');

+function dialPhone() {
+  Taro.makePhoneCall({ phoneNumber: DIAL_PHONE }).catch(() => toast('无法拨打电话'));
+}
+
 export default function CustomerServicePage() {
  return (
    <PageShell variant="sub" className="cs-page">
      <SubPageHeader title="联系客服" />
      <View className="sub-page-body inset-page cs-body">
-        <Text className="cs-title">客服热线</Text>
-        <Text className="cs-phone">{CUSTOMER_SERVICE_PHONE}</Text>
-        <Text className="cs-hint">工作时间：9:00 - 21:00</Text>
-        <View
-          className="cs-call-btn"
-          onClick={() => {
-            Taro.makePhoneCall({ phoneNumber: DIAL_PHONE }).catch(() =>
-              toast('无法拨打电话'),
-            );
-          }}
-        >
-          <Text>拨打客服电话</Text>
+        <Text className="cs-brand">杜康好客客服</Text>
+        <Text className="cs-hint">
+          {isWeapp
+            ? '点击下方按钮，进入小程序在线客服会话'
+            : '请在微信小程序内打开以使用在线客服，或拨打客服电话'}
+        </Text>
+        <Text className="cs-hours">工作时间：9:00 - 21:00</Text>
+
+        {isWeapp ? (
+          <ContactCsButton className="cs-online-btn" session={{ from: 'customer-service' }} />
+        ) : null}
+
+        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={dialPhone}>
+          <Text>
+            {isWeapp ? `或拨打客服电话 ${CUSTOMER_SERVICE_PHONE}` : '拨打客服电话'}
+          </Text>
        </View>
+
+        {!isWeapp ? (
+          <Text className="cs-phone-display">{CUSTOMER_SERVICE_PHONE}</Text>
+        ) : null}
      </View>
    </PageShell>
  );
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { View, Text } from '@tarojs/components';
 import Taro, { useDidShow } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
@@ -21,9 +21,9 @@ type Product = {
 };

 const AROMA_TABS = [
-  { key: 'QINGXIANG', label: '清香型', open: true },
-  { key: 'JIANGXIANG', label: '酱香型', open: false },
-  { key: 'NONGXIANG', label: '浓香型', open: false },
+  { key: 'QINGXIANG', label: '清香型' },
+  { key: 'JIANGXIANG', label: '酱香型' },
+  { key: 'NONGXIANG', label: '浓香型' },
 ] as const;

 export default function HomePage() {
@@ -49,20 +49,26 @@ export default function HomePage() {
      .finally(() => setLoading(false));
  }, [cityCode]);

-  function onAromaTabClick(key: string, open: boolean) {
-    if (!open) {
-      toast('暂未开放');
-      return;
+  const availableAromas = useMemo(
+    () =>
+      AROMA_TABS.filter((item) =>
+        products.some((product) => product.aromaType === item.key),
+      ),
+    [products],
+  );
+
+  useEffect(() => {
+    if (loading || availableAromas.length === 0) return;
+    if (!availableAromas.some((item) => item.key === tab)) {
+      setTab(availableAromas[0].key);
    }
-    setTab(key);
-  }
+  }, [availableAromas, loading, tab]);

  function openProductDetail(id: string) {
    Taro.navigateTo({ url: `/pages/product-detail/index?id=${id}` });
  }

  const filtered = products.filter((p) => p.aromaType === tab);
-  const onSale = tab === 'QINGXIANG';

  return (
    <PageShell variant="tab" className="home-page no-tab-header">
@@ -70,11 +76,11 @@ export default function HomePage() {

      <View className="home-aroma-nav">
        <View className="home-aroma-tabs">
-          {AROMA_TABS.map((t) => (
+          {availableAromas.map((t) => (
            <Text
              key={t.key}
-              className={`home-aroma-tab${tab === t.key ? ' home-aroma-tab--active' : ''}${!t.open ? ' home-aroma-tab--muted' : ''}`}
-              onClick={() => onAromaTabClick(t.key, t.open)}
+              className={`home-aroma-tab${tab === t.key ? ' home-aroma-tab--active' : ''}`}
+              onClick={() => setTab(t.key)}
            >
              {t.label}
            </Text>
@@ -85,12 +91,10 @@ export default function HomePage() {

      <View className="home-product-list">
        {loading ? <View className="home-empty">加载中…</View> : null}
-        {!loading && !onSale ? <View className="home-empty">该香型暂未上线，敬请期待</View> : null}
-        {!loading && onSale && filtered.length === 0 ? (
-          <View className="home-empty">暂无商品</View>
+        {!loading && products.length === 0 ? (
+          <View className="home-empty">当前城市暂无在售商品</View>
        ) : null}
        {!loading &&
-          onSale &&
          filtered.map((p) => {
            const images = getProductImages(p);
            return (
@@ -150,6 +150,19 @@ export default function LoginPage() {
    return true;
  }

+  function cancelLogin() {
+    const pages = Taro.getCurrentPages();
+    if (pages.length > 1) {
+      Taro.navigateBack().catch(() => {
+        Taro.switchTab({ url: '/pages/home/index' });
+      });
+      return;
+    }
+    Taro.switchTab({ url: '/pages/home/index' }).catch(() => {
+      Taro.reLaunch({ url: '/pages/home/index' });
+    });
+  }
+
  function applySessionAndLeave(
    data: SessionPayload | WechatLoginResult,
    phoneValue?: string,
@@ -370,6 +383,12 @@ export default function LoginPage() {

  return (
    <PageShell variant="plain" className="login-page">
+      <View className="login-nav">
+        <View className="login-nav-back" onClick={cancelLogin}>
+          <Text className="login-nav-back-icon">‹</Text>
+          <Text>返回</Text>
+        </View>
+      </View>
      <View className="login-header">
        <View className="login-logo-wrap">
          <View className="login-logo">
@@ -523,6 +542,11 @@ export default function LoginPage() {
            <WechatLoginButton loading={wxLoading} label="授权登录" onClick={() => void wechatLogin()} />
          </>
        ) : null}
+
+        <View className="login-cancel-btn" onClick={cancelLogin}>
+          <Text>暂不登录，继续浏览</Text>
+        </View>
+        <Text className="login-cancel-hint">无需登录也可浏览商品和门店</Text>
      </View>
    </PageShell>
  );
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text, Image, Button, Input } from '@tarojs/components';
 import Taro, { useDidShow } from '@tarojs/taro';
 import { isWxAuthorizeEnabled, type ClientRuntimeConfig } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
@@ -10,8 +10,11 @@ import { goLogin } from '../../lib/auth-nav';
 import { bindWechatForUser } from '../../lib/wechat-auth';
 import {
  fetchMiniWechatUserInfo,
+  isDefaultMiniNickname,
  mergeWxDisplayProfile,
  needsWxProfileFill,
+  uploadAvatarTempFile,
+  uploadMiniWechatProfile,
 } from '../../lib/mini-wechat-profile';
 import { isLoggedIn, logout, request, toast, type UserProfile } from '../../lib/api';
 import { isWechatEnv } from '../../lib/weixin';
@@ -42,11 +45,18 @@ export default function MinePage() {
  const [orderCounts, setOrderCounts] = useState<Record<string, number>>({});
  const [wxAuthorize, setWxAuthorize] = useState(true);
  const [bindingWx, setBindingWx] = useState(false);
+  const [profileSheetOpen, setProfileSheetOpen] = useState(false);
+  const [draftAvatarTemp, setDraftAvatarTemp] = useState('');
+  const [draftAvatarUrl, setDraftAvatarUrl] = useState('');
+  const [draftNickname, setDraftNickname] = useState('');
+  const [savingProfile, setSavingProfile] = useState(false);
+  const [profileLoadError, setProfileLoadError] = useState('');

  function resetGuestState() {
    setProfile(null);
    setBenefitBalance(0);
    setOrderCounts({});
+    setProfileLoadError('');
  }

  function applyProfile(me: UserProfile) {
@@ -55,6 +65,7 @@ export default function MinePage() {

  function loadProfile() {
    if (!isLoggedIn()) return;
+    setProfileLoadError('');
    Promise.all([
      request<UserProfile>('/auth/me'),
      request<Array<Record<string, unknown>>>('/benefit/coupons').catch(() => []),
@@ -75,7 +86,16 @@ export default function MinePage() {
        });
        setOrderCounts(counts);
      })
-      .catch(() => {});
+      .catch((error) => {
+        if (!isLoggedIn()) {
+          setAuthed(false);
+          resetGuestState();
+          return;
+        }
+        const message = error instanceof Error ? error.message : '个人资料加载失败';
+        setProfileLoadError(message);
+        toast('个人资料加载失败，请点击重试');
+      });
  }

  useDidShow(() => {
@@ -135,22 +155,83 @@ export default function MinePage() {
      }
      return false;
    } catch (e) {
-      toast(e instanceof Error ? e.message : '微信授权失败');
+      toast(e instanceof Error ? e.message : '授权失败');
      return false;
    } finally {
      setBindingWx(false);
    }
  }

-  /** 未绑定微信时点击头像走授权（小程序 openId / H5 公众号 OAuth） */
+  function openProfileSheet(me?: UserProfile | null) {
+    const base = mergeWxDisplayProfile(
+      me || profile || { id: '', nickname: null, avatarUrl: null, hasWechat: false },
+    );
+    setDraftAvatarTemp('');
+    setDraftAvatarUrl(base.avatarUrl || '');
+    setDraftNickname(isDefaultMiniNickname(base.nickname) ? '' : base.nickname || '');
+    setProfileSheetOpen(true);
+  }
+
+  /** 点击头像：绑定账号后用 chooseAvatar + nickname 获取头像昵称 */
  async function handleAvatarTap() {
+    if (bindingWx || savingProfile) return;
    if (!isLoggedIn()) {
      goLogin('/pages/mine/index');
      return;
    }
-    if (profile?.hasWechat) return;
-    await ensureWechatBound();
-    loadProfile();
+    if (isWeapp) {
+      openProfileSheet();
+      return;
+    }
+    if (!profile?.hasWechat) {
+      const ok = await ensureWechatBound();
+      if (ok) loadProfile();
+    }
+    return;
+  }
+
+  async function onChooseAvatar(e: { detail?: { avatarUrl?: string } }) {
+    const tempPath = e.detail?.avatarUrl?.trim();
+    if (!tempPath) {
+      toast('未获取到头像，请重试');
+      return;
+    }
+    setDraftAvatarTemp(tempPath);
+    setDraftAvatarUrl(tempPath);
+  }
+
+  async function saveWxProfile() {
+    const nickname = draftNickname.trim();
+    if (!nickname) {
+      toast('请填写昵称');
+      return;
+    }
+    if (!draftAvatarTemp && !draftAvatarUrl) {
+      toast('请选择头像');
+      return;
+    }
+    setSavingProfile(true);
+    try {
+      let avatarUrl = draftAvatarUrl;
+      let avatarResourceId: string | undefined;
+      if (draftAvatarTemp) {
+        const uploaded = await uploadAvatarTempFile(draftAvatarTemp);
+        avatarUrl = uploaded.url;
+        avatarResourceId = uploaded.resourceId;
+      }
+      const updated = await uploadMiniWechatProfile({
+        nickname,
+        ...(avatarResourceId ? { avatarUrl, avatarResourceId } : {}),
+      });
+      if (updated) applyProfile(updated);
+      setProfileSheetOpen(false);
+      toast('头像昵称已更新', 'success');
+      loadProfile();
+    } catch (err) {
+      toast(err instanceof Error ? err.message : '保存失败');
+    } finally {
+      setSavingProfile(false);
+    }
  }

  function handleService(item: (typeof SERVICES)[number]) {
@@ -193,7 +274,9 @@ export default function MinePage() {
          </View>
        </View>
        <View className="mine-login-gate">
-          <View className="mine-login-gate-hint">登录后管理订单与个人信息</View>
+          <View className="mine-login-gate-hint">
+            登录后管理订单与个人信息；无需登录也可浏览商品和门店
+          </View>
          <View className="mine-login-btn" onClick={() => goLogin('/pages/mine/index')}>
            <Text>去登录</Text>
          </View>
@@ -213,8 +296,17 @@ export default function MinePage() {
    throw new Error('wx profile helpers missing');
  }
  const nickname = display.nickname || '用户';
-  const memberLabel = hasWechat ? '好客会员' : canWxAuth ? '未完成授权' : '未完成授权';
-  void needsWxProfileFill(display);
+  const needProfileFill = isWeapp && needsWxProfileFill(display);
+  const avatarProfileReady = isWeapp ? !needProfileFill : hasWechat;
+  const memberLabel = needProfileFill
+    ? '点击头像完善资料'
+    : isWeapp || hasWechat
+      ? '好客会员'
+      : canWxAuth
+        ? '点击头像授权'
+        : '好客会员';
+  const avatarClickable = isWeapp || (!hasWechat && canWxAuth);
+  const previewAvatar = draftAvatarUrl || display.avatarUrl;

  return (
    <PageShell variant="tab" className="mine-page no-tab-header">
@@ -223,26 +315,48 @@ export default function MinePage() {
        <View className="mine-header-texture" />
        <View className="mine-profile">
          <View
-            className={`mine-avatar-wrap${!hasWechat && canWxAuth ? ' mine-avatar-wrap--action' : ''}`}
-            onClick={!hasWechat && canWxAuth ? () => void handleAvatarTap() : undefined}
+            className={`mine-avatar-wrap${avatarClickable ? ' mine-avatar-wrap--action' : ''}`}
+            onClick={avatarClickable ? () => void handleAvatarTap() : undefined}
          >
            <View
-              className={`mine-avatar${hasWechat ? ' mine-avatar--wx-ok' : ' mine-avatar--wx-pending'}`}
+              className={`mine-avatar${
+                avatarProfileReady ? ' mine-avatar--wx-ok' : ' mine-avatar--wx-pending'
+              }`}
            >
              {renderAvatarContent(display.avatarUrl)}
            </View>
-            {!hasWechat && canWxAuth ? (
-              <View className="mine-avatar-status mine-avatar-status--pending">
-                <Text>{bindingWx ? '授权中' : '去授权'}</Text>
+            {avatarClickable ? (
+              <View
+                className={`mine-avatar-status${
+                  avatarProfileReady ? ' mine-avatar-status--ok' : ' mine-avatar-status--pending'
+                }`}
+              >
+                <Text>
+                  {bindingWx ? '授权中' : avatarProfileReady ? '更换' : '去完善'}
+                </Text>
              </View>
            ) : null}
          </View>

-          <View className="mine-profile-meta">
+          <View
+            className="mine-profile-meta"
+            onClick={avatarClickable ? () => void handleAvatarTap() : undefined}
+          >
            <Text className="mine-profile-name">{nickname}</Text>
-            <Text className={`mine-member-tag${hasWechat ? ' mine-member-tag--wechat' : ''}`}>
+            <Text className={`mine-member-tag${avatarProfileReady ? ' mine-member-tag--wechat' : ''}`}>
              {memberLabel}
            </Text>
+            {profileLoadError ? (
+              <Text
+                className="mine-profile-retry"
+                onClick={(event) => {
+                  event.stopPropagation();
+                  loadProfile();
+                }}
+              >
+                资料加载失败，点击重试
+              </Text>
+            ) : null}
          </View>
        </View>
      </View>
@@ -338,6 +452,58 @@ export default function MinePage() {
      </View>

      {shouldRenderPageTabBar() ? <UserTabBar selected={3} /> : null}
+
+      {profileSheetOpen ? (
+        <View className="mine-profile-sheet-mask" onClick={() => !savingProfile && setProfileSheetOpen(false)}>
+          <View className="mine-profile-sheet" onClick={(e) => e.stopPropagation()}>
+            <Text className="mine-profile-sheet-title">完善头像与昵称</Text>
+            <Text className="mine-profile-sheet-hint">
+              点击头像选择，并填写昵称后保存（用于个人中心展示）
+            </Text>
+            <Button
+              className="mine-profile-avatar-btn"
+              openType="chooseAvatar"
+              hoverClass="none"
+              onChooseAvatar={onChooseAvatar}
+            >
+              <View className="mine-profile-avatar-preview">
+                {previewAvatar ? (
+                  <Image className="mine-avatar-img" src={previewAvatar} mode="aspectFill" />
+                ) : (
+                  <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />
+                )}
+              </View>
+              <Text className="mine-profile-avatar-tip">点击选择头像</Text>
+            </Button>
+            <View className="mine-profile-nickname-wrap">
+              <Text className="mine-profile-nickname-label">昵称</Text>
+              <Input
+                className="mine-profile-nickname-input"
+                type="nickname"
+                maxlength={32}
+                placeholder="点击填写昵称"
+                value={draftNickname}
+                onInput={(e) => setDraftNickname(e.detail.value)}
+                onBlur={(e) => setDraftNickname(e.detail.value.trim())}
+              />
+            </View>
+            <View className="mine-profile-sheet-actions">
+              <View
+                className="mine-profile-sheet-cancel"
+                onClick={() => !savingProfile && setProfileSheetOpen(false)}
+              >
+                <Text>取消</Text>
+              </View>
+              <View
+                className={`mine-profile-sheet-save${savingProfile ? ' is-disabled' : ''}`}
+                onClick={savingProfile ? undefined : () => void saveWxProfile()}
+              >
+                <Text>{savingProfile ? '保存中...' : '保存'}</Text>
+              </View>
+            </View>
+          </View>
+        </View>
+      ) : null}
    </PageShell>
  );
 }
@@ -5,6 +5,7 @@ import PageShell from '../../components/PageShell';
 import SubPageHeader from '../../components/SubPageHeader';
 import ShareNavButton from '../../components/ShareNavButton';
 import WechatShareReady from '../../components/WechatShareReady';
+import ContactCsButton from '../../components/ContactCsButton';
 import { request, toast } from '../../lib/api';
 import { buildPayUrl } from '../../lib/checkout-nav';
 import { maskPhone } from '../../lib/phone';
@@ -14,6 +15,8 @@ import {
  toWeappShareMessage,
 } from '../../lib/wechat-share';

+const isWeapp = process.env.TARO_ENV === 'weapp';
+
 type OrderItem = {
  productName?: string;
  productSpec?: string;
@@ -104,8 +107,20 @@ export default function OrderDetailPage() {
    Taro.navigateTo({ url: buildPayUrl({ orderId: order.id }) });
  }

+  function goCustomerService() {
+    Taro.navigateTo({ url: '/pages/customer-service/index' });
+  }
+
+  const pageClass = [
+    'order-detail-page',
+    order ? 'order-detail-page--with-actions' : '',
+    canPay ? 'order-detail-page--with-pay' : '',
+  ]
+    .filter(Boolean)
+    .join(' ');
+
  return (
-    <PageShell variant="sub" className={`order-detail-page${canPay ? ' order-detail-page--with-pay' : ''}`}>
+    <PageShell variant="sub" className={pageClass}>
      <WechatShareReady payload={sharePayload} />
      <SubPageHeader
        title="订单详情"
@@ -173,19 +188,39 @@ export default function OrderDetailPage() {
        )}
      </View>

-      {canPay && order && (
-        <View className="pay-bar order-detail-pay-bar">
-          <View className="order-confirm-total">
-            <Text className="order-confirm-total-label">待支付</Text>
-            <Text className="order-confirm-total-value">
-              ¥{Number(order.payAmount ?? 0).toFixed(2)}
-            </Text>
-          </View>
-          <View className="order-confirm-submit" onClick={goPay}>
-            去付款
-          </View>
+      {order ? (
+        <View className={`order-detail-actionbar${canPay ? ' order-detail-actionbar--with-pay' : ''}`}>
+          {isWeapp ? (
+            <ContactCsButton
+              className="order-detail-cs-btn"
+              session={{
+                from: 'order-detail',
+                orderId: order.id,
+                orderNo: order.orderNo,
+              }}
+            >
+              联系客服
+            </ContactCsButton>
+          ) : (
+            <View className="order-detail-cs-btn" onClick={goCustomerService}>
+              <Text>联系客服</Text>
+            </View>
+          )}
+          {canPay ? (
+            <>
+              <View className="order-confirm-total">
+                <Text className="order-confirm-total-label">待支付</Text>
+                <Text className="order-confirm-total-value">
+                  ¥{Number(order.payAmount ?? 0).toFixed(2)}
+                </Text>
+              </View>
+              <View className="order-confirm-submit" onClick={goPay}>
+                去付款
+              </View>
+            </>
+          ) : null}
        </View>
-      )}
+      ) : null}
    </PageShell>
  );
 }
@@ -81,10 +81,6 @@
  border-bottom-color: var(--color-heritage-red);
 }

-.home-aroma-tab--muted {
-  opacity: 0.65;
-}
-
 .home-product-list {
  display: flex;
  flex-direction: column;
@@ -326,3 +326,51 @@
 .login-agreement-link {
  color: var(--color-heritage-red);
 }
+
+.login-nav {
+  min-height: 44px;
+  padding: 8px var(--space-page) 0;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+}
+
+.login-nav-back {
+  min-width: 72px;
+  min-height: 40px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  color: var(--color-on-surface);
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.login-nav-back-icon {
+  font-size: 30px;
+  line-height: 1;
+}
+
+.login-cancel-btn {
+  width: 100%;
+  min-height: 48px;
+  margin-top: 20px;
+  border: 1px solid var(--color-heritage-red);
+  border-radius: var(--radius-lg);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  color: var(--color-heritage-red);
+  font-size: 16px;
+  font-weight: 700;
+  background: #fff;
+}
+
+.login-cancel-hint {
+  display: block;
+  margin-top: 10px;
+  text-align: center;
+  color: var(--color-on-surface-variant);
+  font-size: 13px;
+}
@@ -149,6 +149,14 @@
  color: rgba(255, 255, 255, 0.9);
 }

+.mine-profile-retry {
+  display: block;
+  margin-top: 6px;
+  font-size: 11px;
+  color: #fff;
+  text-decoration: underline;
+}
+
 .mine-main {
  margin-top: -28px;
  position: relative;
@@ -367,3 +375,126 @@
  font-size: 15px;
  font-weight: 600;
 }
+
+.mine-profile-sheet-mask {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  background: rgba(20, 16, 14, 0.45);
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.mine-profile-sheet {
+  width: 100%;
+  max-width: 480px;
+  box-sizing: border-box;
+  background: #fff;
+  border-radius: 20px 20px 0 0;
+  padding: 20px 20px calc(20px + env(safe-area-inset-bottom, 0px));
+}
+
+.mine-profile-sheet-title {
+  display: block;
+  font-size: 17px;
+  font-weight: 700;
+  color: #1f1a17;
+  text-align: center;
+}
+
+.mine-profile-sheet-hint {
+  display: block;
+  margin-top: 8px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #8d706e;
+  text-align: center;
+}
+
+.mine-profile-avatar-btn {
+  margin: 20px auto 0;
+  padding: 0;
+  width: auto;
+  background: transparent;
+  border: none;
+  line-height: 1.2;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.mine-profile-avatar-btn::after {
+  border: none;
+}
+
+.mine-profile-avatar-preview {
+  width: 88px;
+  height: 88px;
+  border-radius: 50%;
+  overflow: hidden;
+  border: 2px solid rgba(166, 29, 36, 0.25);
+  background: #f7f4ef;
+}
+
+.mine-profile-avatar-tip {
+  margin-top: 8px;
+  font-size: 12px;
+  color: var(--color-heritage-red);
+  font-weight: 600;
+}
+
+.mine-profile-nickname-wrap {
+  margin-top: 18px;
+}
+
+.mine-profile-nickname-label {
+  display: block;
+  font-size: 13px;
+  color: #5c504c;
+  margin-bottom: 8px;
+}
+
+.mine-profile-nickname-input {
+  width: 100%;
+  box-sizing: border-box;
+  height: 44px;
+  padding: 0 14px;
+  border-radius: 12px;
+  background: #f7f4ef;
+  font-size: 15px;
+  color: #1f1a17;
+}
+
+.mine-profile-sheet-actions {
+  margin-top: 22px;
+  display: flex;
+  gap: 12px;
+}
+
+.mine-profile-sheet-cancel,
+.mine-profile-sheet-save {
+  flex: 1;
+  height: 44px;
+  border-radius: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 15px;
+  font-weight: 600;
+}
+
+.mine-profile-sheet-cancel {
+  background: #f0ebe4;
+  color: #5c504c;
+}
+
+.mine-profile-sheet-save {
+  background: var(--color-heritage-red);
+  color: #fff;
+}
+
+.mine-profile-sheet-save.is-disabled {
+  opacity: 0.65;
+  pointer-events: none;
+}
@@ -7,7 +7,8 @@
  min-height: 100vh;
 }

-.order-detail-page--with-pay .sub-page-body {
+.order-detail-page--with-pay .sub-page-body,
+.order-detail-page--with-actions .sub-page-body {
  padding-bottom: calc(88px + env(safe-area-inset-bottom, 0px));
 }

@@ -16,6 +17,57 @@
  gap: 12px;
 }

+.order-detail-actionbar {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 50;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px var(--space-page) calc(10px + env(safe-area-inset-bottom, 0px));
+  background: var(--color-card, #fff);
+  box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.06);
+  box-sizing: border-box;
+}
+
+.order-detail-actionbar--with-pay {
+  justify-content: space-between;
+}
+
+.order-detail-cs-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  min-width: 96px;
+  height: 40px;
+  padding: 0 14px;
+  margin: 0;
+  border: 1px solid var(--color-outline, #c8c4be);
+  border-radius: 999px;
+  background: transparent;
+  color: var(--color-on-surface);
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 1.2;
+  box-sizing: border-box;
+}
+
+.order-detail-cs-btn::after {
+  border: none;
+}
+
+.order-detail-actionbar .order-confirm-total {
+  flex: 1;
+  min-width: 0;
+}
+
+.order-detail-actionbar .order-confirm-submit {
+  flex-shrink: 0;
+}
+
 .order-card {
  background: var(--color-card);
  border-radius: var(--radius-lg);
@@ -499,27 +499,70 @@
  text-align: center;
 }

+.cs-brand {
+  display: block;
+  font-family: var(--font-headline);
+  font-size: 22px;
+  font-weight: 700;
+  color: var(--color-on-surface);
+  margin-bottom: 10px;
+}
+
 .cs-title {
  font-size: 14px;
  color: var(--color-subtle-gray);
  margin-bottom: 12px;
 }

-.cs-phone {
+.cs-phone,
+.cs-phone-display {
+  display: block;
  font-family: var(--font-headline);
-  font-size: 32px;
+  font-size: 28px;
  font-weight: 700;
  color: var(--color-heritage-red);
-  margin-bottom: 8px;
+  margin-top: 20px;
  letter-spacing: 1px;
 }

 .cs-hint {
+  display: block;
+  font-size: 14px;
+  color: var(--color-subtle-gray);
+  line-height: 1.5;
+  margin-bottom: 8px;
+  max-width: 280px;
+}
+
+.cs-hours {
+  display: block;
  font-size: 12px;
  color: var(--color-subtle-gray);
  margin-bottom: 32px;
 }

+.cs-online-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  max-width: 280px;
+  padding: 14px 24px;
+  margin: 0;
+  border: none;
+  border-radius: 999px;
+  background: var(--color-heritage-red);
+  color: #fff;
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 1.4;
+  box-sizing: border-box;
+}
+
+.cs-online-btn::after {
+  border: none;
+}
+
 .cs-call-btn {
  padding: 12px 32px;
  border-radius: 999px;
@@ -528,3 +571,12 @@
  font-size: 15px;
  font-weight: 600;
 }
+
+.cs-phone-link {
+  margin-top: 20px;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--color-subtle-gray);
+  text-decoration: underline;
+  text-underline-offset: 3px;
+}
@@ -1,15 +0,0 @@
-# 复制为 auto-release.env（勿提交 Git）
-# 服务器路径: /opt/dukang-haoke/deploy/auto-release.env
-
-APP_ROOT=/opt/dukang-haoke
-GIT_REMOTE=origin
-GIT_BRANCH=dev
-DEPLOY_GIT_REF=refs/heads/dev
-
-# Webhook 密钥（CodeUp 配置「Secret Token」时使用同一值）
-DEPLOY_WEBHOOK_SECRET=f85777004ea4435bf8b4d5813de8255d286a85d34ce2b30a
-
-DEPLOY_WEBHOOK_HOST=127.0.0.1
-DEPLOY_WEBHOOK_PORT=8095
-DEPLOY_LOG_FILE=/var/log/dukang/deploy.log
-DEPLOY_LOCK_FILE=/var/run/dukang-deploy.lock
@@ -45,6 +45,22 @@ export interface RedeemPhonePrepareDto {
  expireInSeconds: number;
 }

+export interface RedeemPhoneDirectPrepareRequest {
+  phone: string;
+  amount: number;
+}
+
+export interface RedeemPhoneDirectPrepareResult extends RedeemPhonePrepareDto {
+  totalBalance: number;
+  maskedPhone: string;
+  user: {
+    id: string;
+    userNo?: string | null;
+    nickname?: string | null;
+    phone?: string | null;
+  };
+}
+
 export type RedeemPendingStatus = 'PENDING' | 'COMPLETED' | 'REJECTED';

 export const REDEEM_PENDING_STATUS_LABELS: Record<RedeemPendingStatus, string> = {
@@ -16,7 +16,7 @@ import { ClientConfigController } from './client-config.controller';
 import { WechatLocationService } from './wechat-location.service';

@Module({
-  imports: [IamModule, IntegrationsModule, SystemConfigModule, forwardRef(() => AnalyticsModule)],
+  imports: [forwardRef(() => IamModule), IntegrationsModule, SystemConfigModule, forwardRef(() => AnalyticsModule)],
  controllers: [
    ResourceController,
    EventController,
@@ -102,6 +102,9 @@ export class ResourceService {
      });
      throw new BadRequestException(message);
    }
+    if (dto.bizType === 'AVATAR' && !file.mimetype?.startsWith('image/')) {
+      throw new BadRequestException('头像仅支持图片文件');
+    }

    try {
      const result = await this.oss.putObject({
@@ -125,6 +128,24 @@ export class ResourceService {
        externalNo: result.ossKey,
        status: 'SUCCESS',
      });
+      if (actor?.refType === 'USER' && dto.bizType === 'AVATAR' && dto.mediaType === 'IMAGE') {
+        const resource = await this.prisma.commonResource.create({
+          data: {
+            ownerType: 'USER',
+            ownerId: actor.refId,
+            bizType: 'AVATAR',
+            mediaType: 'IMAGE',
+            ossBucket: result.bucket,
+            ossKey: result.ossKey,
+            url: result.url,
+            fileName: file.originalname || 'avatar',
+            fileSize: BigInt(file.size),
+            mimeType: file.mimetype,
+            status: 'ACTIVE',
+          },
+        });
+        return serializeBigInt({ ...result, resourceId: resource.id });
+      }
      return result;
    } catch (err) {
      await logOssUpload(this.prisma, {
@@ -138,6 +159,37 @@ export class ResourceService {
    }
  }

+  async getOwnedActiveAvatar(resourceId: bigint, userId: bigint) {
+    const resource = await this.prisma.commonResource.findFirst({
+      where: {
+        id: resourceId,
+        ownerType: 'USER',
+        ownerId: userId,
+        bizType: 'AVATAR',
+        mediaType: 'IMAGE',
+        status: 'ACTIVE',
+      },
+    });
+    if (!resource) throw new BadRequestException('头像资源无效或不属于当前用户');
+    return resource;
+  }
+
+  async getOwnedActiveAvatarByUrl(url: string, userId: bigint) {
+    const resource = await this.prisma.commonResource.findFirst({
+      where: {
+        url,
+        ownerType: 'USER',
+        ownerId: userId,
+        bizType: 'AVATAR',
+        mediaType: 'IMAGE',
+        status: 'ACTIVE',
+      },
+      orderBy: { createdAt: 'desc' },
+    });
+    if (!resource) throw new BadRequestException('头像资源无效或不属于当前用户');
+    return resource;
+  }
+
  async register(dto: RegisterResourceDto) {
    const resource = await this.prisma.commonResource.create({
      data: {
@@ -2,6 +2,7 @@ import { randomUUID } from 'crypto';
 import {
  BadRequestException,
  ForbiddenException,
+  forwardRef,
  Inject,
  Injectable,
  NotFoundException,
@@ -22,6 +23,7 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
 import { verifyPassword } from '../../common/crypto/password.util';
 import { AnalyticsService } from '../analytics/analytics.service';
 import { UserAddressService } from './user-address.service';
+import { ResourceService } from '../common/resource.service';

 import type { User } from '@prisma/client';

@@ -62,6 +64,7 @@ export class AuthService {
    private readonly analyticsService: AnalyticsService,
    private readonly smsCodeStore: SmsCodeStore,
    private readonly userAddressService: UserAddressService,
+    @Inject(forwardRef(() => ResourceService)) private readonly resourceService: ResourceService,
  ) {}

  private assertMobilePhone(phone: string) {
@@ -1407,12 +1410,9 @@ export class AuthService {

  async updateMiniWechatProfile(
    userId: bigint,
-    input: { nickname?: string; avatarUrl?: string },
+    input: { nickname?: string; avatarUrl?: string; avatarResourceId?: string },
  ) {
    const user = await this.assertActiveUser(userId);
-    if (!user.wxOpenId) {
-      throw new BadRequestException('请先完成微信授权');
-    }

    const data: {
      nickname?: string;
@@ -1425,37 +1425,23 @@ export class AuthService {
    }

    const avatarUrl = input.avatarUrl?.trim();
-    if (avatarUrl) {
-      if (user.avatarResourceId) {
-        await this.prisma.commonResource.update({
-          where: { id: user.avatarResourceId },
-          data: { url: avatarUrl },
-        });
-      } else {
-        const avatar = await this.prisma.commonResource.create({
-          data: {
-            ownerType: 'USER',
-            ownerId: userId,
-            bizType: 'AVATAR',
-            mediaType: 'IMAGE',
-            ossBucket: 'wechat',
-            ossKey: `wx-avatar/${user.wxOpenId}`,
-            url: avatarUrl,
-            status: 'ACTIVE',
-          },
-        });
-        data.avatarResourceId = avatar.id;
+    const avatarResourceId = input.avatarResourceId?.trim();
+    if (avatarResourceId) {
+      let resourceId: bigint;
+      try {
+        resourceId = BigInt(avatarResourceId);
+      } catch {
+        throw new BadRequestException('头像资源编号无效');
      }
+      const avatar = await this.resourceService.getOwnedActiveAvatar(resourceId, userId);
+      data.avatarResourceId = avatar.id;
+    } else if (avatarUrl) {
+      // 兼容已发布旧客户端：只接受刚由当前用户上传并登记过的真实资源 URL。
+      const avatar = await this.resourceService.getOwnedActiveAvatarByUrl(avatarUrl, userId);
+      data.avatarResourceId = avatar.id;
    }

    if (!data.nickname && !data.avatarResourceId) {
-      if (avatarUrl && user.avatarResourceId) {
-        const refreshed = await this.prisma.user.findUnique({
-          where: { id: userId },
-          include: { avatar: true },
-        });
-        return this.formatUserProfile(refreshed ?? user);
-      }
      return this.formatUserProfile(user);
    }

@@ -118,6 +118,10 @@ export class MiniWechatProfileDto {
  @IsString()
  @IsOptional()
  avatarUrl?: string;
+
+  @IsString()
+  @IsOptional()
+  avatarResourceId?: string;
 }

 export class CheckPartnerPhoneDto {
@@ -24,10 +24,12 @@ import { PartnerPrimaryGuard } from '../../common/guards/partner-primary.guard';
 import { PartnerPermissionGuard } from '../../common/guards/partner-permission.guard';
 import { ShopStoreGuard } from '../../common/guards/shop-store.guard';
 import { StoreMembershipService } from '../../common/guards/store-membership.service';
+import { CommonModule } from '../common/common.module';

@Module({
  imports: [
    IntegrationsModule,
+    forwardRef(() => CommonModule),
    forwardRef(() => AnalyticsModule),
    JwtModule.register({
      secret: process.env.JWT_SECRET || 'dukang-prev1-dev-secret',
@@ -1,5 +1,6 @@
 import { Type } from 'class-transformer';
 import { IsNotEmpty, IsNumber, IsString, Min } from 'class-validator';
+import type { RedeemPhoneDirectPrepareRequest } from '@dukang/shared-types';

 export class RedeemPhoneSendLookupSmsDto {
  @IsString()
@@ -28,6 +29,17 @@ export class RedeemPhonePrepareDto {
  amount: number;
 }

+export class RedeemPhoneDirectPrepareDto implements RedeemPhoneDirectPrepareRequest {
+  @IsString()
+  @IsNotEmpty()
+  phone: string;
+
+  @Type(() => Number)
+  @IsNumber()
+  @Min(0.01)
+  amount: number;
+}
+
 export class RedeemPhoneConfirmDto {
  @IsString()
  @IsNotEmpty()
@@ -6,6 +6,7 @@ import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import {
  RedeemPhoneBalanceDto,
  RedeemPhoneConfirmDto,
+  RedeemPhoneDirectPrepareDto,
  RedeemPhonePrepareDto,
  RedeemPhoneSendLookupSmsDto,
 } from './dto/phone-redeem.dto';
@@ -107,6 +108,16 @@ export class ShopRedeemController {
    );
  }

+  @Post('phone/prepare-direct')
+  phonePrepareDirect(@CurrentUser() user: AuthUser, @Body() body: RedeemPhoneDirectPrepareDto) {
+    return this.redeemService.preparePhoneRedeemDirect(
+      user.actorId,
+      user.storeId!,
+      body.phone,
+      body.amount,
+    );
+  }
+
  @Post('phone/confirm')
  phoneConfirm(@CurrentUser() user: AuthUser, @Body() body: RedeemPhoneConfirmDto) {
    return this.redeemService.confirmPhoneRedeem(
@@ -311,6 +311,62 @@ export class RedeemService {
    return session;
  }

+  async preparePhoneRedeemDirect(
+    storeAccountId: bigint,
+    storeId: bigint,
+    phone: string,
+    amount: number,
+  ) {
+    const account = await this.loadOpenStoreAccount(storeAccountId, storeId);
+    const normalizedPhone = this.normalizeMobilePhone(phone);
+    const user = await this.resolveUserByPhone(normalizedPhone);
+    const { allocations, totalBalance } = await this.computeDirectAllocations(user.id, amount);
+    const sessionId = randomBytes(16).toString('hex');
+
+    await this.authService.sendSms(normalizedPhone, SmsScene.REDEEM_PHONE_CONFIRM, {
+      clientApp: ClientApp.SHOP_H5,
+    });
+
+    await this.redis.setJson(
+      this.phoneSessionKey(sessionId),
+      {
+        userId: user.id.toString(),
+        phone: normalizedPhone,
+        storeAccountId: storeAccountId.toString(),
+        storeId: account.storeId.toString(),
+        amount,
+        allocations,
+        confirmPrepared: true,
+      } satisfies PhoneRedeemSession,
+      REDEEM_PHONE_SESSION_TTL_SECONDS,
+    );
+
+    this.analyticsService.trackStoreOneSafe(storeAccountId, ClientApp.SHOP_H5, {
+      storeId: account.storeId,
+      eventName: 'store_redeem_phone_prepare',
+      extraJson: {
+        sessionId,
+        amount,
+        phone: this.maskPhoneForStore(normalizedPhone),
+        flow: 'direct',
+      },
+    });
+
+    return serializeBigInt({
+      sessionId,
+      amount,
+      totalBalance,
+      maskedPhone: this.maskPhoneForStore(normalizedPhone),
+      expireInSeconds: REDEEM_PHONE_SESSION_TTL_SECONDS,
+      user: {
+        id: user.id,
+        userNo: user.userNo,
+        nickname: user.nickname,
+        phone: this.maskPhoneForStore(normalizedPhone),
+      },
+    });
+  }
+
  async preparePhoneRedeem(storeAccountId: bigint, storeId: bigint, sessionId: string, amount: number) {
    const account = await this.loadOpenStoreAccount(storeAccountId, storeId);
    const session = await this.loadPhoneSession(sessionId, storeAccountId);
@@ -254,7 +254,7 @@
 | 模块 | 要点 |
 |------|------|
 | 登录 | 主账号/店员；多店选店（Wave 2）；7 天免登 |
-| 核销 | 扫码大按钮 + 手机号通道；今日汇总；弱网处理 |
+| 核销 | 扫码大按钮 + 手机号通道；手机号、金额、验证码与确认核销同页完成，先按手机号和金额发送验证码，验证成功后直接核销；今日汇总；弱网处理 |
 | 记录结算 | 筛今日/7日/1月/全部；到账金额×60%；T+1 出账 |
 | 提现 | 未出账可提（FIN 护栏）；提现记录；结算异议 3 工作日 |
 | 账号 | 主账号管理店员（Wave 2）；待处理核销单（Wave 3） |
Author	SHA1	Message	Date
ljy	56dfffd126	fix:增加小程序客服	2026-07-21 22:24:53 +08:00
jacy	bdf80e577b	fix(mini-user): address review blockers CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 13:03:02 +08:00
jacy	eb96b36d0b	feat(redeem): streamline phone redemption confirmation CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 11:41:06 +08:00
jacy	36bec94639	fix(h5): temporarily disable WeChat camera flows CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 11:18:51 +08:00
jacy	c11c7647b9	fix(h5): serve assets from dedicated domain roots CI / verify (pull_request) Has been cancelled Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:51:23 +08:00
jacy	83ed90ef67	feat(h5-auth): remember SMS sessions and simplify media access CI / verify (pull_request) Has been cancelled Details Hide WeChat login for shop and partner users, keep verified sessions for seven days, and allow JSSDK camera or album access without an OpenID binding. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:41:17 +08:00
jacy	73dbf6effb	chore(deploy): stop tracking auto-release.env; feat(mini-user): avatar profile sheet CI / verify (pull_request) Has been cancelled Details Remove secrets file from the index (keep local). Mine page can choose avatar and nickname via WeChat components. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-07-21 10:31:07 +08:00
jacy	b8adfe98a3	ignore	2026-07-21 10:19:09 +08:00