From 7e7e77134aa0324993ce7d9db9884eab4d8f98fe Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期五, 06 九月 2024 11:41:21 +0800 Subject: [PATCH] feat:分配日计划样式更新 --- pages/login/userPassword.vue | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue index 848871a..8a5c22c 100644 --- a/pages/login/userPassword.vue +++ b/pages/login/userPassword.vue @@ -9,6 +9,18 @@ placeholder="璇疯緭鍏ユ墜鏈哄彿" prefixIcon="account" 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" @@ -18,6 +30,7 @@ @input="handleInput2" :placeholder="'璇烽�夋嫨鎵嬫満鍙�'" ></customPagination> + <!-- #endif --> </view> <view class="list-call"> <u--input v-model="password" @@ -26,6 +39,7 @@ type="password" placeholder="璇疯緭鍏ュ瘑鐮�" prefixIcon="lock" + style="padding:0;margin-left:8px;" prefixIconStyle="font-size: 22px;color: #909399"></u--input> </view> </view> @@ -65,7 +79,7 @@ data() { return { username: '', // 瀹㈡埛 - // username:'13333333331',//璐т唬 + // username:'13333333331',//鎵胯繍鍟� // username: '13333333332',// 鍙告満 password: '', remember: true, @@ -124,8 +138,9 @@ 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; + 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}) } @@ -133,10 +148,16 @@ setCustomerId(res.data.customerid); 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 -- Gitblit v1.9.1