From 30e6518da8443c40063daf067970265d5da91929 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 七月 2023 16:55:34 +0800
Subject: [PATCH] 2023-07-25

---
 src/views/login/index.jsx |  391 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 240 insertions(+), 151 deletions(-)

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 8aa1af1..40903fc 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -5,6 +5,7 @@
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js' 
+import MKEmitter from '@/utils/events.js'
 import options, { styles } from '@/store/options.js'
 import zhCN from '@/locales/zh-CN/login.js'
 import enUS from '@/locales/en-US/login.js'
@@ -13,8 +14,9 @@
 import './index.scss'
 
 const LoginForm = asyncLoadComponent(() => import('./loginform'))
-const Resetpwd = asyncLoadComponent(() => import('@/components/header/resetpwd'))
+const Resetpwd = asyncLoadComponent(() => import('@/components/resetPassword'))
 const LoginCloudForm = asyncComponent(() => import('./logincloudform'))
+const LoginCodeForm = asyncComponent(() => import('./logincodeform'))
 const iszhCN = sessionStorage.getItem('lang') !== 'en-US'
 
 const _href = window.location.href.split('#')[0]
@@ -38,8 +40,6 @@
     loginWays: null,
     touristLogin: false,
     syncing: false,
-    visible: false,
-    resetLoading: false
   }
 
   changelang (item) {
@@ -68,25 +68,35 @@
    * @param {Object} param 鐢ㄦ埛鍚嶅瘑鐮佺瓑淇℃伅
    */
   async loginsubmit (param) {
-    let city = sessionStorage.getItem('city') || ''
-    let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
     // 鐧诲綍鎻愪氦
-    let res = await Api.getusermsg(param.username, param.password, false, ipAddress, city)
+    let res = await Api.getusermsg(param.username, param.password, false)
     if (res.status) {
+      if (res.check_mob) {
+        let loginWays = this.state.loginWays.filter(item => item.type === 'sms_vcode')
+
+        if (loginWays.length > 0) {
+          this.setState({loginWays: null, isDisabled: false}, () => {
+            this.setState({loginWays: loginWays})
+          })
+          Modal.warning({
+            title: '涓虹‘璁ゆ槸鎮ㄦ湰浜烘搷浣滐紝璇蜂娇鐢ㄦ墜鏈虹煭淇¢獙璇佺爜杩涜韬唤璁よ瘉',
+            okText: '鐭ラ亾浜�'
+          })
+          return
+        }
+      }
+      
       sessionStorage.setItem('UserID', res.UserID)
       sessionStorage.setItem('LoginUID', res.LoginUID)
       sessionStorage.setItem('User_Name', res.UserName)
       sessionStorage.setItem('Full_Name', res.FullName)
       sessionStorage.setItem('avatar', res.icon || '')
       sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
-      sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
       sessionStorage.setItem('debug', res.debug || '')
       sessionStorage.setItem('role_id', res.role_id || '')
       sessionStorage.setItem('departmentcode', res.departmentcode || '')
       sessionStorage.setItem('organization', res.organization || '')
       sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
-      sessionStorage.setItem('localRole_id', res.role_id || '')
 
       if (res.paas_externalDatabase) {
         sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -99,24 +109,51 @@
       sessionStorage.removeItem('visitorUserID')
       sessionStorage.removeItem('visitorLoginUID')
       
-      if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage
-        localStorage.setItem(_href, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password}))))
+      let users = localStorage.getItem(_href + 'users')
+      
+      if (users) {
+        try {
+          users = JSON.parse(window.decodeURIComponent(window.atob(users)))
+        } catch (e) {
+          console.warn('Parse Failure')
+          users = []
+        }
       } else {
-        localStorage.removeItem(_href)
+        users = []
       }
+      
+      // positecgroup
+      if (res.token) {
+        this.setState({
+          isDisabled: false,
+          verify: {...res, $password: param.password},
+          codeVisible: true
+        })
+        return
+      }
+
+      users = users.filter(item => item.username !== param.username)
+
+      if (users.length > 4) {
+        users.length = 4
+      }
+
+      users.unshift({username: param.username, password: param.remember ? param.password : ''})
+
+      localStorage.setItem(_href + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users))))
 
       let level = localStorage.getItem(_href + 'pwdlevel')
 
