h5微信授权

apps/mini-user/src/lib/user-location.ts

@@ -1,7 +1,9 @@
 import Taro from '@tarojs/taro';
-import { request } from './api';
+import { getWechatLocationDetailed } from '@dukang/weixin-sdk';
+import { API_BASE, getToken, request } from './api';
 import { DEFAULT_REGION, regionFromGeo, type RegionSelection } from './region-data';
 import { FALLBACK_CITY_CODE } from './product-images';
+import { ClientApp } from '@dukang/shared-types';
 
 export const GPS_CITY_STORAGE_KEY = 'dukang_gps_city';
 
@@ -108,7 +110,7 @@ async function promptLocationAuth() {
   }).catch(() => {});
 }
 
-function getLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
+function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
   return new Promise((resolve, reject) => {
     Taro.getLocation({
       type: 'gcj02',
@@ -118,6 +120,37 @@ function getLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
   });
 }
 
+async function resolveViaH5Jssdk(): Promise<ResolvedUserCity | null> {
+  const outcome = await getWechatLocationDetailed({
+    apiBase: API_BASE,
+    clientApp: ClientApp.USER_H5,
+    getAccessToken: () => getToken() || null,
+  });
+
+  if (!outcome.location) {
+    await reportLocationToServer({
+      sdk: outcome.sdk,
+      status: 'fail',
+      errMsg: outcome.errMsg,
+    }).catch(() => {});
+    return null;
+  }
+
+  try {
+    const data = await reportLocationToServer({
+      latitude: outcome.location.latitude,
+      longitude: outcome.location.longitude,
+      sdk: outcome.sdk,
+      status: 'success',
+    });
+    const resolved = toResolved(data);
+    if (resolved) writeCache(resolved);
+    return resolved;
+  } catch {
+    return null;
+  }
+}
+
 /** 获取并解析用户当前城市；失败返回郑州市兜底 */
 export async function resolveUserCity(force = false): Promise<ResolvedUserCity> {
   if (!force) {
@@ -125,12 +158,17 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
     if (cached) return cached;
   }
 
+  if (process.env.TARO_ENV === 'h5') {
+    const fromJssdk = await resolveViaH5Jssdk();
+    return fromJssdk ?? FALLBACK_CITY;
+  }
+
   if (process.env.TARO_ENV !== 'weapp') {
     return FALLBACK_CITY;
   }
 
   try {
-    const loc = await getLocation();
+    const loc = await getMiniLocation();
     const data = await reportLocationToServer({
       latitude: loc.latitude,
       longitude: loc.longitude,