af-mobile-client-vue3 1.3.41 → 1.3.42

package/certs/127.0.0.1+2-key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChKsPmzaqY3iw4
+nugwJIdl/Xf4HA33hxiNs1u5VnL/DceCz/6uOfj/pi1w3N4Zzn8j58aY5Oh2HTDJ
+laaDEHQmq7suBgeAVIJoplr4SDQEyecehqH5bHt4MnJ5ize1ldNxzXgO5a2XwfPz
+YxWw90jZk1QEQIgS1Ip90amJk7al+M/+dIb61uoET/xLIrcVXtc9lzglPyZpNYQd
+LB0hkjd+Ed8c5Hx90/gc/JJh3Ur1YfWREr4SJwfz1+KbUGbADEFwaLX6G5Hma6qi
+gC3OZ13M1+bxpxT01+TGtPzUhFADFF+ychj8v4U4UbypgsiW9Wya7LHRNUfODmXc
+UT2M5O/pAgMBAAECggEAUtmDH3D2k+MSZID751O/7uQf+gGiBG8EZkOfkWUpdIgG
+2e5GhBX1NKaekXhZDHck0LZjV1HFVoKnA9nUYWfh7cc2T/B1hrjq2RU7iorDgvqv
+vveC6I+l4SI9ytGQb953dfckErRrSqo/2AxFqFVWs9KSzCTITrXIA+n1921h5Wtz
+2UGsiyt7SR9ASOQ9o16QlDBNan7SulQyIam/NHaiDuyoB8bBxrewPGIx12vESbeK
+NlpZhWd9jzcdkfLudIiCkp2XQ3lQsQHHNIgTij2GsYEE6hb4jLIfRsuUz6IHdFcE
+gnqnXtUJPUMMmaoz6sFG3yLjHrsMUfSShDzMp19ViQKBgQDJzZ1fL+ZhQd7kTR4N
+zDexXHcuHFXhXJ8VuXKcCgc5K4wt88yVQTNWwWRw27RFIh75DHQhm3FQiGydf+HM
+8k7riKA0ab3/AO5u9JYNf+Pbz0k/+rthWk/qA4N/New2eJaJMZcguwCRtg7h1Ecr
+JvcVxKkxwdCvPNwq8IKeyOyS1wKBgQDMc1Uok5sPhn/LSjqnUCRlyzv1tbgJPRsZ
+1RU2wouRJc5b0usPJi9bX4642O2eTfd4mwQpPS4WcYnXVA2+qVG+rs6WAvMN10LI
+SIICIzFrah1GyXs8baILE9bfJamB+YFAOF7DPK6dDHLlEg/ZhUqKr/PwoU1Cjro6
+Xiwy7Gz7PwKBgQC44TgBAbg1eAyE6iXTjDmlssm5I9qGGb3hQEHAtOtDNCM74jSW
+tOIc5BZp0s6H26e2kPM/6tHYbvPbI1Kx2Xf2Dvh+rDWVjrviSQ/DlFwjf/ditwm+
+Oegmw0tQWw1qJfX8AMOtB8WQuNNPj5QX853AgqhjXmYadU5bxHZWlEswhwKBgCMP
+uE/wGExuTWYogayFwuguFUdK9ZeoAgjJEQ1GCbdHm38FycfcTYzG82vhz8YxKrpl
+Iy6LTmcM642g3YaP9PPVeJojQVljTBGa1ajWLjh0hzbHgLnZN0vdCCFWjR48Ep1X
+zXB/7JYEN4PvOAaepCzqhdQDZYN/hJJT6hKFlx7zAoGAC2wxKt0MdQCX8f9B8Lhj
+3zl6ehRrfM0Ah/4Bf8845AQcS1K8FeDgU7glacz8EAKX2XUx+y2KqOb2Wiw+LwVi
+kAl60oJBZxpuK/upjlOykWP9wOrpWtEYgqlu3ilOFLNQUb0h/7oL9fvfinUzij/V
+PkQrsv2j4+R8OHWD5VN1IiA=
+-----END PRIVATE KEY-----

package/certs/127.0.0.1+2.pem

