diff --git a/.env b/.env index 9bb0d8c..a752923 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ NODE_ENV = development -VUE_APP_ENV_NAME = zhisheng环境 -VUE_APP_UPGRADE_NAME = erp_pda_pre -VUE_APP_PRODUCTION_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1 -VUE_APP_DEV_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1 +VUE_APP_ENV_NAME = 默认环境 +VUE_APP_UPGRADE_NAME = erp_pda +VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1 +VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1 diff --git a/.env.cjt b/.env.cjt new file mode 100644 index 0000000..23e5742 --- /dev/null +++ b/.env.cjt @@ -0,0 +1,5 @@ +NODE_ENV = development +VUE_APP_ENV_NAME = 本地环境 +VUE_APP_UPGRADE_NAME = erp_pda_dev +VUE_APP_PRODUCTION_API_URL = http://192.168.1.66:7010/hcscm_weave/pda/v1 +VUE_APP_DEV_API_URL = https://192.168.1.66:7010/hcscm_weave/pda/v1 diff --git a/.env.mes b/.env.mes index 3ed3478..9e1f8c7 100644 --- a/.env.mes +++ b/.env.mes @@ -1,5 +1,5 @@ NODE_ENV = development VUE_APP_ENV_NAME = mes环境 VUE_APP_UPGRADE_NAME = erp_pda -VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm/mes/server/pda/v1 -VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm/mes/server/pda/v1 +VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1 +VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1 diff --git a/.env.zhisheng b/.env.zhisheng index 9bb0d8c..7d11492 100644 --- a/.env.zhisheng +++ b/.env.zhisheng @@ -1,5 +1,5 @@ NODE_ENV = development VUE_APP_ENV_NAME = zhisheng环境 VUE_APP_UPGRADE_NAME = erp_pda_pre -VUE_APP_PRODUCTION_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1 -VUE_APP_DEV_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1 +VUE_APP_PRODUCTION_API_URL = https://hcscmpre.zzfzyc.com/hcscm_weave/pda/v1 +VUE_APP_DEV_API_URL = https://hcscmpre.zzfzyc.com/hcscm_weave/pda/v1 diff --git a/README.md b/README.md index 5a62b48..7379831 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,20 @@ # 不使用 pda项目,以后的新需求或者修改 使用 本项目 +打包正式环境发布: + +先修改 .env 文件,修改为目标请求路径 + +NODE_ENV = development +VUE_APP_ENV_NAME = 默认环境 +VUE_APP_UPGRADE_NAME = erp_pda +VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm/mes/server/pda/v1 +VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm/mes/server/pda/v1 + + +HBuilderX中 点击 生成本地打包APP资源 + +点击云打包 选择自有证书 输入证书库密码和证书私钥密码:123456 点击快速安心打包 + # pda-cli ## Project setup diff --git a/src/common/config.js b/src/common/config.js index b0c617f..094da18 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -20,13 +20,14 @@ const config = { // 环境判断 isDevelopment: isDevelopment, - // 生产环境API URL - productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm/mes/server/pda/v1', + // 生产环境API URL(服务名段 hcscm_weave) + productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1', - // 开发环境API URL选项 + // 开发环境API URL选项(仅替换 //域名/ 后第一个路径段 hcscm → hcscm_weave,不改域名) devApiUrlOptions: [ - { label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm/pda/v1' }, - { label: '正式环境', value: process.env.VUE_APP_DEV_API_URL || 'https://www.haotopai.com/hcscm/mes/server/pda/v1' }, + { label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1' }, + { label: '本地环境', value: 'http://192.168.1.66:7010/hcscm_weave/pda/v1' }, + { label: '正式环境', value: process.env.VUE_APP_DEV_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1' }, { label: '自定义', value: 'custom' } ] diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue index 3f7eb07..6607bc2 100644 --- a/src/pages/sys/login/index.vue +++ b/src/pages/sys/login/index.vue @@ -138,7 +138,7 @@ export default { showApiUrlPicker: false, // 根据环境设置默认URL和选项 selectedApiUrl: config.isDevelopment ? config.devApiUrlOptions[0].value : config.productionApiUrl, - customApiUrl: 'http://192.168.1.66:50002/hcscm/pda/v1', + customApiUrl: 'http://192.168.1.66:50002/hcscm_weave/pda/v1', apiUrlList: config.isDevelopment ? config.devApiUrlOptions : [], phoneNo: '', //username: '',