From 5dd934729e5f098ef7e03d8046b81958c3b0e316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 4 Jan 2023 15:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E4=B8=8E=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/public.js   | 20 ++++++++++++++++++++
 manifest.json               |  2 +-
 pages/auth/auth.vue         |  4 ++--
 pages/richText/richText.vue | 24 +++++++++++++++++++-----
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 apis/interfaces/public.js

diff --git a/apis/interfaces/public.js b/apis/interfaces/public.js
new file mode 100644
index 0000000..701bd67
--- /dev/null
+++ b/apis/interfaces/public.js
@@ -0,0 +1,20 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 公共的
+ */
+
+import { request } from '../index'
+
+// 协议
+const cms = id => {
+	return request({
+		url		: 'cms/pages/' + id,
+	})
+}
+
+export {
+	cms
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 9c7ea99..77f73cb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "",
-    "versionName" : "1.1.0",
+    "versionName" : "1.1.1",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue
index e73d49a..d5082c5 100644
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -25,8 +25,8 @@
 				>
 					<u-checkbox shape="circle" name="agreement" activeColor="#446EFE"></u-checkbox>
 					我已阅读并同意
-					<my-link class="agreement-nav" :to="{name: 'richText', params: {id: 1}}">服务协议</my-link>、
-					<my-link class="agreement-nav" :to="{name: 'richText', params: {id: 2}}">隐私权政策</my-link>
+					<my-link class="agreement-nav" :to="{name: 'RichText', params: {id: 1}}">服务协议</my-link>、
+					<my-link class="agreement-nav" :to="{name: 'RichText', params: {id: 2}}">隐私权政策</my-link>
 				</u-checkbox-group>
 			</view>
 		</view>
diff --git a/pages/richText/richText.vue b/pages/richText/richText.vue
index 2d31121..f707cda 100644
--- a/pages/richText/richText.vue
+++ b/pages/richText/richText.vue
@@ -1,25 +1,39 @@
 <template>
-	<view>
-		
+	<view class="richText">
+		<rich-text :nodes="content"></rich-text>
 	</view>
 </template>
 
 <script>
+	import { cms } from '@/apis/interfaces/public.js'
 	export default {
 		data() {
 			return {
-				
+				content: ''
 			};
 		},
 		created() {
-			console.log(this.$Route.query.id)
 			uni.setNavigationBarTitle({
 				title: '服务协议'
 			})
+			cms(this.$Route.query.id).then(res => {
+				let { content, title } = res
+				this.content = content;
+				uni.setNavigationBarTitle({
+					title
+				})
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
 		}
 	}
 </script>
 
 <style lang="scss">
-
+	.richText{
+		padding: 30rpx;
+	}
 </style>