From 6d61c46fd0a9a2e967a604519d9a6361694280dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 四月 2021 17:09:16 +0800
Subject: [PATCH] 2021-04-01

---
 src/views/login/index.jsx |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 1d232a8..4d1f7eb 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -100,6 +100,9 @@
 
       localStorage.setItem(_url + 'lang', param.lang || 'zh-CN')
       sessionStorage.setItem('lang', param.lang || 'zh-CN')
+
+      sessionStorage.removeItem('visitorUserID')
+      sessionStorage.removeItem('visitorLoginUID')
       
       if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage
         localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password}))))
@@ -167,6 +170,9 @@
 
       localStorage.setItem(_url + 'lang', param.lang || 'zh-CN')
       sessionStorage.setItem('lang', param.lang || 'zh-CN')
+
+      sessionStorage.removeItem('visitorUserID')
+      sessionStorage.removeItem('visitorLoginUID')
 
       let _history = sessionStorage.getItem('history')
       if (_history) {
@@ -267,12 +273,8 @@
 
     Api.getTouristMsg().then(result => {
       if (result.status) {
-        if (result.UserID && !sessionStorage.getItem('UserID')) {
-          sessionStorage.setItem('UserID', result.UserID)
-        }
-        if (result.LoginUID && !sessionStorage.getItem('LoginUID')) {
-          sessionStorage.setItem('LoginUID', result.LoginUID)
-        }
+        sessionStorage.setItem('visitorUserID', result.UserID || '')
+        sessionStorage.setItem('visitorLoginUID', result.LoginUID || '')
 
         if (result.UserID && result.LoginUID) {
           this.setState({touristLogin: true})
@@ -285,6 +287,8 @@
           LText: `select '${window.GLOB.appkey}'`,
         }
 
+        _param.userid = result.UserID
+        _param.LoginUID = result.LoginUID
         _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
         _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
 
@@ -379,11 +383,28 @@
             }
 
             if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
-              Api.getLocalConfig ({func: 's_Get_local_u_deleted', users_upt_date: res.users_upt_date}).then(localres => {
+              Api.getLocalConfig ({
+                func: 's_Get_local_u_deleted',
+                users_upt_date: res.users_upt_date,
+                userid: result.UserID,
+                LoginUID: result.LoginUID
+              }).then(localres => {
                 if (!localres.status) return
-                Api.getSystemConfig({func: 's_get_sso_u_create', user_ids: localres.user_ids, user_ids_local: localres.user_ids_local, users_upt_date: localres.users_upt_date}).then(ssores => {
+                Api.getSystemConfig({
+                  func: 's_get_sso_u_create',
+                  user_ids: localres.user_ids,
+                  user_ids_local: localres.user_ids_local,
+                  users_upt_date: localres.users_upt_date,
+                  userid: result.UserID,
+                  LoginUID: result.LoginUID
+                }).then(ssores => {
                   if (!ssores.status) return
-                  Api.getLocalConfig ({func: 's_get_local_u_create', user_ids_local: ssores.user_ids_local})
+                  Api.getLocalConfig ({
+                    func: 's_get_local_u_create',
+                    user_ids_local: ssores.user_ids_local,
+                    userid: result.UserID,
+                    LoginUID: result.LoginUID
+                  })
                 })
               })
             }

--
Gitblit v1.8.0