src/main/resources/app2/package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
         "@capacitor/android": "^8.0.0",
+        "@capacitor/barcode-scanner": "^3.0.0",
         "@capacitor/cli": "^8.0.0",
         "@capacitor/core": "^8.0.0",
         "pinia": "^3.0.4",
@@ -581,6 +582,18 @@
         "@capacitor/core": "^8.0.0"
       }
     },
+    "node_modules/@capacitor/barcode-scanner": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/@capacitor/barcode-scanner/-/barcode-scanner-3.0.0.tgz",
+      "integrity": "sha512-UWcN+9uSk1+RxR/Sh794727QH7I47/N1NoTGcumjRjhbhAb6CHJPyxOf1LyIoBILt4PinUsLhegCmzlBDrB3lA==",
+      "license": "MIT",
+      "dependencies": {
+        "html5-qrcode": "2.3.8"
+      },
+      "peerDependencies": {
+        "@capacitor/core": ">=8.0.0"
+      }
+    },
     "node_modules/@capacitor/cli": {
       "version": "8.0.0",
       "resolved": "https://registry.npmmirror.com/@capacitor/cli/-/cli-8.0.0.tgz",
@@ -3194,6 +3207,12 @@
         "node": ">=18"
       }
     },
+    "node_modules/html5-qrcode": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
+      "integrity": "sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",

src/main/resources/app2/package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@capacitor/android": "^8.0.0",
+    "@capacitor/barcode-scanner": "^3.0.0",
     "@capacitor/cli": "^8.0.0",
     "@capacitor/core": "^8.0.0",
     "pinia": "^3.0.4",

src/main/resources/app2/src/services/api.js

@@ -2,7 +2,7 @@
 import axios from 'axios'
 
 const apiClient = axios.create({
-  baseURL: 'http://120.46.151.248:8080',
+  baseURL: 'https://120.46.151.248:8081',
   headers: {
     'Content-Type': 'application/json'
   }

src/main/resources/app2/src/views/HomePage.vue

@@ -356,8 +356,15 @@ const isMapLoading = ref(false)
 const mapConfig = reactive({
   center: [112.9375, 28.1655],
   zoom: 16,
-  key: import.meta.env.VITE_AMAP_KEY || '', // 使用环境变量
-  viewMode: '3D'
+  key: import.meta.env.VITE_AMAP_KEY || '7e03ef3b43a8cdbb62e3038fc727e035', // 使用环境变量
+  viewMode: '3D',
+  plugins: [
+    'AMap.Marker',
+    'AMap.Geolocation',
+    'AMap.ToolBar',
+    'AMap.Scale',
+    'AMap.ControlBar'
+  ]
 })
 
 // 添加：后端接口获取设备位置
@@ -383,6 +390,7 @@ const initMap = async () => {
   isMapLoading.value = true
 
   try {
+    console.log('开始加载高德地图...')
     // 加载高德地图
     const AMap = await AMapLoader.load({
       key: mapConfig.key,
@@ -395,12 +403,13 @@ const initMap = async () => {
         'AMap.ControlBar'
       ]
     })
-
+    console.log('高德地图加载成功')
     // 创建地图实例
     mapInstance.value = new AMap.Map('mapContainer', {
       zoom: mapConfig.zoom,
       center: mapConfig.center,
-      viewMode: mapConfig.viewMode
+      viewMode: mapConfig.viewMode,
+      mapStyle: 'amap://styles/normal'
     })
 
     // 添加控件

src/main/resources/zzz/package.json

@@ -16,12 +16,15 @@
     "lint": "run-s lint:*"
   },
   "dependencies": {
+    "@capacitor/android": "^8.0.0",
     "axios": "^1.13.2",
     "pinia": "^3.0.4",
     "vue": "^3.5.25",
     "vue-router": "^4.6.3"
   },
   "devDependencies": {
+    "@capacitor/cli": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
     "@eslint/js": "^9.39.1",
     "@vitejs/plugin-vue": "^6.0.2",
     "@vitest/eslint-plugin": "^1.5.0",

src/main/resources/zzz/src/services/api.js

@@ -4,7 +4,7 @@ import { useAuthStore } from '@/stores/auth'
 
 // 创建最基本的axios实例
 const apiClient = axios.create({
-  baseURL: 'http://120.46.151.248:8080',
+  baseURL: 'https://120.46.151.248:8081',
   headers: {
     'Content-Type': 'application/json'
   }