From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/login/index.jsx |   69 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 850d770..f7dbf17 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -27,6 +27,8 @@
     ICP: window.GLOB.ICP || '',
     lineColor: window.GLOB.lineColor || '',
     webSite: window.GLOB.webSite || '',
+    prolType: window.GLOB.prolType || '',
+    prolCont: window.GLOB.prolCont || '',
     langList: [],
     syncApp: false,
     loginWays: null,
@@ -296,7 +298,6 @@
     // md5("/ws/location/v1/ip?callback=callbackFunction&key=key&output=jsonp secret key")
     // md5("/ws/location/v1/ip?callback=callbackFunction&key=BA7BZ-4QB65-LFCIA-QPDA6-4G6O7-MJB4Q&output=jsonpuThL4ZM3XOj642ksEQh76tyHFjh4")
 
-    sessionStorage.removeItem('subLangList')
     sessionStorage.removeItem('langList')
 
     setTimeout(() => {
@@ -627,12 +628,27 @@
               style: res.CSS || '',
               showline: res.split_line_show || 'true',
               webSite: res.WebSite || '',
+              prolType: '',
+              prolCont: '',
               navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤�
               app_version: res.app_version,
               Member_Level: 0,
               appname: res.appname || '',
               loginOtop: loginOtop,
               loginOleft: loginOleft
+            }
+
+            if (['every_time', 'once', 'not_required'].includes(res.require_legal_consent) && res.legal_documents) {
+              systemMsg.prolCont = res.legal_documents
+              try {
+                systemMsg.prolCont = window.decodeURIComponent(window.atob(systemMsg.prolCont))
+                if (res.require_legal_consent !== 'not_required') {
+                  systemMsg.prolType = res.require_legal_consent
+                }
+              } catch(e) {
+                systemMsg.prolType = ''
+                systemMsg.prolCont = ''
+              }
             }
 
             if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
@@ -724,20 +740,8 @@
             }
 
             if (res.lang_data && res.lang_data.length > 1 && window.GLOB.systemType !== 'production') {
-              let list = res.lang_data.map(item => item.Lang)
-              let lang = 'zh-CN'
-              if (window.GLOB.defLang && list.includes(window.GLOB.defLang)) {
-                lang = window.GLOB.defLang
-              }
-
-              if (list.includes(lang)) {
-                list = [lang, ...list.filter(item => item !== lang)]
-                if (lang === sessionStorage.getItem('lang')) {
-                  sessionStorage.setItem('langList', JSON.stringify(list))
-                } else {
-                  sessionStorage.setItem('subLangList', JSON.stringify(list))
-                }
-              }
+              let list = res.lang_data.map(item => item.Lang).filter(n => n !== 'zh-CN')
+              sessionStorage.setItem('langList', JSON.stringify(list))
             }
 
             if (res.lang_data.length === 1 && res.lang_data[0].Lang !== sessionStorage.getItem('lang')) {
@@ -747,12 +751,16 @@
               return
             }
 
+            let langList = res.lang_data.map(item => ({Lang: item.Lang, LangName: item.LangName}))
+
+            localStorage.setItem(window.GLOB.sysSign + 'langList', JSON.stringify(langList))
+
             window.GLOB.loginOtop = systemMsg.loginOtop
             window.GLOB.loginOleft = systemMsg.loginOleft
             
             this.setState({
               loginWays: login_ways,
-              langList: res.lang_data || [],
+              langList: langList,
               ...systemMsg
             })
 
@@ -820,6 +828,19 @@
 
       this.setState({
         loginWays: loginWays
+      })
+    }
+
+    let langs = localStorage.getItem(window.GLOB.sysSign + 'langList')
+    if (langs) {
+      try {
+        langs = JSON.parse(langs)
+      } catch (e) {
+        langs = []
+      }
+
+      this.setState({
+        langList: langs
       })
     }
   }
@@ -920,7 +941,7 @@
   }
 
   render () {
-    const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays } = this.state
+    const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, prolType, prolCont } = this.state
 
     let wrapStyle = {}
 
@@ -945,6 +966,8 @@
             auth={this.state.auth}
             authError={this.state.authError}
             loginWays={loginWays}
+            prolType={prolType}
+            prolCont={prolCont}
             langList={this.state.langList}
             isDisabled={this.state.isDisabled}
             handleSubmit={() => this.handleSubmit()}
@@ -953,11 +976,13 @@
           /> : null}
         </div>
         <div className="login-bottom">
-          {webSite && copyRight ?
-            <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, '&nbsp;') }}></a> :
-            <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, '&nbsp;') : '' }}></p>
-          }
-          <br/>
+          <p>
+            {webSite && copyRight ?
+              <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, '&nbsp;') }}></a> :
+              <span dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, '&nbsp;') : '' }}></span>
+            }
+            {prolCont && !prolType ? <span style={{marginLeft: '15px'}} dangerouslySetInnerHTML={{ __html: prolCont }}></span> : null}
+          </p>
           {ICP ? <a target="_blank" rel="noopener noreferrer" href="https://beian.miit.gov.cn/#/Integrated/index" dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, '&nbsp;') }}></a> : null}
         </div>
         {/* 缂栬緫鐘舵�佺櫥褰� */}

--
Gitblit v1.8.0