af-mobile-client-vue3 1.4.64 → 1.4.66

package/src/utils/platform-auth.ts

@@ -1,150 +1,150 @@
-/**
- * 统一平台认证工具类
- * 合并了 wechatUtil.ts, wechat.ts 和 auth-platform.ts 的功能
- */
-
-import type { RouteLocationNormalized } from 'vue-router'
-import { PLATFORM_ROUTE_MAP, PlatformType } from '@af-mobile-client-vue3/types/platform'
-import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
-/**
- * 认证参数接口
- */
-export interface AuthParams {
-  /** 授权码 */
-  code?: string
-  /** 状态参数 */
-  state?: string
-  /** 租户名称 */
-  tenantName?: string
-  /** 平台类型 */
-  platformType?: PlatformType
-  /** 错误信息 */
-  error?: string
-  /** 错误描述 */
-  error_description?: string
-}
-
-/**
- * 微信回调参数接口（向后兼容）
- */
-export interface WechatCallbackParams extends AuthParams { }
-
-/**
- * 外部用户检测结果接口
- */
-export interface ExternalUserResult {
-  /** 是否为外部用户 */
-  isExternal: boolean
-  /** 认证参数（仅当 isExternal 为 true 且有授权参数时存在） */
-  authParams?: {
-    code?: string
-    state?: string
-    tenantName?: string
-    platformType?: string
-    platformUserId?: string
-  }
-}
-
-/**
- * 统一的外部用户检测函数
- * 这是系统中唯一的用户类型检测入口，仅在路由守卫中调用
- * 集成了用户类型检测和认证参数解析功能
- *
- * @param to 目标路由对象
- * @returns 外部用户检测结果，包含是否为外部用户和认证参数
- */
-export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult {
-  console.log('[Platform Detection] 开始检测外部用户环境', { path: to.path, query: to.query })
-
-  // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
-  // 检查路由查询参数中是否有授权参数（code + state）
-  const { code, state, appData } = to.query
-  if (code && state) {
-    // 解析认证参数
-    const authParams = {
-      code: code as string,
-      state: state as string,
-      tenantName: state as string,
-      platformUserId: code as string,
-      platformType: PlatformType.WECHAT_OFFICIAL,
-    }
-
-    return {
-      isExternal: true,
-      authParams,
-    }
-  }
-
-  // 第二层检测：User-Agent环境检测
-  // 检查浏览器环境是否为第三方平台
-  const env = detectEnvironment()
-  //  微信小程序
-  if (env.isMiniprogram && appData) {
-    const authParams = {
-      platformType: PlatformType.WECHAT_MINI,
-      appData,
-    }
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams,
-    }
-  }
-  // 微信环境检测
-  if (env.isWechat) {
-    console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
-    return {
-      isExternal: true,
-      authParams: Object.assign(to.query, {
-        platformType: PlatformType.WECHAT_OFFICIAL,
-        tenantName: to.query.state as string || '',
-      }),
-    }
-  }
-
-  // 支付宝环境检测
-  if (env.isAlipayClient) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: {
-        platformType: PlatformType.ALIPAY,
-      },
-    }
-  }
-
-  // 钉钉环境检测
-  if (env.isDingTalk) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: {
-        platformType: PlatformType.DINGTALK,
-      },
-    }
-  }
-
-  // 第三层检测：路由前缀检测
-  // 检查路径是否以外部用户路由前缀开头
-  const platformPrefixes = Object.values(PLATFORM_ROUTE_MAP)
-  const isExternalRoute = platformPrefixes.some(prefix => to.path.startsWith(prefix)) || to.path.startsWith('/ex/')
-  if (isExternalRoute) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: Object.assign(to.query, {
-        platformType: PlatformType.WECHAT_OFFICIAL,
-        tenantName: to.query.state as string || '',
-      }),
-    }
-  }
-
-  // [Platform Detection] 未检测到外部用户环境，判定为内部用户
-  return { isExternal: false }
-}
-
-// 兼容性导出 - 保持向后兼容
-export function isWechat(): boolean {
-  const ua = navigator.userAgent.toLowerCase()
-  return /micromessenger/i.test(ua)
-}
+/**
+ * 统一平台认证工具类
+ * 合并了 wechatUtil.ts, wechat.ts 和 auth-platform.ts 的功能
+ */
+
+import type { RouteLocationNormalized } from 'vue-router'
+import { PLATFORM_ROUTE_MAP, PlatformType } from '@af-mobile-client-vue3/types/platform'
+import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
+/**
+ * 认证参数接口
+ */
+export interface AuthParams {
+  /** 授权码 */
+  code?: string
+  /** 状态参数 */
+  state?: string
+  /** 租户名称 */
+  tenantName?: string
+  /** 平台类型 */
+  platformType?: PlatformType
+  /** 错误信息 */
+  error?: string
+  /** 错误描述 */
+  error_description?: string
+}
+
+/**
+ * 微信回调参数接口（向后兼容）
+ */
+export interface WechatCallbackParams extends AuthParams { }
+
+/**
+ * 外部用户检测结果接口
+ */
+export interface ExternalUserResult {
+  /** 是否为外部用户 */
+  isExternal: boolean
+  /** 认证参数（仅当 isExternal 为 true 且有授权参数时存在） */
+  authParams?: {
+    code?: string
+    state?: string
+    tenantName?: string
+    platformType?: string
+    platformUserId?: string
+  }
+}
+
+/**
+ * 统一的外部用户检测函数
+ * 这是系统中唯一的用户类型检测入口，仅在路由守卫中调用
+ * 集成了用户类型检测和认证参数解析功能
+ *
+ * @param to 目标路由对象
+ * @returns 外部用户检测结果，包含是否为外部用户和认证参数
+ */
+export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult {
+  console.log('[Platform Detection] 开始检测外部用户环境', { path: to.path, query: to.query })
+
+  // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
+  // 检查路由查询参数中是否有授权参数（code + state）
+  const { code, state, appData } = to.query
+  if (code && state) {
+    // 解析认证参数
+    const authParams = {
+      code: code as string,
+      state: state as string,
+      tenantName: state as string,
+      platformUserId: code as string,
+      platformType: PlatformType.WECHAT_OFFICIAL,
+    }
+
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
+
+  // 第二层检测：User-Agent环境检测
+  // 检查浏览器环境是否为第三方平台
+  const env = detectEnvironment()
+  //  微信小程序
+  if (env.isMiniprogram && appData) {
+    const authParams = {
+      platformType: PlatformType.WECHAT_MINI,
+      appData,
+    }
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
+  // 微信环境检测
+  if (env.isWechat) {
+    console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
+    return {
+      isExternal: true,
+      authParams: Object.assign(to.query, {
+        platformType: PlatformType.WECHAT_OFFICIAL,
+        tenantName: to.query.state as string || '',
+      }),
+    }
+  }
+
+  // 支付宝环境检测
+  if (env.isAlipayClient) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.ALIPAY,
+      },
+    }
+  }
+
+  // 钉钉环境检测
+  if (env.isDingTalk) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.DINGTALK,
+      },
+    }
+  }
+
+  // 第三层检测：路由前缀检测
+  // 检查路径是否以外部用户路由前缀开头
+  const platformPrefixes = Object.values(PLATFORM_ROUTE_MAP)
+  const isExternalRoute = platformPrefixes.some(prefix => to.path.startsWith(prefix)) || to.path.startsWith('/ex/')
+  if (isExternalRoute) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: Object.assign(to.query, {
+        platformType: PlatformType.WECHAT_OFFICIAL,
+        tenantName: to.query.state as string || '',
+      }),
+    }
+  }
+
+  // [Platform Detection] 未检测到外部用户环境，判定为内部用户
+  return { isExternal: false }
+}
+
+// 兼容性导出 - 保持向后兼容
+export function isWechat(): boolean {
+  const ua = navigator.userAgent.toLowerCase()
+  return /micromessenger/i.test(ua)
+}

