From 26bda142b0e94c07d8c349f075b5f884fe86e838 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:35 +0800
Subject: [PATCH] Merge branch 'develop'

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

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 7110358..428551a 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -68,11 +68,8 @@
    * @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')
@@ -184,11 +181,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)
@@ -315,6 +309,10 @@
     //   if (!res || !res.ip) return
     //   sessionStorage.setItem('ipAddress', res.ip)
     // })
+
+    setTimeout(() => {
+      Api.delCacheConfig()
+    }, 50)
     if (window.GLOB.filter) {
       let view = document.getElementById('mk-login-view')
       

--
Gitblit v1.8.0