From ecfc80755984fcb4c670c2208282ee93ee8bd1a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 四月 2020 16:18:24 +0800
Subject: [PATCH] 2020-04-05
---
src/api/index.js | 9 ++++++---
src/components/header/index.jsx | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 956b4f9..b81415f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -90,8 +90,11 @@
param.Password = Utils.formatOptions(param.Password)
param.appkey = window.GLOB.appkey || ''
- if (isCloud && options.cloudLoginApi) {
- param.rduri = options.cloudLoginApi
+ if (isCloud) {
+ param.debug = 'Y'
+ if (options.cloudLoginApi) {
+ param.rduri = options.cloudLoginApi
+ }
} else if (!isCloud && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
@@ -288,7 +291,7 @@
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
- if (sessionStorage.getItem('isEditState') === 'true' && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗�
+ if (sessionStorage.getItem('isEditState') === 'true') { // HS涓嬭彍鍗�
param.userid = sessionStorage.getItem('CloudUserID')
param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 09ece23..f12f87e 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -259,7 +259,7 @@
} else {
sessionStorage.setItem('isEditState', state)
let _userName = sessionStorage.getItem('User_Name')
- let _avatar = this.state.avatar
+ let _avatar = avatar
if (!state && sessionStorage.getItem('avatar')) {
_avatar = Utils.getrealurl(sessionStorage.getItem('avatar')) // 澶村儚
@@ -297,7 +297,7 @@
sessionStorage.setItem('CloudAvatar', res.icon)
sessionStorage.setItem('isEditState', 'true')
- let _avatar = this.state.avatar
+ let _avatar = avatar
if (res.icon) {
_avatar = Utils.getrealurl(res.icon) // 澶村儚
}
--
Gitblit v1.8.0