fix:完善门店和总部管理端

This commit is contained in:
ljy
2026-07-06 20:58:38 +08:00
parent 67b5a580c5
commit fcf1d45522
25 changed files with 1273 additions and 118 deletions
+14
View File
@@ -0,0 +1,14 @@
import QRCode from 'qrcode';
export async function buildPromoQrDataUrl(landingUrl: string): Promise<string> {
return QRCode.toDataURL(landingUrl, {
width: 400,
margin: 1,
color: { dark: '#1f1a17', light: '#ffffff' },
});
}
export function promoConversion(scan: number, orders: number): string {
if (scan <= 0) return '0%';
return `${Math.round((orders / scan) * 1000) / 10}%`;
}
+6 -27
View File
@@ -1,20 +1,9 @@
import type { WechatLoginResult } from '@dukang/shared-types';
import Taro from '@tarojs/taro';
import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
import { request, saveToken } from './api';
import { isWechatEnv, weixinSdk } from './weixin';
let clientConfigCache: { mockWechat?: boolean } | null = null;
async function fetchClientConfig(): Promise<{ mockWechat?: boolean }> {
if (clientConfigCache) return clientConfigCache;
try {
clientConfigCache = await request<{ mockWechat?: boolean }>('/common/client-config');
} catch {
clientConfigCache = {};
}
return clientConfigCache;
}
/** 处理微信登录/绑定结果,返回是否已拿到 token 可进入首页 */
export function handleHqWechatLoginResult(result: WechatLoginResult): boolean {
if (!result.accessToken) return false;
@@ -32,7 +21,7 @@ export async function handleHqWechatCallback(): Promise<WechatLoginResult | null
}
/**
* 微信一键登录(与合伙人端一致:微信内走公众号 OAuth,浏览器 Mock 演示)。
* 微信授权登录(对齐 C 端:H5 仅微信内置浏览器走 OAuth)。
* 返回 true = 已登录;void = 已跳转授权页等待回调。
*/
export async function loginHqWithWechat(): Promise<boolean | void> {
@@ -45,21 +34,11 @@ export async function loginHqWithWechat(): Promise<boolean | void> {
return handleHqWechatLoginResult(result);
}
if (isWechatEnv()) {
const result = await weixinSdk.login();
if (result) return handleHqWechatLoginResult(result);
return;
if (!isWechatEnv()) {
throw new Error(WECHAT_INAPP_REQUIRED_MSG);
}
const cfg = await fetchClientConfig();
if (!cfg.mockWechat) {
throw new Error('请在微信内打开以使用微信一键登录');
}
const result = await request<WechatLoginResult>('/admin/auth/login/wechat', {
method: 'POST',
data: { code: `mockcode_${Date.now()}`, platform: 'h5' },
});
return handleHqWechatLoginResult(result);
const result = await weixinSdk.login();
if (result) return handleHqWechatLoginResult(result);
}
/** 短信登录成功后于微信内自动发起 OAuth,绑定 openId 便于后续免登 */