From 0e630d0fb0e5edb5c641f8f6d03a4d126b8cf744 Mon Sep 17 00:00:00 2001 From: xuan <1359774872@qq.com> Date: Mon, 9 Nov 2026 10:07:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80=E6=94=B9=E7=94=A8=E5=91=A8?= =?UTF-8?q?=E5=B0=9ACDN=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + .env.zhoushang | 1 + src/common/config.js | 15 +++++++++++++++ src/pages/sys/login/index.vue | 4 ++-- src/pages/sys/user/index.vue | 4 ++-- vue.config.js | 1 + 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 362340e..5bc2f80 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ NODE_ENV = production VUE_APP_ENV_NAME = zhoushang环境 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang +VUE_APP_UPGRADE_CDN_PREFIX = https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang_zhichang VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1 VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1 diff --git a/.env.zhoushang b/.env.zhoushang index 362340e..5bc2f80 100644 --- a/.env.zhoushang +++ b/.env.zhoushang @@ -1,5 +1,6 @@ NODE_ENV = production VUE_APP_ENV_NAME = zhoushang环境 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang +VUE_APP_UPGRADE_CDN_PREFIX = https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang_zhichang VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1 VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1 diff --git a/src/common/config.js b/src/common/config.js index 1fc2f6b..8b73d1c 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -7,6 +7,7 @@ export const isDevelopment = process.env.NODE_ENV === 'development' const config = { upgradeName: process.env.VUE_APP_UPGRADE_NAME || 'erp_pda', + upgradeCdnPrefix: process.env.VUE_APP_UPGRADE_CDN_PREFIX || '', // 产品名称 productName: '浩拓技术', @@ -33,6 +34,20 @@ const config = { } +export function resolveUpgradeDownloadUrl(downloadUrl) { + const raw = String(downloadUrl || '').trim(); + const prefix = String(config.upgradeCdnPrefix || '').trim().replace(/\/+$/, ''); + if (!raw || !prefix) { + return raw; + } + const path = raw.split('?')[0].split('#')[0]; + const fileName = path.split('/').filter(Boolean).pop() || ''; + if (!fileName || !/\.apk$/i.test(fileName)) { + return raw; + } + return `${prefix}/${fileName}`; +} + export function getDefaultApiUrl() { const prod = config.devApiUrlOptions.find(item => item.label === '正式环境'); return (prod && prod.value) || config.productionApiUrl || 'https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1'; diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue index f8415a8..fb5c670 100644 --- a/src/pages/sys/login/index.vue +++ b/src/pages/sys/login/index.vue @@ -118,7 +118,7 @@ /** * Copyright (c) 2013-Now http://aidex.vip All rights reserved. */ -import config, { getDefaultApiUrl } from '@/common/config.js'; +import config, { getDefaultApiUrl, resolveUpgradeDownloadUrl } from '@/common/config.js'; import base64 from '@/common/base64.js'; import util from '@/common/util.js'; import md5 from '@/common/md5.js'; @@ -459,7 +459,7 @@ export default { return { changelog: res.message + '，最新版本：' + res.latest_version, status: res.need_update ? 1 : 0, // 0 无新版本 | 1 有新版本 - path: res.download_url, // 新apk地址 + path: resolveUpgradeDownloadUrl(res.download_url), // 新apk地址 latest_version: res.latest_version }; } catch (error) { diff --git a/src/pages/sys/user/index.vue b/src/pages/sys/user/index.vue index 8917f9b..4ce157c 100644 --- a/src/pages/sys/user/index.vue +++ b/src/pages/sys/user/index.vue @@ -61,7 +61,7 @@