-      if (level) {
+      if (level && process.env.NODE_ENV === 'production') {
         let visible = false
         let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
         if (param.password.length < 8) {
           visible = true
         } else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(param.password)) {
           visible = true
-        } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
+        } else if ((level === 'char_num' || level === 'char_num_90' || level === 'char_num_90_sms') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
           visible = true
-        } else if (level === 'char_num_90' && res.modifydate) {
+        } else if ((level === 'char_num_90' || level === 'char_num_90_sms') && res.modifydate) {
           let s = (new Date().getTime() - new Date(res.modifydate).getTime()) / (1000 * 24 * 60 * 60)
           if (!isNaN(s) && s > 90) {
             visible = true
@@ -127,18 +164,23 @@
         if (visible) {
           message.warning(tip)
           this.setState({
-            isDisabled: false,
-            visible: true
+            isDisabled: false
+          })
+          
+          MKEmitter.emit('resetpassword', () => {
+            const input = document.getElementById('password')
+            if (input) {
+              input.select()
+            }
           })
           return
         }
       }
 
-      let _history = sessionStorage.getItem('history')
-      if (_history) {
-        sessionStorage.removeItem('history')
-        // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
-        this.props.history.replace(_history)
+      let iframe = sessionStorage.getItem('iframe')
+      if (iframe) {
+        sessionStorage.removeItem('iframe')
+        this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
       } else {
         this.props.history.replace('/main')
       }
@@ -157,7 +199,8 @@
           input.select()
         }
       } else if (res.message.indexOf('鐧诲綍鏉冮檺') > -1) {
-        const input = document.getElementById('username')
+        const wrap = document.getElementById('username')
+        const input = wrap ? wrap.getElementsByTagName('input')[0] : null
         if (input) {
           input.select()
         }
@@ -169,11 +212,8 @@
   }
 
   async phoneloginsubmit (param) {
-    let city = sessionStorage.getItem('city') || ''
-    let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
     // 鐧诲綍鎻愪氦
-    let res = await Api.getphoneusermsg(param.phone, param.vercode, false, ipAddress, city)
+    let res = await Api.getphoneusermsg(param.phone, param.vercode, false)
     if (res.status) {
       sessionStorage.setItem('UserID', res.UserID)
       sessionStorage.setItem('LoginUID', res.LoginUID)
@@ -181,13 +221,11 @@
       sessionStorage.setItem('Full_Name', res.FullName)
       sessionStorage.setItem('avatar', res.icon || '')
       sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
-      sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
       sessionStorage.setItem('debug', res.debug || '')
       sessionStorage.setItem('role_id', res.role_id || '')
       sessionStorage.setItem('departmentcode', res.departmentcode || '')
       sessionStorage.setItem('organization', res.organization || '')
       sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
-      sessionStorage.setItem('localRole_id', res.role_id || '')
       
       if (res.paas_externalDatabase) {
         sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -200,11 +238,10 @@
       sessionStorage.removeItem('visitorUserID')
       sessionStorage.removeItem('visitorLoginUID')
 
-      let _history = sessionStorage.getItem('history')
-      if (_history) {
-        sessionStorage.removeItem('history')
-        // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
-        this.props.history.replace(_history)
+      let iframe = sessionStorage.getItem('iframe')
+      if (iframe) {
+        sessionStorage.removeItem('iframe')
+        this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
       } else {
         this.props.history.replace('/main')
       }
@@ -232,13 +269,11 @@
         sessionStorage.setItem('Full_Name', res.FullName)
         sessionStorage.setItem('avatar', res.icon || '')
         sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
-        sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
         sessionStorage.setItem('debug', res.debug || '')
         sessionStorage.setItem('role_id', res.role_id || '')
         sessionStorage.setItem('departmentcode', res.departmentcode || '')
         sessionStorage.setItem('organization', res.organization || '')
         sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
-        sessionStorage.setItem('localRole_id', res.role_id || '')
 
         if (res.paas_externalDatabase) {
           sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -248,11 +283,10 @@
         sessionStorage.removeItem('visitorUserID')
         sessionStorage.removeItem('visitorLoginUID')
   
-        let _history = sessionStorage.getItem('history')
-        if (_history) {
-          sessionStorage.removeItem('history')
-          // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
-          this.props.history.replace(_history)
+        let iframe = sessionStorage.getItem('iframe')
+        if (iframe) {
+          sessionStorage.removeItem('iframe')
+          this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
         } else {
           this.props.history.replace('/main')
         }
@@ -288,37 +322,22 @@
         document.getElementsByTagName('head')[0].removeChild(JSONP)
       },500)
     })
-}
+  }
 
   componentDidMount () {
     // 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")
 
-    // 鑾峰彇ip鍙婂煄甯備俊鎭�
-    // let ipurl = window.atob('aHR0cHM6Ly9lcGMubWs5a$mkC5jbi93ZWJhcGkvaXBsb2M='.replace(/\$mk/ig, ''))
-    // Api.directRequest(ipurl, 'get', null, 'true').then(res => {
-    //   if (!res || !res.ip) return
-    //   sessionStorage.setItem('ipAddress', res.ip)
-    // })
-    if (sessionStorage.getItem('loginError')) {
-      try {
-        let res = JSON.parse(sessionStorage.getItem('loginError'))
-        console.info(res.url)
-        console.info(res.request)
-        console.info(res.response)
+    setTimeout(() => {
+      Api.delCacheConfig()
+    }, 50)
 
-        let result = JSON.parse(res.response)
-
-        notification.warning({
-          top: 92,
-          message: result.message,
-          duration: 5
-        })
-      } catch (e) {}
+    if (window.GLOB.filter) {
+      let view = document.getElementById('mk-login-view')
       
-      setTimeout(() => {
-        sessionStorage.removeItem('loginError')
-      }, 2000)
+      if (view) {
+        view.style.filter = 'grayscale(100%)'
+      }
     }
 
     const _addressUrl = _href + 'queryAddress'
@@ -453,7 +472,11 @@
       param.sign = md5(values)
       param.t = new Date().getTime()
   
-      Api.directRequest(_rduri + '/' + _func, 'post', param, 'true').then(res => {
+      Api.directRequest({
+        url: _rduri + '/' + _func,
+        method: 'post',
+        data: JSON.stringify(param)
+      }).then(res => {
         if (res.status) {
           if (res.EPC === str) {
             let box = []
@@ -494,11 +517,56 @@
             authError: res.message
           })
         }
+      }, (error) => {
+        if (error && error.ErrCode === 'LoginError') {
+          let param = {
+            func: 's_visitor_login',
+            timestamp: moment().format('YYYY-MM-DD HH:mm:ss'), 
+            SessionUid: _id,
+            TypeCharOne: 'pc',
+            appkey: '202004041613277377A6A2456D34A4948AE84'
+          }
+
+          param.LText = md5(window.btoa(_id + param.timestamp))
+          param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+          let params = {
+            url: _rduri.replace('dostars', 'dologon'),
+            method: 'post',
+            data: JSON.stringify(param)
+          }
+
+          Api.directRequest(params)
+
+          return
+        }
+
+        if (index === -1 || index > 10) {
+          this.setState({
+            auth: false,
+            authError: '缃戠粶閿欒瀵艰嚧绯荤粺鎺堟潈澶辫触锛岃鑱旂郴绠$悊鍛樸��'
+          })
+        }
       })
     }
 
     Api.getTouristMsg().then(result => {
       if (result.status) {
+        if (result.website && process.env.NODE_ENV === 'production') {
+          let website = result.website.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
+          let current = window.GLOB.baseurl.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
+
+          if (website !== current) {
+            try {
+              window.history.replaceState(null, null, result.website.replace(/\/$/ig, '') + '/admin/index.html#/login')
+              window.location.reload()
+            } catch(e) {
+              window.location.href = result.website.replace(/\/$/ig, '') + '/admin/index.html#/login'
+            }
+            return
+          }
+        }
+        
         sessionStorage.setItem('visitorUserID', result.UserID || '')
         sessionStorage.setItem('visitorLoginUID', result.LoginUID || '')
 
@@ -519,31 +587,32 @@
         _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
 
         Api.getSystemConfig(_param).then(res => {
+          if (!res) return
+          
           if (res.status) {
             // positecgroup
-            // res.Banner = res.Banner ? res.Banner.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
-            // res.doclogo = res.doclogo ? res.doclogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
-            // res.indexlogo = res.indexlogo ? res.indexlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
-            // res.loginlogo = res.loginlogo ? res.loginlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
+            // if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+            //   if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
+            //     Modal.warning({
+            //       title: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒',
+            //       okText: '鐭ラ亾浜�'
+            //     })
+            //     this.setState({
+            //       auth: false,
+            //       authError: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒'
+            //     })
+            //     return
+            //   } else if (res.member_type === 'personal' && res.registry_date) {
+            //     let saveDelay = 0
+            //     try {
+            //       saveDelay = parseInt((new Date().getTime() - new Date(res.registry_date).getTime()) / 4320000)
+            //       sessionStorage.setItem('mkDelay', saveDelay)
+            //     } catch(e) {}
+            //   }
+            // }
 
-            if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
-              if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
-                Modal.warning({
-                  title: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒',
-                  okText: '鐭ラ亾浜�'
-                })
-                this.setState({
-                  auth: false,
-                  authError: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒'
-                })
-                return
-              } else if (res.member_type === 'personal' && res.registry_date) {
-                let saveDelay = 0
-                try {
-                  saveDelay = parseInt((new Date().getTime() - new Date(res.registry_date).getTime()) / 4320000)
-                  sessionStorage.setItem('mkDelay', saveDelay)
-                } catch(e) {}
-              }
+            if (!['shutter', 'linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(res.menu_type)) {
+              res.menu_type = 'shutter'
             }
 
             let _url = _href + 'system'
@@ -566,7 +635,7 @@
 
             let level = res.pwd_level || ''
 
-            if (level && !['letter_num', 'char_num', 'char_num_90'].includes(level)) {
+            if (level && !['letter_num', 'char_num', 'char_num_90', 'char_num_90_sms'].includes(level)) {
               level = ''
             }
 
@@ -579,10 +648,12 @@
             }
 
             sessionStorage.setItem('home_background', res.index_background_color || '')
+
+            let seconds = 0
             if (res.sys_datetime) {
-              sessionStorage.setItem('sys_datetime', res.sys_datetime)
-              sessionStorage.setItem('app_datetime', new Date().getTime())
+              seconds = Math.floor((new Date(res.sys_datetime).getTime() - new Date().getTime()) / 1000)
             }
+            sessionStorage.setItem('sys_time_shim', isNaN(seconds) ? 0 : seconds)
 
             // url鏍囬
             document.title = systemMsg.platTitle
@@ -607,7 +678,11 @@
                 login_ways.push({
                   type: item.way_no,
                   smsId: item.sms_id
-                }) 
+                })
+
+                if (item.way_no === 'sms_vcode' && item.sms_id) {
+                  sessionStorage.setItem('mk_sms_id', item.sms_id)
+                }
               })
             } else {
               login_ways.push({
@@ -653,32 +728,32 @@
             }
 
             // positecgroup
-            // if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
-            //   Api.genericInterface ({
-            //     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,
-            //       userid: result.UserID,
-            //       LoginUID: result.LoginUID
-            //     }).then(ssores => {
-            //       if (!ssores.status) return
-            //       Api.genericInterface ({
-            //         func: 's_get_local_u_create',
-            //         user_ids_local: ssores.user_ids_local,
-            //         userid: result.UserID,
-            //         LoginUID: result.LoginUID
-            //       })
-            //     })
-            //   })
-            // }
+            if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
+              Api.genericInterface({
+                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,
+                  userid: result.UserID,
+                  LoginUID: result.LoginUID
+                }).then(ssores => {
+                  if (!ssores.status) return
+                  Api.genericInterface({
+                    func: 's_get_local_u_create',
+                    user_ids_local: ssores.user_ids_local,
+                    userid: result.UserID,
+                    LoginUID: result.LoginUID
+                  })
+                })
+              })
+            }
           } else {
             message.warning(res.message)
           }
@@ -788,41 +863,52 @@
     })
   }
 
