verce-vue-test 0.0.27 → 0.0.28

package/mini2.0-main/env.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
+  readonly BASE_URL: string
   readonly VITE_APP_ENV: 'development' | 'test' | 'production'
   readonly VITE_API_BASE_URL: string
   readonly VITE_PROXY_TARGET?: string

package/mini2.0-main/plugins/bump-version.ts

@@ -23,10 +23,14 @@ export function bumpVersion(mode: string): Plugin {
       const oldCode = Number(match[1])
       const newCode = oldCode + 1
 
-      const major = Math.floor(newCode / 100000)
-      const minor = Math.floor((newCode % 100000) / 1000)
-      const patch = String(newCode % 1000).padStart(3, '0')
-      const versionName = `${major}.${minor}.${patch}`
+      // 版本号规则：5位 version_code → 4位版本名
+      // version_code: ABCDD  A=major B=minor C=patch DD=hotfix
+      // version_name: A.B.C.DD  示例 66102 → 6.6.1.02
+      const major = Math.floor(newCode / 10000)
+      const minor = Math.floor((newCode / 1000) % 10)
+      const patch = Math.floor((newCode / 100) % 10)
+      const hotfix = String(newCode % 100).padStart(2, '0')
+      const versionName = `${major}.${minor}.${patch}.${hotfix}`
 
       content = content
         .replace(/version_code=\d+/, `version_code=${newCode}`)

package/mini2.0-main/src/App.vue

@@ -1,7 +1,20 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useAppStore } from '@/stores/app'
+
+const appStore = useAppStore()
+
+onMounted(async () => {
+  await appStore.initNativeDetection()
+
+  // 测试环境 + 原生设备：加载 vConsole 调试面板
+  if (import.meta.env.VITE_APP_ENV === 'test' && appStore.isNative) {
+    import('vconsole').then(({ default: VConsole }) => new VConsole())
+  }
+})
+</script>
 
 <template>
-  <router-view v-slot="{ Component }">
+  <router-view v-if="appStore.ready" v-slot="{ Component }">
     <keep-alive include="Home">
       <component :is="Component" />
     </keep-alive>

package/mini2.0-main/src/config/plugin.properties.pro

@@ -1,6 +1,6 @@
 app_id=vue_demo;
-version_code=315015;
-version_name=3.15.015;
+version_code=10000;
+version_name=1.0.0.00;
 type=html5;
 frame=vue;
 platform=[mac,win,ios,android];

package/mini2.0-main/src/config/plugin.properties.test

@@ -1,6 +1,6 @@
 app_id=vue_demo;
-version_code=315026;
-version_name=3.15.026;
+version_code=10000;
+version_name=1.0.0.00;
 type=html5;
 frame=vue;
 platform=[mac,win,ios,android];

package/mini2.0-main/src/core/mxApi/index.ts

@@ -232,6 +232,33 @@ export const ajaxPut = <T = unknown>(url: string, data?: unknown): Promise<MXAja
 export const ajaxDelete = <T = unknown>(url: string, id: string): Promise<MXAjaxResponse<T>> =>
   ajax<T>({ type: 'DELETE', url: `${url}/${id}` })
 
-/** 检测是否在原生环境 */
+let nativeReady = false
+let resolveNativeReady: (() => void) | null = null
+
+const nativeReadyPromise = new Promise<void>((resolve) => {
+  resolveNativeReady = resolve
+})
+
+document.addEventListener('deviceready', () => {
+  nativeReady = true
+  resolveNativeReady?.()
+}, false)
+
+/**
+ * 等待原生设备就绪（deviceready 事件触发后 resolve）
+ *
+ * native 环境下 deviceready 触发后 window.MXCommon 才注入完成，
+ * 之后 isNativeApp() 才能拿到正确结果。
+ */
+export const whenNativeReady = (): Promise<boolean> => {
+  if (nativeReady) return Promise.resolve(isNativeApp())
+
+  return Promise.race([
+    nativeReadyPromise.then(() => isNativeApp()),
+    new Promise<boolean>((resolve) => setTimeout(() => resolve(false), 3000)),
+  ])
+}
+
+/** 检测是否在原生环境（需在 deviceready 之后调用才准确） */
 export const isNativeApp = (): boolean =>
   typeof window.MXCommon !== 'undefined'

package/mini2.0-main/src/main.ts

@@ -1,15 +1,10 @@
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-import 'vant/lib/index.css' // Vant 基础样式，必须引入否则组件无样式
+import 'vant/lib/index.css'
 
 import App from './App.vue'
 import router from './router'
-import { isNativeApp } from '@/core/mxApi'
-
-if (import.meta.env.VITE_APP_ENV === 'test' && isNativeApp()) {
-  import('vconsole').then(({ default: VConsole }) => new VConsole())
-}
 
 const app = createApp(App)
 const pinia = createPinia()

package/mini2.0-main/src/stores/app.ts

