From 3fd2eb7149c35146b4cf44a37d8527a351f3c643 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 11 九月 2023 16:44:18 +0800
Subject: [PATCH] 修改隐私协议

---
 pages/login/userPassword.vue                              |    3 +
 pages/login/login.vue                                     |   37 ------------------
 pages/login/PrivacyAgreementText/PrivacyAgreementText.vue |   32 +++++++++++++++
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue b/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue
index 3256993..346768c 100644
--- a/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue
+++ b/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue
@@ -68,6 +68,10 @@
 				6.1&nbsp;&nbsp;濡傛灉鎮ㄥ鏈殣绉佹斂绛栨湁浠讳綍鐤戦棶鎴栨剰瑙侊紝璇烽�氳繃搴旂敤绋嬪簭鍐呯殑鑱旂郴鏂瑰紡涓庢垜浠仈绯汇�傛垜浠皢灏藉揩鍥炲鎮ㄥ苟瑙e喅鎮ㄧ殑闂銆�
 			</p>
 		</view>
+		<view class="use-button">
+			<button open-type="agreePrivacyAuthorization"
+				@click='agreeFile'>鎴戝凡鐭ユ檽骞跺悓鎰忔鍗忚</button>
+		</view>
 	</view>
 </template>
 
@@ -79,7 +83,11 @@
 			}
 		},
 		methods: {
-
+			agreeFile() {
+				uni.navigateTo({
+					url: '/pages/register/register'
+				});
+			},
 		}
 	}
 </script>
@@ -113,5 +121,27 @@
 		.section-detail {
 			color: rgb(83, 83, 83);
 		}
+
+		.use-button {
+			width: 98%;
+			height: vww(70);
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			/deep/ button {
+				width: 80%;
+				height: 40px;
+				line-height: 40px;
+				padding: 0 12px;
+				font-size: 28rpx;
+				font-weight: 300;
+				color: #ffffff;
+				background: #497bfb;
+				letter-spacing: 4rpx;
+				border-radius: 37rpx 37rpx 37rpx 37rpx;
+				box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 162aa5f..8794449 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -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>
@@ -57,21 +57,6 @@
 				@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>
 
@@ -91,9 +76,6 @@
 				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
 				appid: "",
 				secret: "",
-				privacyShow: false,
-				privacyTitle: "娉ㄦ剰",
-				PrivacyAgreement: `<p>娉ㄥ唽鍗充唬琛ㄦ偍鍚屾剰鎴戜滑鐢ㄦ埛闅愮鍗忚</p><p  class='PrivacyAgreement'>鐐瑰嚮鏌ョ湅鐢ㄦ埛闅愮鍗忚</p>`
 			};
 		},
 		components: {
@@ -187,28 +169,11 @@
 			openPopup() {
 				console.log('鎵撳紑浜�');
 			},
-			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'
-				})
-			}
 		}
 	};
 </script>
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 516ef25..a0a2c3b 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -24,7 +24,8 @@
 		</view>
 		<view class="loginBtn"><u-button type="primary"
 				:text="btnText == 1 ? '缁戝畾' : '鐧诲綍'"
-				@click="submit()"></u-button></view>
+				@click="submit()"
+				open-type="getPhoneNumber"></u-button></view>
 	</view>
 </template>
 

--
Gitblit v1.9.1