From 72935b2a35765bcc3622561bb06f2eccd64caf83 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 16:49:00 +0800
Subject: [PATCH] 修改上传图片时页面跳转问题
---
pages/login/userPassword.vue | 90 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 92bd04f..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>
@@ -24,22 +24,29 @@
></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>
<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: {
+ //0:姝ｅ父锛�1锛氬井淇＄粦瀹�
+ btnText: {
+ type: Number,
+ default: 0
+ }
+ },
data() {
return {
- // username: 'appUser',
- // username:'siJi1',
- username:'siJi2',
- password: '123456',
+ username: '', // 瀹㈡埛
+ // username:'13333333331',//璐т唬
+ // username: '13333333332',// 鍙告満
+ password: '',
remember: true,
baseUrl: ''
};
@@ -48,6 +55,9 @@
...mapMutations(['setUserTabbar']),
//鐧诲綍
async submit() {
+ uni.showLoading({
+ title: '鐧诲綍涓�...'
+ });
//琛ㄥ崟鏍￠獙
if (this.username.length === 0) {
this.$u.toast('璇疯緭鍏ヨ处鍙�');
@@ -57,7 +67,7 @@
this.$u.toast('璇疯緭鍏ュ瘑鐮�');
return;
}
- let grant_type = 'password'
+ let grant_type = 'password';
//鐧诲綍鎺ュ彛
await apiLoginPassword({
username: this.username,
@@ -66,24 +76,58 @@
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);
-
- //璺宠浆椤甸潰
- this.$nextTick(() => {
- redirectHome();
+ if (this.btnText == 0) {
+ if (res.code != 1) {
+ // 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
+ setToken(res.access_token);
+ setRefreshToken(res.refresh_token);
+ setUsernameKey(res.username);
+ //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
+ 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 {
+ 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('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ }
+ });
+ }
+ }
})
.catch(e => {
this.$u.toast(e);
--
Gitblit v1.9.1