From 4e4842518007726677c1dd23dc57f3448e7b08b4 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 30 七月 2024 17:37:35 +0800
Subject: [PATCH] feat:库管首页修改细节
---
pages/login/userPassword.vue | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index b39078a..3f26e1f 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -2,13 +2,22 @@
<view>
<view class="list">
<view class="list-call">
- <u--input v-model="username"
+ <!-- <u--input v-model="username"
clearable
maxlength="32"
type="text"
placeholder="璇疯緭鍏ユ墜鏈哄彿"
prefixIcon="account"
- prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+ prefixIconStyle="font-size: 22px;color: #909399"></u--input> -->
+ <customPagination
+ style="width:100%; height: 60rpx; font-size: 30rpx;"
+ :options="userList"
+ :value="username"
+ v-model="username"
+ @changeInput="changeInput2"
+ @input="handleInput2"
+ :placeholder="'璇烽�夋嫨鎵嬫満鍙�'"
+ ></customPagination>
</view>
<view class="list-call">
<u--input v-model="password"
@@ -17,18 +26,24 @@
type="password"
placeholder="璇疯緭鍏ュ瘑鐮�"
prefixIcon="lock"
+ style="padding:0"
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>
<script>
import { apiLoginPassword } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
+ import customPagination from './user.vue'
import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
export default {
name: 'userPassword',
@@ -37,7 +52,16 @@
btnText: {
type: Number,
default: 0
+ },
+ userList: {
+ type: Array,
+ default: () => {
+ return [];
+ }
}
+ },
+ components: {
+ customPagination
},
data() {
return {
@@ -46,11 +70,18 @@
// username: '13333333332',// 鍙告満
password: '',
remember: true,
- baseUrl: ''
+ baseUrl: '',
+ submitLoading: false
};
},
methods: {
...mapMutations(['setUserTabbar']),
+ changeInput2(e){
+ this.username=e.username
+ // this.password=e.password
+ },
+ handleInput2(e){
+ },
//鐧诲綍
async submit() {
uni.showLoading({
@@ -67,6 +98,7 @@
}
let grant_type = 'password';
//鐧诲綍鎺ュ彛
+ this.submitLoading = true
await apiLoginPassword({
username: this.username,
password: this.password,
@@ -77,6 +109,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,19 +118,35 @@
//鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
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)
+ let data=uni.getStorageSync('userList')?JSON.parse(uni.getStorageSync('userList')):[];
+ let id = data.length + 1;
+ if (data.filter(item=> item.username == this.username).length == 0){
+ data.push({username: this.username,password: this.password,type:res.data.type})
+ }
+ uni.setStorageSync("userList", JSON.stringify(data))
setCustomerId(res.data.customerid);
- setName(res.name);
+ setName(res.data.name);
uni.hideLoading();
- //璺宠浆椤甸潰
- this.$nextTick(() => {
- redirectHome();
- });
+ if(res.data.forcePassword == 1) {
+ uni.navigateTo({
+ url: '/pages/login/resetPassword/resetPassword'
+ })
+ }else {
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ }
})
.catch(err => {
+ this.submitLoading = false
this.$u.toast('鐧诲綍寮傚父锛�');
console.log(err);
});
@@ -128,10 +177,11 @@
});
}
}
- })
- .catch(e => {
+ }).catch(e => {
+ this.submitLoading = false
this.$u.toast(e);
});
+
}
}
};
@@ -143,4 +193,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