From 28c2b4ead37dad51a25f0300bd1998e1f07fe96f Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 15 十月 2024 08:41:55 +0800
Subject: [PATCH] feat:绑定bug
---
pages/login/userPassword.vue | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index dc55dec..8ff25a4 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,20 +95,37 @@
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 => {
+ uni.hideLoading();
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
this.$u.toast('鐧诲綍寮傚父锛�');
console.log(err);
});
} else {
+ this.submitLoading = false
uni.hideLoading();
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
this.$u.toast(res.msg);
}
} else {
@@ -113,26 +134,33 @@
if (res.code) {
uni.setStorageSync('bindcode', res.code);
}
- }
- });
- if (uni.getStorageSync('bindcode')) {
+ if (uni.getStorageSync('bindcode')) {
this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') },
'params').then(res => {
+ this.submitLoading = false;
uni.hideLoading();
if (res.code == 0) {
+ this.submitLoading = false;
+ uni.hideLoading();
this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
setTimeout(() => {
uni.navigateBack();
}, 1000);
} else {
+ uni.hideLoading();
this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
}
});
}
+ }
+ });
+
}
})
.catch(e => {
+ this.submitLoading = false
this.$u.toast(e);
+ uni.hideLoading();
});
}
}
--
Gitblit v1.9.1