From c311ab706cfc3934e03c875211a41082acff575a Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期一, 02 九月 2024 08:14:23 +0800 Subject: [PATCH] feat:PVC流程提交 --- pages/login/userPassword.vue | 85 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 74 insertions(+), 11 deletions(-) diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue index ffe870d..8a5c22c 100644 --- a/pages/login/userPassword.vue +++ b/pages/login/userPassword.vue @@ -2,13 +2,35 @@ <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> --> + <!-- #ifdef H5 --> + <customPagination + style="width:100%; height: 60rpx; font-size: 30rpx;" + :options="userList" + :value="username" + v-model="username" + @changeInput="changeInput2" + @input="handleInput2" + :placeholder="'璇疯緭鍏ョ櫥褰曡处鍙�'" + ></customPagination> + <!-- #endif --> + <!-- #ifdef MP-WEIXIN --> + <customPagination + style="width:100%; height: 60rpx; font-size: 30rpx;" + :options="userList" + :value="username" + v-model="username" + @changeInput="changeInput2" + @input="handleInput2" + :placeholder="'璇烽�夋嫨鎵嬫満鍙�'" + ></customPagination> + <!-- #endif --> </view> <view class="list-call"> <u--input v-model="password" @@ -17,19 +39,24 @@ type="password" placeholder="璇疯緭鍏ュ瘑鐮�" prefixIcon="lock" + style="padding:0;margin-left:8px;" 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()" - :loading="submitLoading"></u-button></view> + :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', @@ -38,12 +65,21 @@ btnText: { type: Number, default: 0 + }, + userList: { + type: Array, + default: () => { + return []; + } } + }, + components: { + customPagination }, data() { return { username: '', // 瀹㈡埛 - // username:'13333333331',//璐т唬 + // username:'13333333331',//鎵胯繍鍟� // username: '13333333332',// 鍙告満 password: '', remember: true, @@ -53,6 +89,12 @@ }, methods: { ...mapMutations(['setUserTabbar']), + changeInput2(e){ + this.username=e.username + // this.password=e.password + }, + handleInput2(e){ + }, //鐧诲綍 async submit() { uni.showLoading({ @@ -89,18 +131,33 @@ //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛� 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) + uni.removeStorageSync('bunkerIds') + 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 @@ -150,4 +207,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