From a25c7697644a40d3aa3a9746085a9a7618dd098a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 10 十月 2023 08:15:09 +0800
Subject: [PATCH] 修改称重提示错误 修改判断

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

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 62d395b..f2af9b5 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: {
@@ -137,6 +119,7 @@
 				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',
@@ -157,6 +140,8 @@
 							this.$reqGet('getUserEntity').then(res => {
 								this.setUserTabbar(res.data.type);
 								uni.setStorageSync('roleType', res.data.type);
+								uni.setStorageSync("userId", res.data.userId)
+								uni.setStorageSync("carNo", res.data.carNo)
 								setCustomerId(res.data.customerid);
 								uni.hideLoading();
 								//璺宠浆椤甸潰
@@ -188,28 +173,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>

--
Gitblit v1.9.1