From ec159a6df42f0cb285a9e5645117c8cd62964a5f Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Thu, 6 Jan 2022 20:34:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=8A=A5=E5=90=8D=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/development_address_config.js | 6 ++++-- public/local_production_address_config.js | 1 + public/production_address_config.js | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/development_address_config.js b/public/development_address_config.js index b31ce8e..b1bc1d2 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -16,8 +16,10 @@ window._CONFIG["onlinePreviewDomainURL"] = "http://10.0.1.9:9012/onlinePreview"; window._CONFIG["singUpQRCodeURL"] = "http://10.0.1.9:21824/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8055/signinurl" -// 页面显示用的会议报名二维码连接 -window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn:8066/' + +// todo 需要改为企业端的报名地址 --- 本地 +// 页面显示用的会议报名二维码连接 // 报名页面迁移到企业端 地址需要修改为企业端的地址 +window._CONFIG["singInQRCodHref"]= 'http://localhost:3001/signupentrance' // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中汽标准所" diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index 5502b32..57bdbfd 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -11,6 +11,7 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://139.9.235.66:8012/onlinePreview"; +// todo 需要改为企业端的报名地址 --- 139 // 会议管理报名二维码地址 window._CONFIG["singUpQRCodeURL"] = "http://bxxt.hzwlsoft.com/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 diff --git a/public/production_address_config.js b/public/production_address_config.js index d227108..befb676 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -11,6 +11,7 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/onlinePreview"; +// todo 需要改为企业端的报名地址 --- 客户 // 会议管理报名二维码地址 window._CONFIG["singUpQRCodeURL"] = "https://cwp.catarc.org.cn/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 From 988970bdb6971ef06d4097c0b7e1c286d2c0fd48 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 7 Jan 2022 16:14:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BC=9A=E8=AE=AE=E6=8A=A5=E5=90=8D=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index 95e9355..cc87ad6 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,8 +8,9 @@ import { ACCESS_TOKEN, INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types' import { generateIndexRouter } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration +// ,'/signupentrance','/signUpPage' -const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signupentrance','/signUpPage'] // no redirect whitelist +const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // no redirect whitelist router.beforeEach((to, from, next) => { if (to.query.token) {