From 29014207a8882df16d4372ef20e0d79e6e5df6d1 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 30 五月 2024 08:44:28 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg
---
pages/login/userPassword.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index b39078a..b3850b7 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -20,9 +20,13 @@
prefixIconStyle="font-size: 22px;color: #909399"></u--input>
</view>
</view>
- <view class="loginBtn"><u-button type="primary"
+ <view class="loginBtn">
+ <u-button type="primary"
:text="btnText == 1 ? '缁戝畾' : '鐧诲綍'"
- @click="submit()"></u-button></view>
+ @click="submit()"
+ :loading="submitLoading">
+ </u-button>
+ </view>
</view>
</template>
@@ -46,7 +50,8 @@
// username: '13333333332',// 鍙告満
password: '',
remember: true,
- baseUrl: ''
+ baseUrl: '',
+ submitLoading: false
};
},
methods: {
@@ -67,6 +72,7 @@
}
let grant_type = 'password';
//鐧诲綍鎺ュ彛
+ this.submitLoading = true
await apiLoginPassword({
username: this.username,
password: this.password,
@@ -77,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);
@@ -85,12 +92,15 @@
//鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
this.$reqGet('getUserEntity')
.then(res => {
+ console.log(res,'鐧诲綍淇℃伅----------')
this.$u.toast('鐧诲綍鎴愬姛');
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("carNo", res.data.carNo)
+ uni.setStorageSync("userInfo", res.data)
setCustomerId(res.data.customerid);
- setName(res.name);
+ setName(res.data.name);
uni.hideLoading();
//璺宠浆椤甸潰
this.$nextTick(() => {
@@ -98,6 +108,7 @@
});
})
.catch(err => {
+ this.submitLoading = false
this.$u.toast('鐧诲綍寮傚父锛�');
console.log(err);
});
@@ -128,10 +139,11 @@
});
}
}
- })
- .catch(e => {
+ }).catch(e => {
+ this.submitLoading = false
this.$u.toast(e);
});
+
}
}
};
@@ -143,4 +155,10 @@
.dengluBtn {
margin-top: 80rpx;
}
-</style>
\ No newline at end of file
+ /* #ifdef H5 */
+ .loginBtn{
+ width: 80%;
+ margin: 0 auto;
+ }
+ /* #endif */
+</style>
--
Gitblit v1.9.1