@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkTCCAvmgAwIBAgIQcMK+bOM3fXEWrBMEL3//XDANBgkqhkiG9w0BAQsFADCB
+pTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMT0wOwYDVQQLDDRMQVBU
+T1AtOUxOR0xKQktc5ZSQ5qKT54OoQExBUFRPUC05TE5HTEpCSyAodGFuZ3ppeWUp
+MUQwQgYDVQQDDDtta2NlcnQgTEFQVE9QLTlMTkdMSkJLXOWUkOaik+eDqEBMQVBU
+T1AtOUxOR0xKQksgKHRhbmd6aXllKTAeFw0yNDA5MDQwNjI4MThaFw0yNjEyMDQw
+NjI4MThaMGgxJzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0
+ZTE9MDsGA1UECww0TEFQVE9QLTlMTkdMSkJLXOWUkOaik+eDqEBMQVBUT1AtOUxO
+R0xKQksgKHRhbmd6aXllKTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKEqw+bNqpjeLDie6DAkh2X9d/gcDfeHGI2zW7lWcv8Nx4LP/q45+P+mLXDc3hnO
+fyPnxpjk6HYdMMmVpoMQdCaruy4GB4BUgmimWvhINATJ5x6Goflse3gycnmLN7WV
+03HNeA7lrZfB8/NjFbD3SNmTVARAiBLUin3RqYmTtqX4z/50hvrW6gRP/EsitxVe
+1z2XOCU/Jmk1hB0sHSGSN34R3xzkfH3T+Bz8kmHdSvVh9ZESvhInB/PX4ptQZsAM
+QXBotfobkeZrqqKALc5nXczX5vGnFPTX5Ma0/NSEUAMUX7JyGPy/hThRvKmCyJb1
+bJrssdE1R84OZdxRPYzk7+kCAwEAAaN5MHcwDgYDVR0PAQH/BAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMB8GA1UdIwQYMBaAFChzYGTua1EmLuS4rXqUekjNK40r
+MC8GA1UdEQQoMCaCCWxvY2FsaG9zdIITd3d3LmFvZmVuZ2Nsb3VkLmNvbYcEfwAA
+ATANBgkqhkiG9w0BAQsFAAOCAYEAhVvhN3eEEw2jmJ+ey2h7eLoZkuTIlJpJymPj
+pXea4LBj+q3MHNXO5SRjc5QzB6As5GOLld++JDLOUkL/4IA+E6IFNWyDS7pS2EdP
+G61nc3v7Os4g/ZElXA3xePYEfHewTURe5NagEHx+jdXEwK4nEChrJxmlbNgk6VEL
+TYDLhA0bWWm7/CMv1oPOXWPLI5BDi56HnjJVXem6JpOwiHRmiZcj1DvP9m52+8f9
+g94Q9zMBvwpNneaNAcUgATxykMjZoLJBCe1EdqmO0xXEJI6Cz8nJEp6CJBl5Vi/t
+deKITXWe7ZP2/temIHG3Tv62l3/XQqdCvztgk50aW8YGyci243k7YDgWuULPvDf1
+N0cUEC3PYKnkhhSWyy91aMyrsorWGpsjrb6xgla+0SpHNb+ZAl1SEY5VqTOsWxE/
+qAQ+5xHN1EnrIqtNX7Lzp/7ekq0OQTP/U9D2soLpX7jlnWgQPnoBrNmOYr26UpzB
+os3c4GV0Cr9AChbLjbWPn7D9+cA1
+-----END CERTIFICATE-----

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.41",
+  "version": "1.3.42",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {
@@ -43,7 +43,8 @@
     "vue": "^3.5.17",
     "vue-i18n": "^11.1.10",
     "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3"
+    "vue3-hash-calendar": "^1.1.3",
+    "weixin-js-sdk": "^1.6.5"
   },
   "devDependencies": {
     "@antfu/eslint-config": "4.17.0",

package/src/api/user/index.ts

@@ -1,40 +1,40 @@
-import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
-
-import { get, post } from '@af-mobile-client-vue3/services/restTools'
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-export interface BasicResponseModel<T = any> {
-  code: number
-  msg: string
-  data: T
-}
-
-export function login(data: any) {
-  return post(
-    loginApi.Login,
-    data,
-  )
-}
-
-export function OALogin(data: any) {
-  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
-}
-
-/**
- * @description: 获取用户信息
- */
-export function getUserInfo() {
-  return get(
-    '/getUserInfo',
-  )
-}
-
-/**
- * @description: 用户登出
- */
-export function doLogout() {
-  return http.request({
-    url: loginApi.Logout,
-    method: 'DELETE',
-  })
-}
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+import { get, post } from '@af-mobile-client-vue3/services/restTools'
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+export interface BasicResponseModel<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+export function login(data: any) {
+  return post(
+    loginApi.Login,
+    data,
+  )
+}
+
+export function OALogin(data: any) {
+  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
+}
+
+/**
+ * @description: 获取用户信息
+ */
+export function getUserInfo() {
+  return get(
+    '/getUserInfo',
+  )
+}
+
+/**
+ * @description: 用户登出
+ */
+export function doLogout() {
+  return http.request({
+    url: loginApi.Logout,
+    method: 'DELETE',
+  })
+}

package/src/router/routes.ts

@@ -155,7 +155,7 @@ const routes: Array<RouteRecordRaw> = [
         component: XFormAppraiseView,
       },
       {
-        path: '/Component/XFormView',
+        path: '/Component/XFormView/:id/:openid',
         name: 'XFormView',
         component: XFormView,
       },

package/src/services/api/Login.ts

@@ -1,6 +1,6 @@
-const loginApi = {
-  Login: '/af-auth/login',
-  Logout: '/af-auth/logout',
-}
-
-export { loginApi }
+const loginApi = {
+  Login: '/af-auth/login',
+  Logout: '/af-auth/logout',
+}
+
+export { loginApi }

package/src/stores/modules/user.ts

@@ -250,6 +250,21 @@ export const useUserStore = defineStore('app-user', () => {
       return Promise.reject(error)
     }
   }
+  const loginExternalMini = async (data: any) => {
+    try {
+      // 设置Token
+      setToken(data.access_token)
+
+      // 加密存储登录票据
+      const LoginTicket = crypto.AESEncrypt(JSON.stringify(data), '3KMKqvgwR8ULbR8Z')
+      Storage.set('LoginTicket', LoginTicket)
+
+      return Promise.resolve(data)
+    }
+    catch (error) {
+      return Promise.reject(error)
+    }
+  }
 
   const logout = async () => {
     if (getToken()) {
@@ -294,6 +309,7 @@ export const useUserStore = defineStore('app-user', () => {
     Login,
     loginUnified,
     loginExternal,
+    loginExternalMini,
     getToken,
     getLastUpdateTime,
     logout,

package/src/styles/login.less

@@ -1,109 +1,109 @@
-html:not(.dark) {
-  .form {
-    .form_field {
-      :deep(.van-field__label) {
-        color: rgb(88, 88, 88);
-      }
-      :deep(.van-field__body) {
-        background: rgb(251, 251, 251);
-        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
-        color: rgb(71, 71, 71);
-      }
-      :deep(.van-cell) {
-        background: #ffffff;
-      }
-    }
-    .extra_setting {
-      .extra_setting_for_remember_password {
-        color: rgb(88, 88, 88);
-      }
-    }
-  }
-}
-.form {
-  width: 100%;
-  padding: 0 40px;
-  .form_field {
-    padding-right: 0;
-    padding-left: 0;
-    :deep(.van-field__label) {
-      opacity: 0.7;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 23px;
-      text-transform: uppercase;
-      text-indent: 10px;
-    }
-    :deep(.van-field__body) {
-      height: 40px;
-      border-radius: 5px;
-      font-size: 16px;
-      font-weight: 400;
-      padding: 8px 10px;
-      opacity: 0.6;
-    }
-  }
-  .extra_setting {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 12px;
-    .extra_setting_for_remember_password {
-      opacity: 0.7;
-      span {
-        position: relative;
-        bottom: 3px;
-        left: 5px;
-      }
-    }
-    .extra_setting_for_reset_password {
-      position: relative;
-      top: 2px;
-      opacity: 0.7;
-      color: rgb(56, 149, 250);
-    }
-  }
-  .btn {
-    height: 50px;
-    :deep(.van-button__text) {
-      color: rgb(255, 255, 255);
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 23px;
-    }
-  }
-  .login_btn {
-    background: rgb(56, 149, 250);
-    margin-top: 104px;
-  }
-  .reset_btn {
-    margin: 24px 0;
-  }
-  .back_btn {
-    :deep(.van-button__text) {
-      color: rgb(56, 149, 250);
-    }
-  }
-  :deep(.van-cell:after) {
-    border-bottom: none;
-  }
-}
-.login_form {
-  margin-top: 65px;
-}
-.forget_password_form {
-  margin-top: 15px;
-}
-/* 使图标垂直居中 */
-.wechat-login-btn .van-icon {
-  vertical-align: middle;
-}
-/* 悬停效果 */
-.wechat-login-btn:hover {
-  background-color: #06ad56 !important;
-  border-color: #06ad56 !important;
-}
-/* 点击效果 */
-.wechat-login-btn:active {
-  background-color: #05994c !important;
-  border-color: #05994c !important;
-}
+html:not(.dark) {
+  .form {
+    .form_field {
+      :deep(.van-field__label) {
+        color: rgb(88, 88, 88);
+      }
+      :deep(.van-field__body) {
+        background: rgb(251, 251, 251);
+        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
+        color: rgb(71, 71, 71);
+      }
+      :deep(.van-cell) {
+        background: #ffffff;
+      }
+    }
+    .extra_setting {
+      .extra_setting_for_remember_password {
+        color: rgb(88, 88, 88);
+      }
+    }
+  }
+}
+.form {
+  width: 100%;
+  padding: 0 40px;
+  .form_field {
+    padding-right: 0;
+    padding-left: 0;
+    :deep(.van-field__label) {
+      opacity: 0.7;
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 23px;
+      text-transform: uppercase;
+      text-indent: 10px;
+    }
+    :deep(.van-field__body) {
+      height: 40px;
+      border-radius: 5px;
+      font-size: 16px;
+      font-weight: 400;
+      padding: 8px 10px;
+      opacity: 0.6;
+    }
+  }
+  .extra_setting {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 12px;
+    .extra_setting_for_remember_password {
+      opacity: 0.7;
+      span {
+        position: relative;
+        bottom: 3px;
+        left: 5px;
+      }
+    }
+    .extra_setting_for_reset_password {
+      position: relative;
+      top: 2px;
+      opacity: 0.7;
+      color: rgb(56, 149, 250);
+    }
+  }
+  .btn {
+    height: 50px;
+    :deep(.van-button__text) {
+      color: rgb(255, 255, 255);
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+    }
+  }
+  .login_btn {
+    background: rgb(56, 149, 250);
+    margin-top: 104px;
+  }
+  .reset_btn {
+    margin: 24px 0;
+  }
+  .back_btn {
+    :deep(.van-button__text) {
+      color: rgb(56, 149, 250);
+    }
+  }
+  :deep(.van-cell:after) {
+    border-bottom: none;
+  }
+}
+.login_form {
+  margin-top: 65px;
+}
+.forget_password_form {
+  margin-top: 15px;
+}
+/* 使图标垂直居中 */
+.wechat-login-btn .van-icon {
+  vertical-align: middle;
+}
+/* 悬停效果 */
+.wechat-login-btn:hover {
+  background-color: #06ad56 !important;
+  border-color: #06ad56 !important;
+}
+/* 点击效果 */
+.wechat-login-btn:active {
+  background-color: #05994c !important;
+  border-color: #05994c !important;
+}

package/src/utils/environment.ts

@@ -0,0 +1,129 @@
+/**
+ * 环境检测工具类
+ * 用于检测当前运行环境：微信服务号、浏览器、小程序、App等
+ */
+
+export interface EnvironmentInfo {
+  isWechat: boolean
+  isMiniprogram: boolean
+  isApp: boolean
+  isBrowser: boolean
+  userAgent: string
+  platform: string
+  isAlipayClient: boolean
+  isDingTalk: boolean
+}
+
+/**
+ * 从 UA-CH 或 UA 推断平台，避免使用已弃用的 navigator.platform
+ */
+function getPlatformFromClient(): string {
+  // 优先使用 UA-CH（Chromium 等支持）
+  const navAny = navigator as any
+  const uaData = navAny && navAny.userAgentData
+  const uaDataPlatform = typeof uaData?.platform === 'string' ? uaData.platform : ''
+
+  const platform = uaDataPlatform || inferPlatformFromUserAgent(navigator.userAgent)
+  return (platform || 'unknown').toLowerCase()
+}
+
+function inferPlatformFromUserAgent(userAgent: string): string {
+  const ua = (userAgent || '').toLowerCase()
+  if (ua.includes('windows'))
+    return 'windows'
+  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
+    return 'macos'
+  if (ua.includes('android'))
+    return 'android'
+  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
+    return 'ios'
+  if (ua.includes('cros'))
+    return 'chrome os'
+  if (ua.includes('linux'))
+    return 'linux'
+  return 'unknown'
+}
+
+/**
+ * 检测当前运行环境
+ */
+export function detectEnvironment(): EnvironmentInfo {
+  const userAgent = navigator.userAgent.toLowerCase()
+  const platform = getPlatformFromClient()
+
+  // 检测微信环境
+  const isWechat = /micromessenger/i.test(userAgent)
+
+  // 检测支付宝环境
+  const isAlipayClient = /alipayclient/i.test(userAgent)
+
+  // 检测抖音环境
+  const isDingTalk = /dingtalk/i.test(userAgent)
+
+  // 检测微信小程序环境
+  const isMiniprogram = isWechat && /miniprogram/i.test(userAgent)
+
+  // 检测App环境 - 使用括号明确优先级
+  const isApp = (
+    /myapp|customapp|nativeapp/.test(userAgent)
+    || (Object.prototype.hasOwnProperty.call(window, 'webkit') && !!(window as any).webkit?.messageHandlers)
+  )
+
+  // 检测浏览器环境
+  const isBrowser = !isWechat && !isApp
+
+  return {
+    isWechat,
+    isMiniprogram,
+    isApp,
+    isBrowser,
+    userAgent,
+    platform,
+    isAlipayClient,
+    isDingTalk,
+  }
+}
+/**
+ * 获取当前场景类型
+ */
+export function getCurrentScene(): 'wechat' | 'browser' | 'miniprogram' | 'app' | 'unknown' {
+  const env = detectEnvironment()
+
+  if (env.isMiniprogram)
+    return 'miniprogram'
+  if (env.isWechat)
+    return 'wechat'
+  if (env.isApp)
+    return 'app'
+  if (env.isBrowser)
+    return 'browser'
+
+  return 'unknown'
+}
+
+/**
+ * 检查是否支持特定功能
+ */
+export function checkFeatureSupport() {
+  const env = detectEnvironment()
+
+  return {
+    // 摄像头支持
+    camera: 'mediaDevices' in navigator && 'getUserMedia' in navigator.mediaDevices,
+
+    // NFC支持
+    nfc: 'NDEFReader' in window || 'nfc' in navigator,
+
+    // 文件系统支持
+    fileSystem: 'showOpenFilePicker' in window,
+
+    // 振动支持
+    vibration: 'vibrate' in navigator,
+
+    // 地理位置支持
+    geolocation: 'geolocation' in navigator,
+
+    // 微信JS-SDK支持
+    wechatJSSDK: env.isWechat && typeof window !== 'undefined' && 'WeixinJSBridge' in window,
+  }
+}

package/src/utils/platform-auth.ts

@@ -5,7 +5,7 @@
 
 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'
 /**
  * 认证参数接口
  */
@@ -58,7 +58,7 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
 
   // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
   // 检查路由查询参数中是否有授权参数（code + state）
-  const { code, state } = to.query
+  const { code, state, appData } = to.query
   if (code && state) {
     // 解析认证参数
     const authParams = {
@@ -77,10 +77,21 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
 
   // 第二层检测：User-Agent环境检测
   // 检查浏览器环境是否为第三方平台
-  const ua = navigator.userAgent.toLowerCase()
-
+  const env = detectEnvironment()
+  //  微信小程序
+  if (env.isMiniprogram && appData) {
+    const authParams = {
+      platformType: PlatformType.WECHAT_MINI,
+      appData,
+    }
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
   // 微信环境检测
-  if (/micromessenger/i.test(ua)) {
+  if (env.isWechat) {
     console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
     return {
       isExternal: true,
@@ -92,7 +103,7 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
   }
 
   // 支付宝环境检测
-  if (/alipayclient/i.test(ua)) {
+  if (env.isAlipayClient) {
     // 暂未实现 后续需要增加登陆参数
     return {
       isExternal: true,
@@ -103,9 +114,14 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
   }
 
   // 钉钉环境检测
-  if (/dingtalk/i.test(ua)) {
+  if (env.isDingTalk) {
     // 暂未实现 后续需要增加登陆参数
-    return { isExternal: true }
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.DINGTALK,
+      },
+    }
   }
 
   // 第三层检测：路由前缀检测

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

package/src/utils/wechat.ts

@@ -0,0 +1,297 @@
+import { get } from '@af-mobile-client-vue3/services/restTools'
+import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
+import wx from 'weixin-js-sdk'
+// 微信JS-SDK配置接口
+export interface WechatConfig {
+  debug: boolean
+  appId: string
+  timestamp: string
+  nonceStr: string
+  signature: string
+  jsApiList: string[]
+}
+
+// 微信扫码配置
+export interface WechatScanConfig {
+  needResult: 0 | 1
+  scanType: string[]
+}
+
+// 微信扫码结果
+export interface WechatScanResult {
+  resultStr: string
+}
+
+// 检查是否在微信环境中
+export function isWechatBrowser(): boolean {
+  const env = detectEnvironment()
+  return env.isWechat
+}
+
+// 检查是否在小程序环境中
+export function isMiniprogram(): boolean {
+  const env = detectEnvironment()
+  return env.isMiniprogram
+}
+
+// 配置微信JS-SDK
+export function configWechatSDK(config: WechatConfig): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (!isWechatBrowser()) {
+      reject(new Error('非微信环境，无法使用微信JS-SDK'))
+      return
+    }
+
+    wx.config({
+      debug: config.debug,
+      appId: config.appId,
+      timestamp: config.timestamp,
+      nonceStr: config.nonceStr,
+      signature: config.signature,
+      jsApiList: config.jsApiList,
+    })
+
+    wx.ready(() => {
+      console.log('微信JS-SDK配置成功')
+      resolve()
+    })
+
+    wx.error((res: any) => {
+      console.error('微信JS-SDK配置失败:', res)
+      reject(new Error(`微信JS-SDK配置失败: ${res.errMsg}`))
+    })
+  })
+}
+
+// 微信扫码
+export function scanQRCode(config: WechatScanConfig): Promise<WechatScanResult> {
+  return new Promise((resolve, reject) => {
+    if (!isWechatBrowser()) {
+      reject(new Error('非微信环境，无法使用微信扫码'))
+      return
+    }
+
+    wx.scanQRCode({
+      needResult: config.needResult,
+      scanType: config.scanType,
+      success: (res: WechatScanResult) => {
+        console.log('微信扫码成功:', res)
+        resolve(res)
+      },
+      fail: (res: any) => {
+        console.error('微信扫码失败:', res)
+        reject(new Error(`微信扫码失败: ${res.errMsg}`))
+      },
+      cancel: () => {
+        reject(new Error('用户取消扫码'))
+      },
+    })
+  })
+}
+
+// 获取微信签名（模拟）
+export async function getWechatSignature(url: string): Promise<{
+  appId: string
+  timestamp: string
+  nonceStr: string
+  signature: string
+}> {
+  // 这里应该调用后端接口获取微信签名
+  // 现在使用模拟数据
+  return new Promise((resolve) => {
+    get(`/af-wechat/weixin/getJsSdk?path=${url}`).then((res) => {
+      resolve({
+        appId: res.appId,
+        timestamp: res.timeStamp,
+        nonceStr: res.nonceStr,
+        signature: res.sign,
+      })
+    })
+  })
+}
+
+// 初始化微信环境
+export async function initWechatEnvironment(): Promise<void> {
+  if (!isWechatBrowser()) {
+    console.log('非微信环境，跳过微信初始化')
+    return
+  }
+
+  try {
+    const currentUrl = window.location.href.split('#')[0]
+    const signatureData = await getWechatSignature(currentUrl)
+
+    await configWechatSDK({
+      debug: false,
+      appId: signatureData.appId,
+      timestamp: signatureData.timestamp,
+      nonceStr: signatureData.nonceStr,
+      signature: signatureData.signature,
+      jsApiList: [
+        'onMenuShareTimeline',
+        'onMenuShareAppMessage',
+        'onMenuShareQQ',
+        'onMenuShareWeibo',
+        'onMenuShareQZone',
+        'startRecord',
+        'stopRecord',
+        'onVoiceRecordEnd',
+        'playVoice',
+        'pauseVoice',
+        'stopVoice',
+        'onVoicePlayEnd',
+        'uploadVoice',
+        'downloadVoice',
+        'chooseImage',
+        'previewImage',
+        'uploadImage',
+        'downloadImage',
+        'translateVoice',
+        'getNetworkType',
+        'openLocation',
+        'getLocation',
+        'hideOptionMenu',
+        'showOptionMenu',
+        'hideMenuItems',
+        'showMenuItems',
+        'hideAllNonBaseMenuItem',
+        'showAllNonBaseMenuItem',
+        'closeWindow',
+        'scanQRCode',
+        'chooseWXPay',
+        'openProductSpecificView',
+        'addCard',
+        'chooseCard',
+        'openCard',
+      ],
+    })
+
+    console.log('微信环境初始化成功')
+  }
+  catch (error) {
+    console.error('微信环境初始化失败:', error)
+  }
+}
+
+// 小程序扫码（在小程序环境中）
+export function miniprogramScanCode(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    if (!isMiniprogram()) {
+      reject(new Error('非小程序环境，无法使用小程序扫码'))
+      return
+    }
+
+    // 在小程序环境中，通过 postMessage 与小程序通信
+    const mp = (window as any).wx && (window as any).wx.miniProgram
+    const sendMessage = (payload: any) => {
+      if (mp && typeof mp.postMessage === 'function') {
+        mp.postMessage({ data: payload })
+      }
+      else if (window.parent && window.parent !== window) {
+        window.parent.postMessage(payload, '*')
+      }
+      else {
+        throw new Error('无法与小程序通信')
+      }
+    }
+
+    try {
+      sendMessage({ type: 'scanCode', data: {} })
+
+      // 监听小程序返回的扫码结果
+      const handleMessage = (event: MessageEvent) => {
+        const raw = (event as any).data
+        const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+        if (msg && msg.type === 'scanCodeResult') {
+          window.removeEventListener('message', handleMessage)
+          if (msg.success) {
+            resolve(msg.result)
+          }
+          else {
+            reject(new Error(msg.error || '扫码失败'))
+          }
+        }
+      }
+
+      window.addEventListener('message', handleMessage)
+
+      // 设置超时
+      setTimeout(() => {
+        window.removeEventListener('message', handleMessage)
+        reject(new Error('扫码超时'))
+      }, 30000)
+    }
+    catch (err) {
+      reject(err)
+    }
+  })
+}
+
+// 小程序NFC读取（在小程序环境中）
+export function miniprogramNfcRead(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    if (!isMiniprogram()) {
+      reject(new Error('非小程序环境，无法使用小程序NFC'))
+      return
+    }
+
+    const mp = (window as any).wx && (window as any).wx.miniProgram
+    const sendMessage = (payload: any) => {
+      if (mp && typeof mp.postMessage === 'function') {
+        mp.postMessage({ data: payload })
+      }
+      else if (window.parent && window.parent !== window) {
+        window.parent.postMessage(payload, '*')
+      }
+      else {
+        throw new Error('无法与小程序通信')
+      }
+    }
+
+    try {
+      sendMessage({ type: 'nfcRead', data: {} })
+
+      const handleMessage = (event: MessageEvent) => {
+        const raw = (event as any).data
+        const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+        if (msg && msg.type === 'nfcResult') {
+          window.removeEventListener('message', handleMessage)
+          if (msg.success) {
+            resolve(msg.result || '')
+          }
+          else {
+            reject(new Error(msg.error || 'NFC读取失败'))
+          }
+        }
+      }
+
+      window.addEventListener('message', handleMessage)
+
+      setTimeout(() => {
+        window.removeEventListener('message', handleMessage)
+        reject(new Error('NFC读取超时'))
+      }, 30000)
+    }
+    catch (err) {
+      reject(err)
+    }
+  })
+}
+// H5：仅监听小程序主动回传
+export function waitAuthFromMiniProgram(timeout = 15000) {
+  return new Promise<{ token: string, resources?: any, expireTime?: number }>((resolve, reject) => {
+    const handle = (event: MessageEvent) => {
+      const raw = (event as any).data
+      const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+      if (msg && msg.type === 'auth') {
+        window.removeEventListener('message', handle)
+        return msg ? resolve(msg) : reject(new Error('未获取到授权信息'))
+      }
+    }
+    window.addEventListener('message', handle)
+    setTimeout(() => {
+      window.removeEventListener('message', handle)
+      reject(new Error('获取授权信息超时'))
+    }, timeout)
+  })
+}

package/src/views/component/XCellListView/index.vue

@@ -1,19 +1,11 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
-
-// 多选操作配置
-const multiSelectActions = ref([
-  { name: '批量审核', key: 'batchAudit', color: '#000000', icon: 'passed' },
-])
-
-const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
@@ -56,7 +48,7 @@ const serviceName = ref('af-gaslink')
 // 跳转到表单——以表单组来渲染纯表单
 function toDetail(item) {
   router.push({
-    name: 'XFormView',
+    name: 'XFormGroupView',
     query: {
       id: item[idKey.value],
       // id: item.rr_id,
@@ -95,31 +87,18 @@ function toDetail(item) {
 function deleteRow(result) {
   emit('deleteRow', result.o_id)
 }
-
-// 多选操作处理
-function handleMultiSelectAction(action: string, selectedItems: any[], selectedItemsArray: any[]) {
-  console.log('多选操作:', action, selectedItems, selectedItemsArray)
-}
-
-// 选择变化处理
-function handleSelectionChange(selectedItems: any[]) {
-  console.log('选择变化，当前选中:', selectedItems.length, '个项目')
-  // 可以在这里更新UI状态，比如显示选中数量等
-}
 </script>
 
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
       <XCellList
-        config-name="lngChargeAuditMobileCRUD"
-        service-name="af-gaslink"
-        :enable-multi-select="true"
-        id-key="rr_id"
-        :multi-select-actions="multiSelectActions"
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
         @to-detail="toDetail"
-        @multi-select-action="handleMultiSelectAction"
-        @selection-change="handleSelectionChange"
+        @delete-row="deleteRow"
       />
     </template>
   </NormalDataLayout>

package/src/views/component/XFormGroupView/index.vue

@@ -5,19 +5,16 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
-// const configName = ref('reviewFormGroup')
-// const serviceName = ref('af-revenue')
-
 // 纯表单
-// const configName = ref('form_check_test')
-// const serviceName = ref('af-system')
+const configName = ref('form_check_test')
+const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
 
 // 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
+// const configName = ref('lngChargeAuditMobileFormGroup')
+// const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)
@@ -25,8 +22,7 @@ const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
-    console.log('12121')
-    // history.back()
+    history.back()
   })
 }
 
@@ -67,8 +63,8 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        config-name="ApplyAddContractFormGroup"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
         :group-form-data="formData"
         mode="新增"
         @submit="submit"

package/src/views/component/XFormView/index.vue

@@ -3,8 +3,8 @@ import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('lngSecurityChecktestForm')
-const serviceName = ref('af-safecheck')
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
 </script>

package/src/views/loading/AuthLoading.vue

@@ -24,8 +24,16 @@ async function handleAuth() {
     const authParam = route.query as Record<string, string>
 
     if (authParam.platformType) {
-      // 微信公众号授权登录参数
-      await handleExternalLogin(authParam)
+      switch (authParam.platformType) {
+        case PlatformType.WECHAT_OFFICIAL:
+        case PlatformType.WECHAT_MINI:
+          // 微信公众号,微信小程序授权登录参数
+          await handleExternalLogin(authParam)
+          break
+        default:
+          // 其他环境使用原生扫码（需要页面跳转或调用原生API）
+          throw new Error('当前环境不支持授权登录')
+      }
     }
     else {
       // 无授权参数，检查是否已登录或等待授权
@@ -49,9 +57,16 @@ async function handleAuth() {
 
 // 处理外部用户登录
 async function handleExternalLogin(loginParams: any) {
-  const data = await userStore.loginExternal(Object.assign(loginParams, {
-    isMobile: true,
-  }))
+  let data: any
+  if (loginParams.platformType === PlatformType.WECHAT_OFFICIAL) {
+    data = await userStore.loginExternal(Object.assign(loginParams, {
+      isMobile: true,
+    }))
+  }
+  else {
+    data = await userStore.loginExternalMini(JSON.parse(loginParams.appData))
+  }
+
   const loginInfo = {
     f: data,
     jwt: data.id,

package/src/views/user/register/index.vue

@@ -310,10 +310,14 @@ async function submitRegistration(): Promise<void> {
   try {
     console.log('formData', formData.value)
     const response = await openApiLogic(formData.value, 'registrationUser', 'af-system')
-    console.log('response', response)
+    if (response.success) {
+      showSuccess.value = true
+      showSuccessToast('注册成功')
+    }
+    else {
+      showSuccessToast(`注册失败,${response.msg}!`)
+    }
     isSubmitting.value = false
-    showSuccess.value = true
-    showSuccessToast('注册成功')
   }
   catch (error) {
     isSubmitting.value = false
@@ -705,12 +709,12 @@ onMounted(async () => {
           <p><strong>手机号码：</strong>{{ formData.phone }}</p>
         </div>
         <div class="success-actions">
-          <VanButton type="default" @click="resetForm">
-            继续注册
-          </VanButton>
-          <VanButton type="primary" @click="goBack">
-            去登录
-          </VanButton>
+          <!--          <VanButton type="default" @click="resetForm"> -->
+          <!--            继续注册 -->
+          <!--          </VanButton> -->
+          <!--          <VanButton type="primary" @click="goBack"> -->
+          <!--            去登录 -->
+          <!--          </VanButton> -->
         </div>
       </div>
     </VanPopup>