From 48a18736c461ad730bd264b0ac7b40b68a0e33a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 六月 2020 20:30:20 +0800
Subject: [PATCH] 2020-06-28

---
 src/views/login/index.jsx |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index ae80f67..b6cf556 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -15,7 +15,7 @@
 
 const LoginForm = asyncLoadComponent(() => import('./loginform'))
 const LoginCloudForm = asyncLoadComponent(() => import('./logincloudform'))
-const iszhCN = !localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN'
+const iszhCN = localStorage.getItem('lang') !== 'en-US'
 
 class Login extends Component {
   state = {
@@ -58,7 +58,7 @@
   }
 
   async loginsubmit (param) {
-    if (options.systemType === 'local' && !window.GLOB.mainSystemApi) { // 涓氬姟绯荤粺蹇呴』璁剧疆鍗曠偣鍦板潃
+    if (options.sysType === 'local' && !window.GLOB.mainSystemApi) { // 涓氬姟绯荤粺蹇呴』璁剧疆鍗曠偣鍦板潃
       Modal.warning({
         title: '鏈缃崟鐐规湇鍔″櫒鍦板潃锛岃鑱旂郴绠$悊鍛橈紒'
       })
@@ -91,7 +91,7 @@
       } else {
         this.props.history.replace('/main')
       }
-    } else if (res.ErrCode === 'Need_Get_Appkey' && options.systemType === 'SSO') {
+    } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
       message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
 
       this.setState({
@@ -110,8 +110,8 @@
     let timeStamp = new Date().getTime()
     let _appId = window.GLOB.appId
 
-    if (options.systemType === 'cloud') { // 浜戠浣跨敤绯荤粺閰嶇疆appid
-      _appId = options.AppId
+    if (options.sysType === 'cloud') { // 浜戠浣跨敤绯荤粺閰嶇疆appid
+      _appId = options.caId
     }
 
     let str = md5('MK19' + _appId + timeStamp)
@@ -236,7 +236,7 @@
       func: 's_get_app_from_cloud',
       UserName: '',
       Password: '',
-      systemType: options.systemType,
+      systemType: options.sysType,
       Type: 'X',
       debug: 'Y'
     }

--
Gitblit v1.8.0