diff --git a/.gitignore b/.gitignore index 9b62787..793696b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ logs/ # package-lock.json # yarn.lock # pnpm-lock.yaml +/CLAUDE.md diff --git a/App.vue b/App.vue index 5098cf2..3f52957 100644 --- a/App.vue +++ b/App.vue @@ -1,19 +1,34 @@ - - - diff --git a/config/dev.js b/config/dev.js new file mode 100644 index 0000000..6a1b44d --- /dev/null +++ b/config/dev.js @@ -0,0 +1,14 @@ +/** + * 开发环境配置 + */ +const dev = { + apiBaseUrl: 'http://192.168.0.23:4000', + + // 开发阶段硬编码 Token(生产环境应从登录流程获取) + bearerToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlZXB2ZW5kaW5nIiwic3ViIjoiMTY0MDI0MTEyNiIsImZyb20iOiJwb3MiLCJyb2xlIjoicG9zIiwibWFpbmJvYXJkX2lkIjoiVDEwMDIiLCJwb3Nfc24iOiIxNjQwMjQxMTI2IiwiaWF0IjoxNzc4NDkxOTA3LCJleHAiOjE3NzkwOTY3MDd9.DjscZtrTCr30XOngToUifxoel4q2EGES_uqGQernkvg', + + // 是否开启请求日志 + enableRequestLog: true, +}; + +export default dev; diff --git a/config/env.js b/config/env.js new file mode 100644 index 0000000..5cbe679 --- /dev/null +++ b/config/env.js @@ -0,0 +1,20 @@ +/** + * 环境配置入口 + * 根据编译模式自动选择 dev / prod 配置 + */ +import common from './index.js'; +import dev from './dev.js'; +import prod from './prod.js'; + +// uni-app 编译时通过 define 注译 __UNI_PLATFORM__ +// H5 开发模式下 process.env.NODE_ENV === 'development' +const isProd = process.env.NODE_ENV === 'production'; + +const envConfig = isProd ? prod : dev; + +const config = { + ...common, + ...envConfig, +}; + +export default config; diff --git a/config/index.js b/config/index.js new file mode 100644 index 0000000..764aacf --- /dev/null +++ b/config/index.js @@ -0,0 +1,19 @@ +/** + * 公共配置(开发/生产环境共享) + */ +const common = { + // 应用信息 + appName: '智能货柜', + appVersion: '1.0.0', + + // 默认设备ID(开发调试用) + defaultDeviceId: 'A1036', + + // 客服电话 + servicePhone: '13264706088', + + // 请求超时时间(ms) + requestTimeout: 10000, +}; + +export default common; diff --git a/config/prod.js b/config/prod.js new file mode 100644 index 0000000..1355cea --- /dev/null +++ b/config/prod.js @@ -0,0 +1,13 @@ +/** + * 生产环境配置 + */ +const prod = { + apiBaseUrl: 'https://api.arklink.com', + + // 生产环境 Token 从登录流程获取,此处为空 + bearerToken: '', + + enableRequestLog: false, +}; + +export default prod; diff --git a/manifest.json b/manifest.json index 4da7353..823a8f2 100644 --- a/manifest.json +++ b/manifest.json @@ -56,5 +56,10 @@ }, "usingComponents" : true }, + "h5" : { + "router" : { + "mode" : "history" + } + }, "vueVersion" : "3" } diff --git a/pages.json b/pages.json index 9fd42c4..3b246c0 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,11 @@ { "pages": [ + { + "path": "pages/index/scan", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/index/index", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 4848768..b969468 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -69,6 +69,10 @@ + + + + 首页 @@ -77,6 +81,10 @@ + + + + 我的 @@ -130,15 +138,13 @@ + + diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 82747ce..f458e81 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -44,6 +44,7 @@