From b49af6d65357ccf7b79da14f93c8c5d16e2686e2 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 24 七月 2024 09:16:00 +0800
Subject: [PATCH] feat:h5去除登陆页面注册

---
 pages/login/login.vue |   84 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index d697aee..9da20f8 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,8 +2,9 @@
 	<view class="login">
 		<view class="logo">鏃犱汉鍊煎畧</view>
 		<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
-		<user-password :btnText="0" />
+		<user-password :btnText="0" :userList="userList"/>
 		<!-- 寰俊openid鐧诲綍 -->
+    <!--  #ifdef MP-WEIXIN  -->
 		<view class="loginBtn">
 			<u-button class="button"
 				@click.stop="beforeLoginEvent"
@@ -12,12 +13,20 @@
 				type="primary"
 				text="寰俊涓�閿櫥褰�"></u-button>
 		</view>
-		<view class="register"
-			@click="registerClick"><text>娉ㄥ唽</text></view>
+    <!--  #endif  -->
+		<view class="utils-block">
+			<view @click="forgetPassword"><text>蹇樿瀵嗙爜?</text></view>
+   <!--  #ifdef MP-WEIXIN  -->
+			<view @click="PrivacyAgreementHandle"><text>鏂扮敤鎴锋敞鍐�</text></view>
+    <!--  #endif  -->
+		</view>
+
 		<view class="login-bottom-box">
 			<view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
 			<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
 		</view>
+
+    <!--  #ifdef MP-WEIXIN  -->
 		<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
 		<view class="loginPopup">
 			<u-popup :show="loginPopupShow"
@@ -52,6 +61,7 @@
 				@confirm="bindWxConfirm"
 				@cancel="bindWxCancel"></u-modal>
 		</view>
+    <!--  #endif  -->
 	</view>
 </template>
 
@@ -68,17 +78,30 @@
 				// 缁戝畾寰俊妯℃�佹
 				bindWxModelShow: false,
 				bindWxModelTitle: '鎻愮ず',
-				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+				appid: "",
+				secret: "",
+				userList:[]
 			};
 		},
 		components: {
 			userPassword
 		},
+		onShow() {
+			this.userList=uni.getStorageSync('userList')?JSON.parse(uni.getStorageSync('userList')):[];
+		},
 		methods: {
 			...mapMutations(['setUserTabbar', 'changeisLogin']),
+			getAppidAndSercet() {
+				this.$reqGet('getAppidAndSercet').then(res => {
+					this.appid = res.data.appid;
+					this.secret = res.data.secret
+				})
+			},
 			// 璁块棶wx.login,鑾峰彇code
 			beforeLoginEvent() {
 				this.loginPopupShow = true;
+				this.getAppidAndSercet();
 			},
 			wxLogin() {
 				// 鑾峰彇鐧诲綍鐢ㄦ埛code
@@ -103,8 +126,9 @@
 					title: '鍔犺浇涓�...'
 				});
 				wx.request({
-					url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
+					url: `https://api.weixin.qq.com/sns/jscode2session?appid=${this.appid}&secret=${this.secret}&js_code=${code}&grant_type=authorization_code`,
 					success(res) {
+						console.log(res, 'openid');
 						uni.setStorageSync('openid', res.data.openid);
 						// uni.showToast({
 						// 	title: '鎴愬姛鑾峰彇娴嬭瘯openid',
@@ -125,6 +149,8 @@
 							this.$reqGet('getUserEntity').then(res => {
 								this.setUserTabbar(res.data.type);
 								uni.setStorageSync('roleType', res.data.type);
+								uni.setStorageSync("userId", res.data.userId)
+								uni.setStorageSync("carNo", res.data.carNo)
 								setCustomerId(res.data.customerid);
 								uni.hideLoading();
 								//璺宠浆椤甸潰
@@ -156,11 +182,16 @@
 			openPopup() {
 				console.log('鎵撳紑浜�');
 			},
-			registerClick() {
+			forgetPassword() {
 				uni.navigateTo({
-					url: '/pages/register/register'
-				});
-			}
+					url: '/pages/login/forgetPassword/forgetPassword'
+				})
+			},
+			PrivacyAgreementHandle() {
+				uni.navigateTo({
+					url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
+				})
+			},
 		}
 	};
 </script>
@@ -168,33 +199,26 @@
 <style lang="scss">
 	@import 'index.scss';
 
+	.PrivacyAgreement {
+		color: rgb(60, 156, 255)
+	}
+
 	.login {
-		// height: 100vh;
-		// display: flex;
-		// align-items: center;
-
-		// .loginBtn {
-		//   margin: 0 auto;
-		//   width: 80%;
-
-		//   .u-button {
-		//     .u-icon {
-		//       .u-icon__icon {
-		//         font-size: vww(20) !important;
-		//       }
-		//     }
-		//   }
-
-		//   .u-button--success {
-		//     border-style: none;
-		//   }
-		// }
 		.loginBtn {
 			margin-top: vww(20);
 
 			.u-button {
 				width: 80%;
 			}
+		}
+
+		.utils-block {
+			width: 80%;
+			margin: vww(20) auto;
+			display: flex;
+			justify-content: space-between;
+			color: #497bff;
+			font-size: vww(17);
 		}
 
 		.logo {
@@ -298,4 +322,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1