From 1ab29b3567574a721bd37d5ff9d7e9db386272d6 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 16 三月 2023 17:08:44 +0800
Subject: [PATCH] thirdCommit
---
pages/login/userPassword.vue | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 92bd04f..1a37db5 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -24,7 +24,7 @@
></u--input>
</view>
</view>
- <view class="loginBtn"><u-button type="primary" text="鐧诲綍" @click="submit()"></u-button></view>
+ <view class="loginBtn"><u-button type="primary" :text="btnText == 1 ? '缁戝畾' : '鐧诲綍'" @click="submit()"></u-button></view>
</view>
</template>
@@ -34,11 +34,16 @@
import { setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
export default {
name: 'userPassword',
+ props: {
+ //0:姝ｅ父锛�1锛氬井淇＄粦瀹�
+ btnText: {
+ type: Number,
+ default: 0
+ }
+ },
data() {
return {
- // username: 'appUser',
- // username:'siJi1',
- username:'siJi2',
+ username: '18812345677',
password: '123456',
remember: true,
baseUrl: ''
@@ -48,6 +53,9 @@
...mapMutations(['setUserTabbar']),
//鐧诲綍
async submit() {
+ uni.showLoading({
+ title: '鐧婚檰涓�...'
+ });
//琛ㄥ崟鏍￠獙
if (this.username.length === 0) {
this.$u.toast('璇疯緭鍏ヨ处鍙�');
@@ -57,7 +65,7 @@
this.$u.toast('璇疯緭鍏ュ瘑鐮�');
return;
}
- let grant_type = 'password'
+ let grant_type = 'password';
//鐧诲綍鎺ュ彛
await apiLoginPassword({
username: this.username,
@@ -66,24 +74,45 @@
scope: 'server'
})
.then(res => {
- this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
-
- // 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
setToken(res.access_token);
setRefreshToken(res.refresh_token);
- setUsernameKey(res.username);
-
- //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
- this.$reqGet('getUserEntity').then(res => {
- this.setUserTabbar(res.data.type);
- uni.setStorageSync('roleType', res.data.type);
- setCustomerId(res.data.customerid);
-
- //璺宠浆椤甸潰
+ if (this.btnText == 0) {
+ if (res.code != 1) {
+ this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
+ // 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
+ setToken(res.access_token);
+ setRefreshToken(res.refresh_token);
+ setUsernameKey(res.username);
+ //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
+ this.$reqGet('getUserEntity').then(res => {
+ this.setUserTabbar(res.data.type);
+ uni.setStorageSync('roleType', res.data.type);
+ setCustomerId(res.data.customerid);
+ uni.hideLoading();
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ });
+ } else {
+ uni.hideLoading();
+ this.$u.toast(res.msg);
+ }
+ } else {
this.$nextTick(() => {
- redirectHome();
+ this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('code') }, 'params').then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ }
+ });
});
- });
+ }
})
.catch(e => {
this.$u.toast(e);
--
Gitblit v1.9.1