From af436aa050f76584cd5cb88e413e45cd08c15d50 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 14:14:04 +0800
Subject: [PATCH] 修改部分错误,增加新功能

---
 pages/login/userPassword.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index f21222d..036390e 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -7,7 +7,7 @@
 					clearable
 					maxlength="32"
 					type="text"
-					placeholder="璇疯緭鍏ョ敤鎴峰悕"
+					placeholder="璇疯緭鍏ユ墜鏈哄彿"
 					prefixIcon="account"
 					prefixIconStyle="font-size: 22px;color: #909399"
 				></u--input>
@@ -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,9 +43,10 @@
 	},
 	data() {
 		return {
-			// username: '12222222222', // 瀹㈡埛
-			username: '13333333332',// 鍙告満
-			password: '123456',
+			username: '', // 瀹㈡埛
+			// username:'13333333331',//璐т唬
+			// username: '13333333332',// 鍙告満
+			password: '',
 			remember: true,
 			baseUrl: ''
 		};
@@ -86,10 +87,11 @@
 							//鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
 							this.$reqGet('getUserEntity')
 								.then(res => {
-									this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
+									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(() => {
@@ -105,8 +107,15 @@
 							this.$u.toast(res.msg);
 						}
 					} else {
-						this.$nextTick(() => {
-							this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('code') }, 'params').then(res => {
+						uni.login({
+							success: res => {
+								if (res.code) {
+									uni.setStorageSync('bindcode', res.code);
+								}
+							}
+						});
+						if (uni.getStorageSync('bindcode')) {
+							this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') }, 'params').then(res => {
 								uni.hideLoading();
 								if (res.code == 0) {
 									this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
@@ -117,7 +126,7 @@
 									this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
 								}
 							});
-						});
+						}
 					}
 				})
 				.catch(e => {

--
Gitblit v1.9.1