From 2ab92240f1eccf659d7380dc524e76faca6f644c Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 04 十二月 2024 15:37:44 +0800
Subject: [PATCH] feat:库管新页面提交

---
 pages/login/userPassword.vue |  105 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 3f26e1f..f145714 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,17 +30,38 @@
 					@input="handleInput2"
 					:placeholder="'璇烽�夋嫨鎵嬫満鍙�'"
 				></customPagination>
+				<!--  #endif  -->
 			</view>
 			<view class="list-call">
-				<u--input v-model="password"
+				<u-input v-model="password"
 					clearable
 					maxlength="32"
-					type="password"
+					:type="inpType ?  'password' : 'text'"
 					placeholder="璇疯緭鍏ュ瘑鐮�"
 					prefixIcon="lock"
-					style="padding:0"
-					prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+					style="padding:0;margin-left:8px;"
+					prefixIconStyle="font-size: 22px;color: #909399">
+					<template slot="suffix">
+						<u-icon  size="40" name="eye" @click="todoShow"></u-icon>
+				</template>
+				</u-input>
 			</view>
+		</view>
+		<!-- 璁颁綇瀵嗙爜 -->
+		<view class="jizhu">
+			<view>
+				<u-checkbox-group
+         	v-model="isJizhu"
+            placement="column"
+            @change="checkboxChange"
+        >
+			<u-checkbox
+			:checked="isChecked"
+			label="璁颁綇瀵嗙爜" :size='35' :iconSize="35" :labelSize="30" name="1"
+			placement="row">
+		</u-checkbox>
+		</u-checkbox-group>
+	</view>
 		</view>
 		<view class="loginBtn">
       <u-button type="primary"
@@ -66,12 +99,16 @@
 		data() {
 			return {
 				username: '', // 瀹㈡埛
-				// username:'13333333331',//璐т唬
-				// username: '13333333332',// 鍙告満
-				password: '',
+				isJizhu: uni.getStorageSync('remberPassWord').username  ? ['1'] : false,
+				isChecked:false,
+				username: uni.getStorageSync('remberPassWord').username || '',//鎵胯繍鍟�
+				password: uni.getStorageSync('remberPassWord').password || '',
 				remember: true,
+				inpType:true,
 				baseUrl: '',
-				submitLoading: false
+				submitLoading: false,
+				weXinisLoginFlag:[1,2,3], //寰俊
+				H5IsLoginFlag:[5,6], //h5
 			};
 		},
 		methods: {
@@ -81,6 +118,11 @@
 				// this.password=e.password
 			},
 			handleInput2(e){
+			},
+			todoShow(){
+				console.log('鐐瑰嚮')
+				this.inpType = !this.inpType
+
 			},
 			//鐧诲綍
 			async submit() {
@@ -111,6 +153,8 @@
 						if (this.btnText == 0) {
 							this.submitLoading = false
 							if (res.code != 1) {
+							
+
 								// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
 								setToken(res.access_token);
 								setRefreshToken(res.refresh_token);
@@ -119,12 +163,42 @@
 								this.$reqGet('getUserEntity')
 									.then(res => {
                     console.log(res,'鐧诲綍淇℃伅----------')
+					                  	//#ifdef MP-WEIXIN
+								if(this.H5IsLoginFlag.includes(res.data.type)) {
+									this.$u.toast('褰撳墠瑙掕壊璇峰墠寰�h5椤甸潰鐧诲綍')
+									return ;
+
+								}
+								//#endif
+								// #ifdef H5
+								if(this.weXinisLoginFlag.includes(res.data.type)) {
+									console.log('瑙﹀彂鐧诲綍瑙掕壊')
+									this.$u.toast('褰撳墠瑙掕壊璇峰墠寰�灏忕▼搴忕櫥褰�')
+									return ;
+
+								}
+								//#endif
+
 										this.$u.toast('鐧诲綍鎴愬姛');
+										if(this.isJizhu.length){ //璁颁綇瀵嗙爜
+											uni.setStorageSync('remberPassWord',{
+												username: this.username,
+												password: this.password,
+											});
+										}else{
+											uni.setStorageSync('remberPassWord',{
+												username: this.username,
+												password: '',
+											});
+										}
 										this.setUserTabbar(res.data.type);
+										uni.setStorageSync('productIds',res.data.productIds)
 										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')
+										uni.setStorageSync("isFirstMeet", false)
 										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){
@@ -160,9 +234,7 @@
 									if (res.code) {
 										uni.setStorageSync('bindcode', res.code);
 									}
-								}
-							});
-							if (uni.getStorageSync('bindcode')) {
+									if (uni.getStorageSync('bindcode')) {
 								this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') },
 									'params').then(res => {
 									uni.hideLoading();
@@ -176,12 +248,18 @@
 									}
 								});
 							}
+								}
+							});
+						
 						}
 					}).catch(e => {
 						this.submitLoading = false
 						this.$u.toast(e);
 					});
 
+			},
+			checkboxChange(val){
+				console.log(val,'isJz')
 			}
 		}
 	};
@@ -199,4 +277,9 @@
     margin: 0 auto;
   }
   /* #endif */
+  .jizhu{
+	padding: 40rpx 70rpx 40rpx 70rpx;
+	display: flex;
+    justify-content: flex-end;
+  }
 </style>

--
Gitblit v1.9.1