From 96db936c641b23897636ff6a15e31f8f87964342 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 11 十月 2023 13:44:05 +0800
Subject: [PATCH] 确定装卸逻辑修改 增加称重时稳定态
---
pages/login/userPassword.vue | 230 +++++++++++++++++++++++++++++----------------------------
1 files changed, 116 insertions(+), 114 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 5fb6074..73b5cfc 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -2,144 +2,146 @@
<view>
<view class="list">
<view class="list-call">
- <u--input
- v-model="username"
+ <u--input v-model="username"
clearable
maxlength="32"
type="text"
- placeholder="璇疯緭鍏ョ敤鎴峰悕"
+ placeholder="璇疯緭鍏ユ墜鏈哄彿"
prefixIcon="account"
- prefixIconStyle="font-size: 22px;color: #909399"
- ></u--input>
+ prefixIconStyle="font-size: 22px;color: #909399"></u--input>
</view>
<view class="list-call">
- <u--input
- v-model="password"
+ <u--input v-model="password"
clearable
maxlength="32"
type="password"
placeholder="璇疯緭鍏ュ瘑鐮�"
prefixIcon="lock"
- prefixIconStyle="font-size: 22px;color: #909399"
- ></u--input>
+ prefixIconStyle="font-size: 22px;color: #909399"></u--input>
</view>
</view>
- <view class="loginBtn"><u-button type="primary" :text="btnText == 1 ? '缁戝畾' : '鐧诲綍'" @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 { 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: '12222222222', // 瀹㈡埛
- // username:'13333333331',//璐т唬
- // username: '13333333332',// 鍙告満
- password: '123456',
- remember: true,
- baseUrl: ''
- };
- },
- methods: {
- ...mapMutations(['setUserTabbar']),
- //鐧诲綍
- async submit() {
- uni.showLoading({
- title: '鐧诲綍涓�...'
- });
- //琛ㄥ崟鏍￠獙
- if (this.username.length === 0) {
- this.$u.toast('璇疯緭鍏ヨ处鍙�');
- return;
+ import { apiLoginPassword } from '@/api/publicInterface.js';
+ import { mapMutations } from 'vuex';
+ import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
+ export default {
+ name: 'userPassword',
+ props: {
+ //0:姝ｅ父锛�1锛氬井淇＄粦瀹�
+ btnText: {
+ type: Number,
+ default: 0
}
- if (this.password.length === 0) {
- this.$u.toast('璇疯緭鍏ュ瘑鐮�');
- return;
- }
- let grant_type = 'password';
- //鐧诲綍鎺ュ彛
- await apiLoginPassword({
- username: this.username,
- password: this.password,
- grant_type,
- scope: 'server'
- })
- .then(res => {
- setToken(res.access_token);
- setRefreshToken(res.refresh_token);
- 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();
+ },
+ data() {
+ return {
+ username: '', // 瀹㈡埛
+ // username:'13333333331',//璐т唬
+ // username: '13333333332',// 鍙告満
+ password: '',
+ remember: true,
+ baseUrl: ''
+ };
+ },
+ methods: {
+ ...mapMutations(['setUserTabbar']),
+ //鐧诲綍
+ async submit() {
+ uni.showLoading({
+ title: '鐧诲綍涓�...'
+ });
+ //琛ㄥ崟鏍￠獙
+ if (this.username.length === 0) {
+ this.$u.toast('璇疯緭鍏ヨ处鍙�');
+ return;
+ }
+ if (this.password.length === 0) {
+ this.$u.toast('璇疯緭鍏ュ瘑鐮�');
+ return;
+ }
+ let grant_type = 'password';
+ //鐧诲綍鎺ュ彛
+ await apiLoginPassword({
+ username: this.username,
+ password: this.password,
+ grant_type,
+ scope: 'server'
+ })
+ .then(res => {
+ setToken(res.access_token);
+ setRefreshToken(res.refresh_token);
+ 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);
+ uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("carNo", res.data.carNo)
+ setCustomerId(res.data.customerid);
+ setName(res.name);
+ uni.hideLoading();
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ })
+ .catch(err => {
+ this.$u.toast('鐧诲綍寮傚父锛�');
+ console.log(err);
});
- })
- .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 => {
+ } else {
uni.hideLoading();
- if (res.code == 0) {
- this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
- setTimeout(() => {
- uni.navigateBack();
- }, 1000);
- } else {
- this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ 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);
- });
+ })
+ .catch(e => {
+ this.$u.toast(e);
+ });
+ }
}
- }
-};
+ };
</script>
<style lang="scss">
-@import 'index.scss';
-.dengluBtn {
- margin-top: 80rpx;
-}
-</style>
+ @import 'index.scss';
+
+ .dengluBtn {
+ margin-top: 80rpx;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1