From e7b0b34176549cfec809c6b89c4cab0999e488b9 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 16:40:56 +0800
Subject: [PATCH] 修改大部分问题

---
 pages/login/userPassword.vue |   56 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 1a37db5..e71f036 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -31,7 +31,7 @@
 <script>
 import { apiLoginPassword } from '@/api/publicInterface.js';
 import { mapMutations } from 'vuex';
-import { setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
+import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
 export default {
 	name: 'userPassword',
 	props: {
@@ -43,7 +43,9 @@
 	},
 	data() {
 		return {
-			username: '18812345677',
+			username: '12222222222', // 瀹㈡埛
+			// username:'13333333331',//璐т唬
+			// username: '13333333332',// 鍙告満
 			password: '123456',
 			remember: true,
 			baseUrl: ''
@@ -54,7 +56,7 @@
 		//鐧诲綍
 		async submit() {
 			uni.showLoading({
-				title: '鐧婚檰涓�...'
+				title: '鐧诲綍涓�...'
 			});
 			//琛ㄥ崟鏍¢獙
 			if (this.username.length === 0) {
@@ -78,39 +80,43 @@
 					setRefreshToken(res.refresh_token);
 					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();
+							this.$reqGet('getUserEntity')
+								.then(res => {
+									this.$u.toast('鐧诲綍鎴愬姛');
+									this.setUserTabbar(res.data.type);
+									uni.setStorageSync('roleType', res.data.type);
+									setCustomerId(res.data.customerid);
+									setName(res.name);
+									uni.hideLoading();
+									//璺宠浆椤甸潰
+									this.$nextTick(() => {
+										redirectHome();
+									});
+								})
+								.catch(err => {
+									this.$u.toast('鐧诲綍寮傚父锛�');
+									console.log(err);
 								});
-							});
 						} else {
 							uni.hideLoading();
 							this.$u.toast(res.msg);
 						}
 					} else {
-						this.$nextTick(() => {
-							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 : '缁戝畾澶辫触');
-								}
-							});
+						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 : '缁戝畾澶辫触');
+							}
 						});
 					}
 				})

--
Gitblit v1.9.1