From 68d839ab51dab23bcb12cfe243b318203025451b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十二月 2020 18:39:54 +0800
Subject: [PATCH] 2020-12-17
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 0b3b3ac..14b4bdb 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -94,18 +94,25 @@
duration: 5
})
return
- } else {
- url = data.LinkUrl1 + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
- UserID: sessionStorage.getItem('UserID'),
- LoginUID: sessionStorage.getItem('LoginUID'),
- User_Name: sessionStorage.getItem('User_Name'),
- Full_Name: sessionStorage.getItem('Full_Name'),
- avatar: sessionStorage.getItem('avatar'),
- dataM: data.dataM ? 'true' : '',
- debug: data.debug || '',
- role_id: data.role_id || ''
- })))
}
+
+ let _url = data.LinkUrl1
+ if (/index\.html/ig.test(_url)) {
+ _url = _url.replace(/index\.html.*/ig, '')
+ } else if (!/\/$/ig.test(_url)) {
+ _url = _url + '/'
+ }
+
+ url = _url + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+ UserID: sessionStorage.getItem('UserID'),
+ LoginUID: sessionStorage.getItem('LoginUID'),
+ User_Name: sessionStorage.getItem('User_Name'),
+ Full_Name: sessionStorage.getItem('Full_Name'),
+ avatar: sessionStorage.getItem('avatar'),
+ dataM: data.dataM ? 'true' : '',
+ debug: data.debug || '',
+ role_id: data.role_id || ''
+ })))
} else {
let Id = ''
let con = '?'
--
Gitblit v1.8.0