From 76c41f4669a36b0d4cb5b82906419408a6b7de96 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 14 八月 2023 08:24:41 +0800
Subject: [PATCH] 称重页面修改称重历史默认隐藏,提煤单详情页面修改

---
 pages/login/login.vue |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5d31eb0..62d395b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -57,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>
 
@@ -73,7 +88,12 @@
 				// 缁戝畾寰俊妯℃�佹
 				bindWxModelShow: false,
 				bindWxModelTitle: '鎻愮ず',
-				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+				appid: "",
+				secret: "",
+				privacyShow: false,
+				privacyTitle: "娉ㄦ剰",
+				PrivacyAgreement: `<p>娉ㄥ唽鍗充唬琛ㄦ偍鍚屾剰鎴戜滑鐢ㄦ埛闅愮鍗忚</p><p  class='PrivacyAgreement'>鐐瑰嚮鏌ョ湅鐢ㄦ埛闅愮鍗忚</p>`
 			};
 		},
 		components: {
@@ -81,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
@@ -108,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({
@@ -161,12 +188,23 @@
 			openPopup() {
 				console.log('鎵撳紑浜�');
 			},
-			registerClick() {
+			privacyConfirm() {
 				uni.navigateTo({
 					url: '/pages/register/register'
 				});
 			},
-			// 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙e喅
+			privacyCancel() {
+				this.privacyShow = false
+			},
+			registerClick() {
+				this.privacyShow = true
+			},
+			PrivacyAgreementHandle() {
+				uni.navigateTo({
+					url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
+				})
+			},
+			// 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熷凡閫氳繃鎵爜瑙e喅
 			jumpBindBack() {
 				uni.navigateTo({
 					url: '/pages/bindBackground/bindBackground'
@@ -179,6 +217,10 @@
 <style lang="scss">
 	@import 'index.scss';
 
+	.PrivacyAgreement {
+		color: rgb(60, 156, 255)
+	}
+
 	.login {
 		// height: 100vh;
 		// display: flex;

--
Gitblit v1.9.1