From 4eb5ec611818a1bf2724eb7353a198fce23f8f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=AA=E6=A0=91=E6=B3=BD?= <2393354236@qq.com>
Date: Fri, 9 Sep 2022 09:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2=E3=80=82?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/pages.json                            | 12 ++++++
 app/src/pages/agreement/agreement.vue         | 11 ++----
 .../pages/change_password/change_password.vue | 37 +++++++++++++++++++
 app/src/pages/user_data/user_data.vue         | 37 +++++++++++++++++++
 4 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 app/src/pages/change_password/change_password.vue
 create mode 100644 app/src/pages/user_data/user_data.vue

diff --git a/app/src/pages.json b/app/src/pages.json
index ee04dcac..c73e0e08 100644
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -65,6 +65,18 @@
 		    "style": {
 		        "navigationBarTitleText": "协议"
 		    }
+		},
+		{
+		    "path": "pages/change_password/change_password",
+		    "style": {
+		        "navigationBarTitleText": "修改密码"
+		    }
+		},
+		{
+		    "path": "pages/user_data/user_data",
+		    "style": {
+		        "navigationBarTitleText": "个人资料"
+		    }
 		}
     ],
     "globalStyle": {
diff --git a/app/src/pages/agreement/agreement.vue b/app/src/pages/agreement/agreement.vue
index 2d3e89b6..7a646e23 100644
--- a/app/src/pages/agreement/agreement.vue
+++ b/app/src/pages/agreement/agreement.vue
@@ -12,7 +12,6 @@
 	
 	let agreementType = ref('') // 协议类型
 	let agreementContent = ref('') // 协议内容
-	// let agreementName = ref('') // 协议名称
 		
 	const getData = async (type) => {
 		let res = await getPolicy({ type })
@@ -26,12 +25,10 @@
 	}
 	    
 	onLoad((options: any) => {
-		// if(options.type) {
-		// 	agreementType.value = options.type
-		// 	getData(agreementType)
-		// }
-		
-		getData('service')
+		if(options.type) {
+			agreementType = options.type
+			getData(agreementType)
+		}
 	})
 </script>
 
diff --git a/app/src/pages/change_password/change_password.vue b/app/src/pages/change_password/change_password.vue
new file mode 100644
index 00000000..4d0601bb
--- /dev/null
+++ b/app/src/pages/change_password/change_password.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="">
+		<u-parse :html="agreementContent"></u-parse>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { reactive, ref } from 'vue'
+	import { onLoad } from "@dcloudio/uni-app";
+	import { AgreementEnum } from '@/enums/agreementEnums'
+	import { getPolicy } from '@/api/app'
+	
+	let agreementType = ref('') // 协议类型
+	let agreementContent = ref('') // 协议内容
+	// let agreementName = ref('') // 协议名称
+		
+	const getData = async (type) => {
+		let res = await getPolicy({ type })
+		console.log(res, 'res')
+		
+		agreementContent.value = res.content
+		
+		uni.setNavigationBarTitle({
+			title: res.name
+		})
+	}
+	    
+	onLoad((options: any) => {
+		if(options.type) {
+			agreementType.value = options.type
+			getData(agreementType)
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/app/src/pages/user_data/user_data.vue b/app/src/pages/user_data/user_data.vue
new file mode 100644
index 00000000..4d0601bb
--- /dev/null
+++ b/app/src/pages/user_data/user_data.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="">
+		<u-parse :html="agreementContent"></u-parse>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { reactive, ref } from 'vue'
+	import { onLoad } from "@dcloudio/uni-app";
+	import { AgreementEnum } from '@/enums/agreementEnums'
+	import { getPolicy } from '@/api/app'
+	
+	let agreementType = ref('') // 协议类型
+	let agreementContent = ref('') // 协议内容
+	// let agreementName = ref('') // 协议名称
+		
+	const getData = async (type) => {
+		let res = await getPolicy({ type })
+		console.log(res, 'res')
+		
+		agreementContent.value = res.content
+		
+		uni.setNavigationBarTitle({
+			title: res.name
+		})
+	}
+	    
+	onLoad((options: any) => {
+		if(options.type) {
+			agreementType.value = options.type
+			getData(agreementType)
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+</style>