From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 23 七月 2023 10:32:40 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/api/index.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index cdea893..50bd0f5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -456,7 +456,7 @@ if (list.length > 0) { let clear = false let _appkey = window.GLOB.appkey.substr(-10) - let reg = new RegExp(_appkey + '$', 'ig') + let reg = new RegExp(_appkey + '$', 'i') list.forEach(mid => { if (reg.test(mid)) { @@ -583,7 +583,7 @@ param.lang = param.lang || sessionStorage.getItem('lang') || '' param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' - param.appkey = window.GLOB.appkey || '' + param.appkey = param.appkey || window.GLOB.appkey || '' let url = '/webapi/dostars' if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠 -- Gitblit v1.8.0