package/src/views/external/index.vue

@@ -1,158 +1,158 @@
-<script setup lang="ts">
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import { getPlatformConfig, getPlatformRoutePrefix } from '@af-mobile-client-vue3/types/platform'
-import {
-  Icon as VanIcon,
-} from 'vant'
-import { computed } from 'vue'
-import { useRouter } from 'vue-router'
-
-const router = useRouter()
-const userStore = useUserStore()
-
-const userInfo = computed(() => userStore.getUserInfo())
-const userName = computed(() => userInfo.value?.name || '外部用户')
-const platformType = computed(() => userStore.getPlatformType())
-const platformConfig = computed(() => getPlatformConfig(platformType.value))
-const userDescription = computed(() =>
-  platformConfig.value?.description || '外部系统访问用户',
-)
-
-function goToProfile() {
-  const routePrefix = getPlatformRoutePrefix(platformType.value)
-  router.push(`${routePrefix}/my`)
-}
-async function clean() {
-  await useUserStore().registerClean()
-}
-</script>
-
-<template>
-  <main class="external_main">
-    <!-- 顶部导航栏 -->
-    <nav class="header_nav">
-      <div class="header_content">
-        <h1 class="main_title">
-          智慧燃气外部系统
-        </h1>
-        <div class="user_section" @click="goToProfile">
-          <VanIcon name="user-o" class="user-icon" />
-        </div>
-      </div>
-    </nav>
-
-    <!-- 主要内容区域 -->
-    <div class="content">
-      <!-- 用户信息卡片 -->
-      <div class="user-card">
-        <div class="user-content">
-          <div class="user-info">
-            <VanIcon name="user-circle-o" size="64" color="#3b82f6" />
-            <h2 class="user-name">
-              {{ userName }}
-            </h2>
-            <p class="user-desc">
-              {{ userDescription }}
-            </p>
-            <p v-if="platformConfig" class="platform-name">
-              {{ platformConfig.name }}
-            </p>
-            <p class="platform-name" @click="clean">
-              清理缓存
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </main>
-</template>
-
-<style scoped lang="less">
-.external_main {
-  min-height: 100vh;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-
-  .header_nav {
-    background: rgba(255, 255, 255, 0.95);
-    backdrop-filter: blur(10px);
-    padding: 0 16px;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-
-    .header_content {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 56px;
-
-      .main_title {
-        font-size: 1.125rem;
-        font-weight: 600;
-        color: #333;
-        margin: 0;
-      }
-
-      .user_section {
-        padding: 8px;
-        cursor: pointer;
-        border-radius: 50%;
-        background: rgba(59, 130, 246, 0.1);
-        transition: all 0.3s ease;
-
-        &:active {
-          background: rgba(59, 130, 246, 0.2);
-        }
-
-        .user-icon {
-          font-size: 20px;
-          color: #3b82f6;
-        }
-      }
-    }
-  }
-
-  .content {
-    padding: 24px 16px;
-    display: flex;
-    justify-content: center;
-
-    .user-card {
-      width: 100%;
-      max-width: 400px;
-      border-radius: 12px;
-      overflow: hidden;
-      background: rgba(255, 255, 255, 0.95);
-      backdrop-filter: blur(10px);
-
-      :deep(.van-card__content) {
-        padding: 32px 24px;
-      }
-
-      .user-content {
-        .user-info {
-          text-align: center;
-
-          .user-name {
-            font-size: 24px;
-            font-weight: 600;
-            color: #333;
-            margin: 16px 0 8px 0;
-          }
-
-          .user-desc {
-            font-size: 14px;
-            color: #666;
-            margin: 0;
-          }
-
-          .platform-name {
-            font-size: 12px;
-            color: #3b82f6;
-            margin: 4px 0 0 0;
-            font-weight: 500;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
+<script setup lang="ts">
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { getPlatformConfig, getPlatformRoutePrefix } from '@af-mobile-client-vue3/types/platform'
+import {
+  Icon as VanIcon,
+} from 'vant'
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+const userStore = useUserStore()
+
+const userInfo = computed(() => userStore.getUserInfo())
+const userName = computed(() => userInfo.value?.name || '外部用户')
+const platformType = computed(() => userStore.getPlatformType())
+const platformConfig = computed(() => getPlatformConfig(platformType.value))
+const userDescription = computed(() =>
+  platformConfig.value?.description || '外部系统访问用户',
+)
+
+function goToProfile() {
+  const routePrefix = getPlatformRoutePrefix(platformType.value)
+  router.push(`${routePrefix}/my`)
+}
+async function clean() {
+  await useUserStore().registerClean()
+}
+</script>
+
+<template>
+  <main class="external_main">
+    <!-- 顶部导航栏 -->
+    <nav class="header_nav">
+      <div class="header_content">
+        <h1 class="main_title">
+          智慧燃气外部系统
+        </h1>
+        <div class="user_section" @click="goToProfile">
+          <VanIcon name="user-o" class="user-icon" />
+        </div>
+      </div>
+    </nav>
+
+    <!-- 主要内容区域 -->
+    <div class="content">
+      <!-- 用户信息卡片 -->
+      <div class="user-card">
+        <div class="user-content">
+          <div class="user-info">
+            <VanIcon name="user-circle-o" size="64" color="#3b82f6" />
+            <h2 class="user-name">
+              {{ userName }}
+            </h2>
+            <p class="user-desc">
+              {{ userDescription }}
+            </p>
+            <p v-if="platformConfig" class="platform-name">
+              {{ platformConfig.name }}
+            </p>
+            <p class="platform-name" @click="clean">
+              清理缓存
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+</template>
+
+<style scoped lang="less">
+.external_main {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+
+  .header_nav {
+    background: rgba(255, 255, 255, 0.95);
+    backdrop-filter: blur(10px);
+    padding: 0 16px;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+
+    .header_content {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 56px;
+
+      .main_title {
+        font-size: 1.125rem;
+        font-weight: 600;
+        color: #333;
+        margin: 0;
+      }
+
+      .user_section {
+        padding: 8px;
+        cursor: pointer;
+        border-radius: 50%;
+        background: rgba(59, 130, 246, 0.1);
+        transition: all 0.3s ease;
+
+        &:active {
+          background: rgba(59, 130, 246, 0.2);
+        }
+
+        .user-icon {
+          font-size: 20px;
+          color: #3b82f6;
+        }
+      }
+    }
+  }
+
+  .content {
+    padding: 24px 16px;
+    display: flex;
+    justify-content: center;
+
+    .user-card {
+      width: 100%;
+      max-width: 400px;
+      border-radius: 12px;
+      overflow: hidden;
+      background: rgba(255, 255, 255, 0.95);
+      backdrop-filter: blur(10px);
+
+      :deep(.van-card__content) {
+        padding: 32px 24px;
+      }
+
+      .user-content {
+        .user-info {
+          text-align: center;
+
+          .user-name {
+            font-size: 24px;
+            font-weight: 600;
+            color: #333;
+            margin: 16px 0 8px 0;
+          }
+
+          .user-desc {
+            font-size: 14px;
+            color: #666;
+            margin: 0;
+          }
+
+          .platform-name {
+            font-size: 12px;
+            color: #3b82f6;
+            margin: 4px 0 0 0;
+            font-weight: 500;
+          }
+        }
+      }
+    }
+  }
+}
+</style>