From 0519dcda8b6fb2914987f8d4d58e1d14bcf98dc3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 六月 2023 14:33:06 +0800
Subject: [PATCH] 2023-06-30

---
 src/views/login/loginform.jsx |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index 0997d1a..fe22bd9 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -56,6 +56,9 @@
     if (localStorage.getItem(_url + 'remember') === 'false') {
       remember = false
     }
+    if (!window.GLOB.keepKey) {
+      remember = false
+    }
 
     let smsId = ''
     let hasScan = false
@@ -136,6 +139,13 @@
     return new Promise((resolve, reject) => {
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
+          if (activeKey === 'uname_pwd') {
+            values.username = values.username.replace(/\t*|\v*|\s*/g, '')
+            values.password = values.password.replace(/\t*|\v*|\s*/g, '')
+          } else if (activeKey === 'sms_vcode') {
+            values.phone = values.phone.replace(/\t*|\v*|\s*/g, '')
+            values.vercode = values.vercode.replace(/\t*|\v*|\s*/g, '')
+          }
           resolve({type: activeKey, ...values})
         } else {
           reject(err)
@@ -296,7 +306,7 @@
       param.LText = md5(`${_phone}mingke${window.GLOB.appkey}${param.timestamp}`)
       param.secretkey = md5(`${param.LText}mingke${param.timestamp}`)
 
-      param.rduri = 'http://sso.mk9h.cn/webapi/dostars'
+      param.rduri = 'https://sso.mk9h.cn/webapi/dostars'
       param.userid = 'bh0bapabtd45epsgra79segbch6c1ibk'
       param.LoginUID = 'bh0bapabtd45epsgra79segbch6c1ibk'
   
@@ -306,7 +316,7 @@
       })
       LoginVerCodeTimer = setTimeout(this.resetVerCodeDelay, 1000)
   
-      Api.getLocalConfig(param).then(res => {
+      Api.genericInterface(param).then(res => {
         if (res.status) {
   
         } else {
@@ -319,7 +329,30 @@
           })
           message.warning(res.message)
         }
-      }, () => {
+      }, (error) => {
+        if (error && error.ErrCode === 'LoginError') {
+          let param = {
+            func: 's_visitor_login',
+            timestamp: moment().format('YYYY-MM-DD HH:mm:ss'), 
+            SessionUid: 'bh0bapabtd45epsgra79segbch6c1ibk',
+            TypeCharOne: 'pc',
+            appkey: '202004041613277377A6A2456D34A4948AE84'
+          }
+          
+          param.LText = md5(window.btoa('bh0bapabtd45epsgra79segbch6c1ibk' + param.timestamp))
+          param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+  
+          let params = {
+            url: 'https://sso.mk9h.cn/webapi/dologon',
+            method: 'post',
+            data: JSON.stringify(param)
+          }
+
+          Api.directRequest(params)
+
+          return
+        }
+
         if (LoginVerCodeTimer) {
           clearTimeout(LoginVerCodeTimer)
         }
@@ -394,12 +427,12 @@
               ]
             })(<Input.Password placeholder={this.props.dict['login.password']} prefix={<LockOutlined style={{ color: 'rgba(0,0,0,.25)' }} />} />)}
           </Form.Item>
-          <Form.Item className="minline">
+          {window.GLOB.keepKey ? <Form.Item className="minline">
             {getFieldDecorator('remember', {
               valuePropName: 'checked',
               initialValue: remember,
             })(<Checkbox onChange={this.rememberChange}>{this.props.dict['login.remember']}</Checkbox>)}
-          </Form.Item>
+          </Form.Item> : <div style={{height: '30px', float: 'left'}}></div>}
           {this.props.langList && this.props.langList.length > 0 ? <Form.Item className="minline right">
             {getFieldDecorator('lang', {
               initialValue: this.props.lang,
@@ -449,7 +482,7 @@
               <Input
                 addonAfter={
                   <Button type="link" className="vercode" size="small" disabled={verdisabled} onClick={this.getvercode}>
-                    {delay ? this.props.dict['login.vercode.queryagain'].replace('@', delay) : this.props.dict['login.vercode.query']}
+                    {delay ? `${delay}s鍚庨噸鏂拌幏鍙朻 : '鑾峰彇楠岃瘉鐮�'}
                   </Button>
                 }
                 placeholder={this.props.dict['login.vercode']}

--
Gitblit v1.8.0