From 7043a49206ce505a203d5fd110dea75621bc3d20 Mon Sep 17 00:00:00 2001 From: xuan <1359774872@qq.com> Date: Fri, 26 Dec 2025 15:11:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(login):=20=E4=BC=98=E5=8C=96=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91=E5=8F=8A=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改环境变量配置，新增 VUE_APP_ENV_NAME 用于区分环境名称显示 - 调整登录接口请求，pdaLogin与pdaLogout改为相对路径调用 - 登录页面新增环境名称显示，区分不同环境使用状态 - 登录流程支持开发环境动态选择服务器地址，支持自定义地址输入及存储 - 增加请求和响应拦截器日志输出，方便调试接口请求问题 - 优化登录表单输入清除按钮显示与密码显示切换交互体验 - 修复和改善登录相关本地存储，自动保存账号密码和服务器地址 - 调整manifest包配置，禁用app-plus子包 - 格式化和规范登录页面样式调整，提升页面结构与样式一致性 --- .env | 1 + .env.mes | 1 + .env.zhisheng | 1 + README.md | 4 +- src/common/http.api.js | 4 +- src/common/http.interceptor.js | 10 +- src/manifest.json | 2 +- src/pages/sys/login/index.vue | 894 +++++++++++++++++---------------- vue.config.js | 2 + 9 files changed, 470 insertions(+), 449 deletions(-) diff --git a/.env b/.env index 28bcae5..74e6871 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ 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 diff --git a/.env.mes b/.env.mes index 28bcae5..3ed3478 100644 --- a/.env.mes +++ b/.env.mes @@ -1,4 +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 diff --git a/.env.zhisheng b/.env.zhisheng index 8469c7a..9bb0d8c 100644 --- a/.env.zhisheng +++ b/.env.zhisheng @@ -1,4 +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 diff --git a/README.md b/README.md index 1a2bcbb..5a62b48 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# 不使用 pda项目，以后的新需求或者修改 使用 本项目 + # pda-cli ## Project setup @@ -83,4 +85,4 @@ pack.json内容如下：详情可访问 [CLI uni-app发行 - Android/iOS云打 } ``` ### 云服务器走CICD 打包: -需要下载 [Linux HBuilderX Cli](https://ask.dcloud.net.cn/article/41469) \ No newline at end of file +需要下载 [Linux HBuilderX Cli](https://ask.dcloud.net.cn/article/41469) diff --git a/src/common/http.api.js b/src/common/http.api.js index 4c9606b..3d10551 100644 --- a/src/common/http.api.js +++ b/src/common/http.api.js @@ -16,8 +16,8 @@ const install = (Vue, vm) => { getUserInfo: (params = {}) => vm.$u.get(config.productionApiUrl+'/mobile/user/getUserInfo', params), login: (params = {}) => vm.$u.post(config.productionApiUrl+'/mobile/login/loginByPassword', params), // PDA登录接口 - pdaLogin: (params = {}) => vm.$u.postJson(config.productionApiUrl+'/login', params), - pdaLogout: (params = {}) => vm.$u.postJson(config.productionApiUrl+'/logout', params), + pdaLogin: (params = {}) => vm.$u.postJson('/login', params), + pdaLogout: (params = {}) => vm.$u.postJson('/logout', params), // 获取配布单列表 getFpmArrangeOrderList: (params = {}) => vm.$u.get('/product/fpmArrangeOrder/getFpmArrangeOrderList', params), // 获取成品配布单详情 diff --git a/src/common/http.interceptor.js b/src/common/http.interceptor.js index cc3645e..19c89a1 100644 --- a/src/common/http.interceptor.js +++ b/src/common/http.interceptor.js @@ -22,6 +22,9 @@ const install = (Vue, vm) => { // 请求拦截，配置Token等参数 Vue.prototype.$u.http.interceptor.request = (req) => { + console.log('request', req); + console.log('baseUrl', vm.$store.state.apiurl); + console.log('完整URL', vm.$store.state.apiurl + req.url); if (!req.header){ req.header = []; } @@ -42,13 +45,15 @@ const install = (Vue, vm) => { req.header[rememberMeHeader] = vm.vuex_remember; req.remember = false; } - console.log('request', req); return req; } // 响应拦截，判断状态码是否通过 Vue.prototype.$u.http.interceptor.response = async (res, req) => { console.log('response', res); + console.log('response statusCode', res?.statusCode); + console.log('response data', res?.data); + console.log('response errMsg', res?.errMsg); // 处理401未授权状态码 if (res.statusCode === 401) { @@ -63,6 +68,7 @@ const install = (Vue, vm) => { }); return false; } + console.log('res',res) if (!(res.data)){ vm.$u.toast('未连接到服务器') return Promise.reject(new Error('未连接到服务器')); @@ -125,7 +131,7 @@ const install = (Vue, vm) => { // 封装 post json 请求 vm.$u.postJson = (url, data = {}, header = {}) => { - console.log('header', header, url, vm.$u) + console.log('header', header, url, vm.$store.state.apiurl) header['content-type'] = 'application/json'; return vm.$u.http.request({ url, diff --git a/src/manifest.json b/src/manifest.json index 5b928b5..18d46dd 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -7,7 +7,7 @@ "transformPx" : false, "app-plus" : { "optimization" : { - "subPackages" : true + "subPackages" : false }, "safearea" : { "bottom" : { diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue index d15c690..86719ce 100644 --- a/src/pages/sys/login/index.vue +++ b/src/pages/sys/login/index.vue @@ -4,57 +4,52 @@ - - - - - + + + + + + + + + + +
+ - {{$t('login.autoLogin')}} -
- - - - - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + 版本: {{ appVersion }} + （{{ envName }}） +.env-text { + font-size: 24rpx; + color: #5473e8; + margin-left: 10rpx; +} + diff --git a/vue.config.js b/vue.config.js index 2e5d7d2..8d6426b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,12 +9,14 @@ module.exports = { console.log('VUE_APP_UPGRADE_NAME',JSON.stringify(process.env.VUE_APP_UPGRADE_NAME)) console.log('VUE_APP_PRODUCTION_API_URL',JSON.stringify(process.env.VUE_APP_PRODUCTION_API_URL)) console.log('VUE_APP_DEV_API_URL',JSON.stringify(process.env.VUE_APP_DEV_API_URL)) + console.log('VUE_APP_ENV_NAME',JSON.stringify(process.env.VUE_APP_ENV_NAME)) Object.assign(definitions[0], { 'process.env': { ...definitions[0]['process.env'], VUE_APP_UPGRADE_NAME: JSON.stringify(process.env.VUE_APP_UPGRADE_NAME), VUE_APP_PRODUCTION_API_URL: JSON.stringify(process.env.VUE_APP_PRODUCTION_API_URL), VUE_APP_DEV_API_URL: JSON.stringify(process.env.VUE_APP_DEV_API_URL), + VUE_APP_ENV_NAME: JSON.stringify(process.env.VUE_APP_ENV_NAME), } }) return definitions