|
|
@@ -35,21 +35,24 @@ export const useUserStore = defineStore('user', () => {
|
|
|
}
|
|
|
// 登录方法
|
|
|
function Login(userInfo) {
|
|
|
- const username = userInfo.username
|
|
|
+ let username = userInfo.username
|
|
|
const password = userInfo.password
|
|
|
const loginInfo = {
|
|
|
username,
|
|
|
password
|
|
|
}
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- login(username.trim(), password)
|
|
|
+ username = username.trim()
|
|
|
+ login(username, password)
|
|
|
.then(res => {
|
|
|
useId.value = res.returnParams.useId // 设置staffId
|
|
|
user.value = res.returnParams
|
|
|
//保存账号密码
|
|
|
uni.setStorageSync('loginInfo', loginInfo)
|
|
|
- // setSession(res.session)
|
|
|
- reLogin(username.trim(), password).then((res) => {
|
|
|
+ if(username.includes('@')){
|
|
|
+ username = username.split('@')[0]
|
|
|
+ }
|
|
|
+ reLogin(username, password).then((res) => {
|
|
|
if ("ok" === res.data) {
|
|
|
setSession(res.cookies[0].split("=")[1].split(";")[0]);
|
|
|
timer.value = true
|