From 4d7d02bbe9e91f4bdd2f45642775c320260129bc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 13 七月 2023 15:18:20 +0800
Subject: [PATCH] 验质修改

---
 pages/login/login.vue |   66 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index d697aee..162aa5f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -10,12 +10,17 @@
 				:disabled="btnLoading"
 				:loading="btnLoading"
 				type="primary"
-				text="寰俊涓�閿櫥褰�"></u-button>
+				text="鎵嬫満鍙蜂竴閿櫥褰�"></u-button>
 		</view>
+		<!-- <view class="loginBtn">
+			<u-button @click.stop="jumpBindBack"
+				type="primary"
+				text="涓�閿粦瀹氭祴璇�"></u-button>
+		</view> -->
 		<view class="register"
 			@click="registerClick"><text>娉ㄥ唽</text></view>
 		<view class="login-bottom-box">
-			<view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
+			<view class="copyright">鏃犱汉鍊煎畧寰俊灏忕▼搴�</view>
 			<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
 		</view>
 		<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
@@ -52,6 +57,21 @@
 				@confirm="bindWxConfirm"
 				@cancel="bindWxCancel"></u-modal>
 		</view>
+		<!-- 娉ㄥ唽鍚屾剰鑾峰彇闅愮淇℃伅 -->
+		<view class="privacy">
+			<u-modal :show="privacyShow"
+				:title="privacyTitle"
+				showCancelButton
+				@confirm="privacyConfirm"
+				@cancel="privacyCancel"
+				confirmText="鍚屾剰"
+				cancelText="涓嶅悓鎰�">
+				<view class="slot-content"
+					@click="PrivacyAgreementHandle">
+					<rich-text :nodes="PrivacyAgreement"></rich-text>
+				</view>
+			</u-modal>
+		</view>
 	</view>
 </template>
 
@@ -68,7 +88,12 @@
 				// 缁戝畾寰俊妯℃�佹
 				bindWxModelShow: false,
 				bindWxModelTitle: '鎻愮ず',
-				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+				appid: "",
+				secret: "",
+				privacyShow: false,
+				privacyTitle: "娉ㄦ剰",
+				PrivacyAgreement: `<p>娉ㄥ唽鍗充唬琛ㄦ偍鍚屾剰鎴戜滑鐢ㄦ埛闅愮鍗忚</p><p  class='PrivacyAgreement'>鐐瑰嚮鏌ョ湅鐢ㄦ埛闅愮鍗忚</p>`
 			};
 		},
 		components: {
@@ -76,9 +101,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
@@ -103,7 +135,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({
@@ -116,7 +148,6 @@
 					apiLoginWx({ code: code }).then(res => {
 						if (res.code != 1) {
 							this.$u.toast('鐧诲綍鎴愬姛');
-							this.changeisLogin(true);
 							// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
 							setToken(res.access_token);
 							setRefreshToken(res.refresh_token);
@@ -131,7 +162,7 @@
 								this.$nextTick(() => {
 									redirectHome();
 								});
-							});
+							})
 						} else {
 							this.$u.toast(res.msg);
 							this.bindWxModelShow = true;
@@ -156,10 +187,27 @@
 			openPopup() {
 				console.log('鎵撳紑浜�');
 			},
-			registerClick() {
+			privacyConfirm() {
 				uni.navigateTo({
 					url: '/pages/register/register'
 				});
+			},
+			privacyCancel() {
+				this.privacyShow = false
+			},
+			registerClick() {
+				this.privacyShow = true
+			},
+			PrivacyAgreementHandle() {
+				uni.navigateTo({
+					url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
+				})
+			},
+			// 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽凡缁忛�氳繃鎵爜瑙e喅
+			jumpBindBack() {
+				uni.navigateTo({
+					url: '/pages/bindBackground/bindBackground'
+				})
 			}
 		}
 	};
@@ -168,6 +216,10 @@
 <style lang="scss">
 	@import 'index.scss';
 
+	.PrivacyAgreement {
+		color: rgb(60, 156, 255)
+	}
+
 	.login {
 		// height: 100vh;
 		// display: flex;

--
Gitblit v1.9.1