From 36ec4193eb599da78abdeda4de040438d10279a3 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Mon, 21 Apr 2025 13:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.staging | 4 ++-- src/layout/components/Navbar.vue | 7 ++++++- src/views/search/order/index.vue | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.env.staging b/.env.staging index d87d12be..4cdb3668 100644 --- a/.env.staging +++ b/.env.staging @@ -4,7 +4,7 @@ VUE_APP_TITLE = 安徽机械化装备共享平台 NODE_ENV = production # 测试环境配置 -ENV = 'staging' +ENV = 'production' # 安徽机械化装备共享平台/测试环境 -VUE_APP_BASE_API = '/stage-api' +VUE_APP_BASE_API = '/prod-api' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index e7e56cb4..fc6eaa13 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -102,7 +102,12 @@ export default { }) .then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/iws/glweb/login"; + console.log("logout", process.env.VUE_APP_BASE_API) + if (process.env.VUE_APP_BASE_API == '/iws/jxhzb-api') { + window.location.href = 'http://sgwpdm.ah.sgcc.com.cn/iws' + } else { + this.$router.push({ path: "login" }) + } }); }) .catch(() => {}); diff --git a/src/views/search/order/index.vue b/src/views/search/order/index.vue index 00c0f7ef..f189c91a 100644 --- a/src/views/search/order/index.vue +++ b/src/views/search/order/index.vue @@ -630,12 +630,12 @@ { id: '2', name: '待出库' }, { id: '3', name: '待收货' }, { id: '4', name: '租赁中' }, - { id: '5', name: '已退租' }, + // { id: '5', name: '已退租' }, // { id: '6', name: '已退租' }, - { id: '15', name: '结算待确认' }, + // { id: '15', name: '结算待确认' }, // { id: '7', name: '已完成' }, { id: '8', name: '已驳回' }, - { id: '10', name: '已检修待结算' }, + // { id: '10', name: '已检修待结算' }, { id: '20', name: '已完成' }, { id: '99', name: '已取消' }, ],