From f82c31084deaf0c86fb42ef1d966823cf5420b3d Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 7 Jan 2025 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/forgetPwd.vue | 34 +++++++-----------
 pages/login/login.vue     |  3 +-
 pages/login/register.vue  |  4 +--
 pages/me/agreement.vue    | 72 ++++++++++++++++++---------------------
 pages/me/privacy.vue      |  4 +--
 5 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/pages/login/forgetPwd.vue b/pages/login/forgetPwd.vue
index 56e9e12..3be07f2 100644
--- a/pages/login/forgetPwd.vue
+++ b/pages/login/forgetPwd.vue
@@ -66,22 +66,22 @@
 				title: '正在发送验证码...'
 			})
 			let res = await setSendMsg(data.mobile,'forget')
-			if ( res.code == 0 ) {
+			uni.hideLoading();
+			uni.hideToast();
+			if( res ){
 				data.sending = true;
 				uni.showToast({
 					title: '验证码发送成功请注意查收',
 					icon: 'none',
-					duration: 1000
 				})
 				data.countDown();
 			} else {
 				uni.showModal({
 					showCancel: false,
 					title: '短信发送失败',
-					content: res.msg ? res.msg : '请一分钟后再获取验证码'
+					content: '请一分钟后再获取验证码'
 				});
 			}
-			uni.hideLoading();
 			
 		}
 	}
@@ -146,25 +146,15 @@
 				msg: data.code,
 			})
 			uni.hideLoading();
-			if (res.code === 0) {
-				uni.showToast({
-					title: '密码找回成功',
-					icon: 'none'
+			uni.showToast({
+				title: '密码找回成功',
+				icon: 'none'
+			});
+			setTimeout(function() {
+				uni.navigateTo({
+					url: '/pages/login/login'
 				});
-				setTimeout(function() {
-					uni.navigateTo({
-						url: '/pages/login/login'
-					});
-				}, 1000)
-					
-			} else {
-					
-				uni.showModal({
-					showCancel: false,
-					title: '密码找回失败',
-					content: res.msg,
-				});
-			}
+			}, 1000)
 		}
 		
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index aec81b7..d4dae0c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -37,7 +37,7 @@
 				<!-- 协议地址 -->
 				<navigator url="/pages/me/privacy" open-type="navigate">《隐私政策》</navigator>
 				和
-				<navigator url="/me/setting/xieyi" open-type="navigate">《用户服务协议》</navigator>
+				<navigator url="/pages/me/agreement" open-type="navigate">《用户服务协议》</navigator>
 			</view>
 			
 			<u-toast ref="uToast" />
@@ -128,6 +128,7 @@
 				password: password,
 				phone: mobile
 			})
+			console.log(res)
 			uni.setStorageSync('token', res.token)
 			uni.setStorageSync('userId', res.user.userId)
 			uni.setStorageSync('userName', res.user.userName)
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 0391bb3..9f65a0a 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -35,9 +35,9 @@
 				</u-checkbox-group>
 				<view>注册即同意</view>
 				<!-- 协议地址 -->
-				<navigator url="/me/setting/mimi" open-type="navigate" style="color: #37A6FF;">《隐私政策》</navigator>
+				<navigator url="/pages/me/privacy" open-type="navigate" style="color: #37A6FF;">《隐私政策》</navigator>
 				与
-				<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37A6FF;">《用户协议》</navigator>
+				<navigator url="/pages/me/agreement" open-type="navigate" style="color: #37A6FF;">《用户协议》</navigator>
 			</view>
 		</view>
 	</view>
diff --git a/pages/me/agreement.vue b/pages/me/agreement.vue
index 471ff98..e82dc7d 100644
--- a/pages/me/agreement.vue
+++ b/pages/me/agreement.vue
@@ -1,6 +1,6 @@
 <template>
     <view style="line-height: 26px;padding: 32upx;" class="home1 ">
-		<view style="font-size: 28upx;" v-html="content"></view>
+		<view style="font-size: 28upx;" v-html="data.content"></view>
 		<view class="btn-box  u-flex u-row-center" v-if="!isLogin">
 			<view class="btn cancel" @click="cancel">拒绝</view>
 			<view class="btn" @click="back">同意</view>
@@ -8,43 +8,39 @@
     </view>
 </template>
 
-<script>
-    export default {
-        data() {
-            return {
-				content:'',
-				isLogin:false
-			}
-        },
-		onLoad() {
-			this.getGuize();
-			this.isLogin=uni.getStorageSync('token')?true:false
-		},
-        methods: {
-			cancel(){
-				// #ifdef H5
-				uni.navigateBack()
-				// #endif
-				// #ifdef APP
-				plus.runtime.quit();
-				// #endif
-			},
-			back(){
-				uni.navigateBack()
-			},
-			getGuize(){
-				// this.$Request.getT('/agreement/find?id=1').then(res =>{
-				// 	if(res.status === 0){
-				// 		this.content = res.data.content;
-				// 	}
-				// });
-				this.$u.get('app/common/type/154').then(res => {
-					this.content = res.data.value
-					
-				});
-			}
-		}
-    }
+<script setup>
+	import { reactive } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app'
+	import config from '@/commons/config.js';
+	import {selectUserById} from '@/api/user/user.js';
+	import {commonType} from '@/api/init.js';
+	
+	let data = reactive({
+		content: '',
+		isLogin:false
+	})
+	
+	onLoad(() => {
+		getGuize()
+		data.isLogin=uni.getStorageSync('token')?true:false
+	})
+	async function getGuize() {
+		let res = await commonType(154)
+		data.content = res.value
+	}
+	
+	function cancel(){
+		// #ifdef H5
+		uni.navigateBack()
+		// #endif
+		// #ifdef APP
+		plus.runtime.quit();
+		// #endif
+	}
+	
+	function back(){
+		uni.navigateBack()
+	}
 </script>
 
 <style scoped>
diff --git a/pages/me/privacy.vue b/pages/me/privacy.vue
index 677edeb..ceb90a8 100644
--- a/pages/me/privacy.vue
+++ b/pages/me/privacy.vue
@@ -1,6 +1,6 @@
 <template>
 	<view style="font-size: 14px;line-height: 26px;padding: 32upx;" class="home1 ">
-		<view style="font-size: 28upx;" v-html="content"></view>
+		<view style="font-size: 28upx;" v-html="data.content"></view>
 		<view class="btn-box  u-flex u-row-center" v-if="!isLogin">
 			<view class="btn cancel" @click="cancel">拒绝</view>
 			<view class="btn" @click="back">同意</view>
@@ -27,7 +27,7 @@
 	
 	async function getGuize() {
 		let res = await commonType(155)
-		this.content = res.value
+		data.content = res.value
 	}
 	
 	function cancel(){