-  resetPwdSubmit = () => {
-    this.formRef.handleConfirm().then(res => {
+  codeSubmit = () => {
+    const { verify } = this.state
+    this.codeRef.handleConfirm().then(res => {
       this.setState({
-        resetLoading: true
+        codeLoading: true
       })
-
-      let _param = {
-        func: 's_PwdUpt',
-        LText: `select '${res.originpwd}','${res.password}'`
-      }
-      
-      _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')          // 鏃堕棿鎴�
-      _param.LText = Utils.formatOptions(_param.LText)                   // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
-      _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)   // md5瀵嗛挜
-  
-      Api.getSystemConfig(_param).then(result => {
+      Api.verifycode({...verify, code: res.code}).then(result => {
         this.setState({
-          visible: !result.status,
-          resetLoading: false
+          codeVisible: false,
+          codeLoading: false
         })
 
-        if (result.status) {
-          notification.success({
-            top: 92,
-            message: '淇敼鎴愬姛锛岃閲嶆柊鐧诲綍銆�',
-            duration: 2
-          })
-          const input = document.getElementById('password')
-          if (input) {
-            input.select()
+        if (result.verifyResult === 'success') {
+          let level = localStorage.getItem(_href + 'pwdlevel')
+          if (level) {
+            let visible = false
+            let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
+            if (verify.$password.length < 8) {
+              visible = true
+            } else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(verify.$password)) {
+              visible = true
+            } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(verify.$password)) {
+              visible = true
+            } else if (level === 'char_num_90' && verify.modifydate) {
+              let s = (new Date().getTime() - new Date(verify.modifydate).getTime()) / (1000 * 24 * 60 * 60)
+              if (!isNaN(s) && s > 90) {
+                visible = true
+                tip = '鎮ㄥ凡90澶╂湭淇敼瀵嗙爜锛岃鏇存崲瀵嗙爜鍚庝娇鐢紒'
+              }
+            }
+
+            if (visible) {
+              message.warning(tip)
+              this.setState({
+                isDisabled: false,
+                visible: true
+              })
+              return
+            }
           }
+
+          this.props.history.replace('/main')
         } else {
           notification.warning({
             top: 92,
-            message: result.message,
+            message: '楠岃瘉鐮佹棤鏁堬紝璇烽噸鏂扮櫥褰曪紒',
             duration: 5
           })
         }
@@ -843,7 +929,7 @@
     const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state
 
     return (
-      <div className="login-container" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
+      <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
         <div className="logo" style={lineColor ? {borderColor: lineColor} : {}}>
           {loginlogo ? <img src={loginlogo} alt=""/> : null}
           {this.state.platName ? <p className="plat-name">{this.state.platName}</p> : null}
@@ -889,17 +975,20 @@
           <LoginCloudForm handleSubmit={() => this.syncSubmit()} wrappedComponentRef={(inst) => this.logincloudRef = inst}/>
         </Modal>
         {/* 淇敼瀵嗙爜 */}
+        <Resetpwd />
+        {/* 浜屾楠岃瘉 */}
         <Modal
-          title="淇敼瀵嗙爜"
+          title="浜屾楠岃瘉"
           okText={this.state.dict['login.ok']}
           cancelText={this.state.dict['login.cancel']}
-          visible={this.state.visible}
-          onOk={this.resetPwdSubmit}
-          confirmLoading={this.state.resetLoading}
-          onCancel={() => this.setState({visible: false, resetLoading: false})}
+          visible={this.state.codeVisible}
+          onOk={this.codeSubmit}
+          maskClosable={false}
+          confirmLoading={this.state.codeLoading}
+          onCancel={() => this.setState({codeVisible: false, codeLoading: false})}
           destroyOnClose
         >
-          <Resetpwd wrappedComponentRef={(inst) => this.formRef = inst} resetPwdSubmit={this.resetPwdSubmit}/>
+          <LoginCodeForm verify={this.state.verify} wrappedComponentRef={(inst) => this.codeRef = inst} handleSubmit={this.codeSubmit}/>
         </Modal>
       </div>
     )

--
Gitblit v1.8.0