From 5733a0b2992765c4c91e3c96ebfc1833ed8a9112 Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Sat, 23 Mar 2024 14:43:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B3=A8=E5=86=8C=E3=80=81=E5=BF=98=E8=AE=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9B2=E3=80=81=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8E=BB=E9=99=A4=E5=BA=95=E9=83=A8=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B4=E3=80=81token=E5=A4=B1=E6=95=88=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=80=BB=E9=9B=86=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue        | 21 ++++++++++++---------
 pages/login/template.vue     |  4 ++--
 pages/user/policyContent.vue |  5 ++++-
 untils/AxiosUtils.js         | 35 ++++++++++++++++++-----------------
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index d9239b6..7a989da 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,10 +11,10 @@
 		<view v-if="loading" class="btn nocheck" loading="true">登录中</view>
 		<view v-else-if="validate" class="btn" @click="login">立即登录</view>
 		<view v-else class="btn nocheck">立即登录</view>
-		<view class="changeLogintype">
+		<!-- <view class="changeLogintype">
 			<view class="" @click="goReg">手机注册</view>
 			<view class="" @click="goForget">忘记密码</view>
-		</view>
+		</view> -->
 	</login-template>
 </template>
 
@@ -73,12 +73,14 @@
 			},
 			login(e) {
 				if (this.validate) {
-					if (!this.userChecked) {
-						uni.showToast({
-							title:'请先阅读并同意《服务及隐私协议》',
-							icon:'none',
-						})
-					} else {
+					this.userChecked = true;
+					console.log(this.userChecked)
+					// if (!this.userChecked) {
+					// 	uni.showToast({
+					// 		title:'请先阅读并同意《服务及隐私协议》',
+					// 		icon:'none',
+					// 	})
+					// } else {
 						var that = this
 						this.loading = true
 						this.$store.dispatch("LoginByUsername", {
@@ -103,8 +105,9 @@
 						}).catch((err) => {
 							this.loading = false
 							// this.$refs.code.refushCode()
+							location.href = "https://dy12333.org.cn/h5/"
 						});
-					}
+					// }
 				}
 			},
 			// 步骤
diff --git a/pages/login/template.vue b/pages/login/template.vue
index 8a40867..95b9c31 100644
--- a/pages/login/template.vue
+++ b/pages/login/template.vue
@@ -5,11 +5,11 @@
 		<slot></slot>
 		<view v-if="!hideBottom" class="bottomt">
 			<view class="bottomt-box">
-				<view class="check-icon" @click="checkChanged">
+				<!-- <view class="check-icon" @click="checkChanged">
 					<image v-if="userChecked" src="../../static/img/checkOk.png" style="width: 30rpx;height:30rpx;"></image>
 					<view class="noneCheck" v-else></view>
 				</view>
-				已阅读并同意<text class="bottomtText" @click="goMent">《服务及隐私协议》</text>
+				已阅读并同意<text class="bottomtText" @click="goMent">《服务及隐私协议》</text> -->
 				
 			</view>
 			
diff --git a/pages/user/policyContent.vue b/pages/user/policyContent.vue
index 2343ef9..95e25a8 100644
--- a/pages/user/policyContent.vue
+++ b/pages/user/policyContent.vue
@@ -38,8 +38,11 @@
 </script>
 
 <style>
-	page{
+	/* page{
 		padding: 20px 20px 20px 20px;
 		overflow: auto;
+	} */
+	.policy-content {
+		padding: 30rpx;
 	}
 </style>
diff --git a/untils/AxiosUtils.js b/untils/AxiosUtils.js
index 0f92493..d62574c 100644
--- a/untils/AxiosUtils.js
+++ b/untils/AxiosUtils.js
@@ -162,23 +162,24 @@ export function Promisify(func) {
 export function GoLogin() {
 	if (showModal) {
 		showModal = false
-		uni.showModal({
-			title: "提示",
-			content: "您还未登录，点击确认去登录",
-			success({
-				confirm
-			}) {
-				if (confirm) {
-					uni.redirectTo({
-						url: "/pages/login/login"
-					});
-				}
-				showModal = true
-			},
-			fail() {
-				showModal = true
-			}
-		})
+		location.href = "https://dy12333.org.cn/h5/"
+		// uni.showModal({
+		// 	title: "提示",
+		// 	content: "您还未登录，点击确认去登录",
+		// 	success({
+		// 		confirm
+		// 	}) {
+		// 		if (confirm) {
+		// 			uni.redirectTo({
+		// 				url: "/pages/login/login"
+		// 			});
+		// 		}
+		// 		showModal = true
+		// 	},
+		// 	fail() {
+		// 		showModal = true
+		// 	}
+		// })
 	}
 }