@@ -0,0 +1,29 @@
+import { defineStore } from 'pinia'
+import { whenNativeReady } from '@/core/mxApi'
+
+/**
+ * 应用级状态 Store
+ *
+ * 存放全局共享的运行时状态，不持久化。
+ */
+export const useAppStore = defineStore('app', () => {
+  /** 原生环境检测是否已完成（App.vue onMounted 后变为 true） */
+  const ready = ref(false)
+
+  /** 是否在原生 APP WebView 环境中（由 App.vue 初始化时检测并写入） */
+  const isNative = ref(false)
+
+  /**
+   * 初始化原生环境检测
+   *
+   * 等待 deviceready 事件后判断 window.MXCommon 是否存在，
+   * 浏览器环境下 3 秒超时后返回 false。
+   * 应在 App.vue onMounted 中调用，全局只需一次。
+   */
+  async function initNativeDetection() {
+    isNative.value = await whenNativeReady()
+    ready.value = true
+  }
+
+  return { ready, isNative, initNativeDetection }
+})

package/mini2.0-main/src/views/home/index.vue

@@ -7,44 +7,44 @@ type HomeFeature = {
 
 defineOptions({ name: 'HomePage' })
 
-const bannerImage = '/images/img.png'
+const bannerImage = `${import.meta.env.BASE_URL}images/img.png`
 
 const router = useRouter()
 
 const features: HomeFeature[] = [
   {
     title: ['人民币头寸', '预报及查询'],
-    image: '/images/f5876785-b927-4347-ba19-999114240649.png',
+    image: `${import.meta.env.BASE_URL}images/f5876785-b927-4347-ba19-999114240649.png`,
     route: '/rmb-position',
   },
   {
     title: ['外币头寸', '预报及查询'],
-    image: '/images/12a73787-86a9-4891-a65f-66104746f6a8.png',
+    image: `${import.meta.env.BASE_URL}images/12a73787-86a9-4891-a65f-66104746f6a8.png`,
     route: '/foreign-position',
   },
   {
     title: ['人行头寸', '余额查询'],
-    image: '/images/73fef1e4-0fd0-4a1a-9b8b-a70a5b6acbbc.png',
+    image: `${import.meta.env.BASE_URL}images/73fef1e4-0fd0-4a1a-9b8b-a70a5b6acbbc.png`,
     route: '/pbc-position',
   },
   {
     title: ['头寸匡算'],
-    image: '/images/ea745a10-42aa-4f44-8d7f-3ab02cc0adcd.png',
+    image: `${import.meta.env.BASE_URL}images/ea745a10-42aa-4f44-8d7f-3ab02cc0adcd.png`,
     route: '/position-estimate',
   },
   {
     title: ['人民币净借记', '可用额度管理'],
-    image: '/images/5798d7aa-ba8b-4605-8079-58b35495ac55.png',
+    image: `${import.meta.env.BASE_URL}images/5798d7aa-ba8b-4605-8079-58b35495ac55.png`,
     route: '/net-debit',
   },
   {
     title: ['人民币小额网银', '清算场次明细'],
-    image: '/images/c3dbbd9d-be56-490e-b9f4-6ee17ebefffc.png',
+    image: `${import.meta.env.BASE_URL}images/c3dbbd9d-be56-490e-b9f4-6ee17ebefffc.png`,
     route: '/clearing-detail',
   },
   {
     title: ['预警信息'],
-    image: '/images/bc685b4c-0cca-4a79-924c-a8ee10e6f8eb.png',
+    image: `${import.meta.env.BASE_URL}images/bc685b4c-0cca-4a79-924c-a8ee10e6f8eb.png`,
     route: '/warning',
   },
 ]

package/mini2.0-main/src/views/login/index.vue

@@ -3,11 +3,12 @@ import { useRouter } from 'vue-router'
 import { login } from '@/api/user'
 import { showToast } from 'vant'
 import { useUserStore } from '@/stores/user'
-import { isNativeApp, getEncryptString } from '@/core/mxApi'
+import { useAppStore } from '@/stores/app'
+import { getEncryptString } from '@/core/mxApi'
 
 const router = useRouter()
 const userStore = useUserStore()
-const isNative = isNativeApp()
+const appStore = useAppStore()
 
 const form = ref({
   username: '',
@@ -18,12 +19,12 @@ const loading = ref(false)
 
 // 原生环境：从客户端获取密钥，直接交换 token
 onMounted(async () => {
-  if (!isNativeApp()) return
+  if (!appStore.isNative) return
 
   loading.value = true
   try {
     const secret = await getEncryptString()
-  console.log(secret)
+    console.log(secret)
   } catch {
     // 错误已由 request.ts 拦截器统一处理
   } finally {
@@ -49,7 +50,7 @@ async function onSubmit() {
 <template>
   <div class="login-page">
     <!-- 原生环境：自动登录，只显示加载状态 -->
-    <van-loading v-if="isNative" vertical class="native-loading">
+    <van-loading v-if="appStore.isNative" vertical class="native-loading">
       正在登录...
     </van-loading>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verce-vue-test",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "private": false,
   "type": "module",
   "scripts": {