From 01c82e2ed527bae42fe53452073522d74980bf16 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期三, 03 七月 2024 11:28:09 +0800
Subject: [PATCH] 无车牌修改的内容
---
pages/login/userPassword.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 5077299..74029aa 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -25,6 +25,7 @@
<view class="loginBtn"><u-button type="primary"
:text="btnText == 1 ? '缁戝畾' : '鐧诲綍'"
@click="submit()"
+ :loading="submitLoading"
></u-button></view>
</view>
</template>
@@ -32,7 +33,7 @@
<script>
import { apiLoginPassword } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
- import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
+ import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome,setUserId } from '@/utils/status.js';
export default {
name: 'userPassword',
props: {
@@ -49,7 +50,8 @@
// username: '13333333332',// 鍙告満
password: '',
remember: true,
- baseUrl: ''
+ baseUrl: '',
+ submitLoading: false
};
},
methods: {
@@ -70,6 +72,7 @@
}
let grant_type = 'password';
//鐧诲綍鎺ュ彛
+ this.submitLoading = true
await apiLoginPassword({
username: this.username,
password: this.password,
@@ -80,6 +83,7 @@
setToken(res.access_token);
setRefreshToken(res.refresh_token);
if (this.btnText == 0) {
+ this.submitLoading = false
if (res.code != 1) {
// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
setToken(res.access_token);
@@ -91,13 +95,22 @@
this.$u.toast('鐧诲綍鎴愬姛');
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
+ uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("userInfo", res.data)
setCustomerId(res.data.customerid);
+ setUserId(res.data.userId);
setName(res.name);
uni.hideLoading();
- //璺宠浆椤甸潰
- this.$nextTick(() => {
- redirectHome();
- });
+ if(res.data.forcePassword == 1) { //forcePassword涓�1寮哄埗淇敼瀵嗙爜
+ uni.navigateTo({
+ url: `/pages/login/resetPassword/resetPassword?userInfo=${JSON.stringify(res.data)}`
+ })
+ }else {
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ }
})
.catch(err => {
this.$u.toast('鐧诲綍寮傚父锛�');
@@ -132,6 +145,7 @@
}
})
.catch(e => {
+ this.submitLoading = false
this.$u.toast(e);
});
}
@@ -153,4 +167,4 @@
letter-spacing: 10rpx;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1