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 |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 8608e2c..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,6 +39,7 @@
 					type="password"
 					placeholder="璇疯緭鍏ュ瘑鐮�"
 					prefixIcon="lock"
+					style="padding:0;margin-left:8px;"
 					prefixIconStyle="font-size: 22px;color: #909399"></u--input>
 			</view>
 		</view>
@@ -33,6 +56,7 @@
 <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',
@@ -41,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,
@@ -56,6 +89,12 @@
 		},
 		methods: {
 			...mapMutations(['setUserTabbar']),
+			changeInput2(e){
+				this.username=e.username
+				// this.password=e.password
+			},
+			handleInput2(e){
+			},
 			//鐧诲綍
 			async submit() {
 				uni.showLoading({
@@ -99,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})
 										}
@@ -108,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