From 35f51aad9824b55bbe67c0fb21bd3d3d24381c2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:33 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 2fbd3ee..4b51fd0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -42,6 +42,7 @@
Modal.destroyAll()
Modal.error({
title: response.data.message,
+ okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
sessionStorage.clear()
@@ -582,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