From 1db172e1eb09be68008659c9f05bf18144df553a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 04 十一月 2024 18:54:47 +0800
Subject: [PATCH] feat:集装箱更改

---
 pages/login/login.vue |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1e3d86b..4f27eac 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
 	<view class="login">
 		<view class="logo">鏃犱汉鍊煎畧</view>
 		<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
-		<user-password :btnText="0" />
+		<user-password :btnText="0" :userList="userList"/>
 		<!-- 寰俊openid鐧诲綍 -->
     <!--  #ifdef MP-WEIXIN  -->
 		<view class="loginBtn">
@@ -15,12 +15,16 @@
 		</view>
     <!--  #endif  -->
 		<view class="utils-block">
+			<!--  #ifdef MP-WEIXIN  -->
 			<view @click="forgetPassword"><text>蹇樿瀵嗙爜?</text></view>
+			 <!--  #endif  -->
+   <!--  #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 class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
 		</view>
 
@@ -79,10 +83,14 @@
 				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
 				appid: "",
 				secret: "",
+				userList:[]
 			};
 		},
 		components: {
 			userPassword
+		},
+		onShow() {
+			this.userList=uni.getStorageSync('userList')?JSON.parse(uni.getStorageSync('userList')):[];
 		},
 		methods: {
 			...mapMutations(['setUserTabbar', 'changeisLogin']),
@@ -119,17 +127,17 @@
 				uni.showLoading({
 					title: '鍔犺浇涓�...'
 				});
-				wx.request({
-					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',
-						// 	icon: 'none'
-						// });
-					}
-				});
+				// wx.request({
+				// 	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',
+				// 		// 	icon: 'none'
+				// 		// });
+				// 	}
+				// });
 				this.$nextTick(() => {
 					apiLoginWx({ code: code }).then(res => {
 						if (res.code != 1) {
@@ -145,6 +153,7 @@
 								uni.setStorageSync('roleType', res.data.type);
 								uni.setStorageSync("userId", res.data.userId)
 								uni.setStorageSync("carNo", res.data.carNo)
+								uni.setStorageSync("isFirstMeet", false)
 								setCustomerId(res.data.customerid);
 								uni.hideLoading();
 								//璺宠浆椤甸潰
@@ -156,6 +165,8 @@
 							this.$u.toast(res.msg);
 							this.bindWxModelShow = true;
 						}
+					}).catch((err) => {
+						this.loginPopupShow = false;
 					});
 				});
 				this.loginPopupShow = false;

--
Gitblit v1.9.1