From c7372dc7f495bdefb7f5e78d1c02756d637377b3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 20 六月 2024 17:13:06 +0800
Subject: [PATCH] feat:司机去掉查看验质出场时间

---
 pages/login/login.vue |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index adac256..8794449 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -10,7 +10,7 @@
 				:disabled="btnLoading"
 				:loading="btnLoading"
 				type="primary"
-				text="寰俊涓�閿櫥褰�"></u-button>
+				text="鎵嬫満鍙蜂竴閿櫥褰�"></u-button>
 		</view>
 		<!-- <view class="loginBtn">
 			<u-button @click.stop="jumpBindBack"
@@ -18,7 +18,7 @@
 				text="涓�閿粦瀹氭祴璇�"></u-button>
 		</view> -->
 		<view class="register"
-			@click="registerClick"><text>娉ㄥ唽</text></view>
+			@click="PrivacyAgreementHandle"><text>娉ㄥ唽</text></view>
 		<view class="login-bottom-box">
 			<view class="copyright">鏃犱汉鍊煎畧寰俊灏忕▼搴�</view>
 			<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
@@ -73,7 +73,9 @@
 				// 缁戝畾寰俊妯℃�佹
 				bindWxModelShow: false,
 				bindWxModelTitle: '鎻愮ず',
-				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+				appid: "",
+				secret: "",
 			};
 		},
 		components: {
@@ -81,9 +83,16 @@
 		},
 		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
@@ -108,7 +117,7 @@
 					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) {
 						uni.setStorageSync('openid', res.data.openid);
 						// uni.showToast({
@@ -121,7 +130,6 @@
 					apiLoginWx({ code: code }).then(res => {
 						if (res.code != 1) {
 							this.$u.toast('鐧诲綍鎴愬姛');
-							this.changeisLogin(true);
 							// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
 							setToken(res.access_token);
 							setRefreshToken(res.refresh_token);
@@ -136,7 +144,7 @@
 								this.$nextTick(() => {
 									redirectHome();
 								});
-							});
+							})
 						} else {
 							this.$u.toast(res.msg);
 							this.bindWxModelShow = true;
@@ -161,17 +169,11 @@
 			openPopup() {
 				console.log('鎵撳紑浜�');
 			},
-			registerClick() {
+			PrivacyAgreementHandle() {
 				uni.navigateTo({
-					url: '/pages/register/register'
-				});
-			},
-			// 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙e喅
-			jumpBindBack() {
-				uni.navigateTo({
-					url: '/pages/bindBackground/bindBackground'
+					url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
 				})
-			}
+			},
 		}
 	};
 </script>
@@ -179,6 +181,10 @@
 <style lang="scss">
 	@import 'index.scss';
 
+	.PrivacyAgreement {
+		color: rgb(60, 156, 255)
+	}
+
 	.login {
 		// height: 100vh;
 		// display: flex;

--
Gitblit v1.9.1