From 1e96041d1c53ec4c34091f751c7be9676112af09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= <wyemail666@163.com>
Date: Thu, 24 Apr 2025 16:20:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E3=80=81=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

---
 api/api.js                    |  6 +++++
 pages.json                    | 42 +++++++++++++++++++++++------------
 pages/user/login.vue          | 10 ++++++++-
 pages/user/privacy-policy.vue | 26 ++++++++++++++++++++++
 pages/user/user-agreement.vue | 26 ++++++++++++++++++++++
 utils/helpers.js              |  4 ++++
 6 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 pages/user/privacy-policy.vue
 create mode 100644 pages/user/user-agreement.vue

diff --git a/api/api.js b/api/api.js
index 87359e6..99f1105 100644
--- a/api/api.js
+++ b/api/api.js
@@ -115,6 +115,12 @@ class Api {
         let url = `${config.host}/worker/worker/updateWorkerLocation`;
         return fetch.request('postFrom', url, data, true)
     }
+
+    // 获取配置
+    static getConfig(data) {
+        let url = `${config.host}/worker/common/config`;
+        return fetch.request('GET', url, {}, false)
+    }
 }
 
 export default Api
diff --git a/pages.json b/pages.json
index a9e742b..2d76cca 100644
--- a/pages.json
+++ b/pages.json
@@ -59,20 +59,34 @@
 			{
 				"navigationBarTitleText" : "完成服务"
 			}
-		},
-		{
-			"path" : "pages/order/report-order-exception",
-			"style" : 
-			{
-				"navigationBarTitleText" : "上报异常"
-			}
-		},
-		{
-			"path" : "pages/order/worker-remark",
-			"style" : 
-			{
-				"navigationBarTitleText" : "工单备注"
-			}
+		},
+		{
+			"path" : "pages/order/report-order-exception",
+			"style" : 
+			{
+				"navigationBarTitleText" : "上报异常"
+			}
+		},
+		{
+			"path" : "pages/order/worker-remark",
+			"style" : 
+			{
+				"navigationBarTitleText" : "工单备注"
+			}
+		},
+		{
+			"path" : "pages/user/user-agreement",
+			"style" : 
+			{
+				"navigationBarTitleText" : "用户协议"
+			}
+		},
+		{
+			"path" : "pages/user/privacy-policy",
+			"style" : 
+			{
+				"navigationBarTitleText" : "隐私协议"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/user/login.vue b/pages/user/login.vue
index fe9cd39..aefd618 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -16,7 +16,7 @@
           <me-icon v-else class="icon" type="icon-checkbox-blank-circle" size="40rpx" color="var(--summaryColor)"></me-icon>
           阅读并同意
         </view>
-        <view class="text">&nbsp<text>用户协议</text>、<text>隐私协议</text></view>
+        <view class="text">&nbsp<text @click="userAgreement()">用户协议</text>、<text @click="privacyPolicy()">隐私协议</text></view>
       </view>
       <view class="btn-area flex-c">
         <view hover-class="auto-mask-layer-radius8" hover-start-time="0" hover-stay-time="50">
@@ -41,6 +41,14 @@ import helpers from "../../utils/helpers";
 import api from "../../api/api";
 import {throttle} from "../../utils/throttle";
 
+const userAgreement = () => {
+  helpers.jumpToPage('user-agreement')
+}
+
+const privacyPolicy = () => {
+  helpers.jumpToPage('privacy-policy')
+}
+
 const visitor = () => {
   api.guestLogin().then(res => {
     storageUserInfo(res)
diff --git a/pages/user/privacy-policy.vue b/pages/user/privacy-policy.vue
new file mode 100644
index 0000000..9b9affe
--- /dev/null
+++ b/pages/user/privacy-policy.vue
@@ -0,0 +1,26 @@
+<template>
+  <view class="ctr">
+    <rich-text :nodes="data"></rich-text>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import {onShow} from '@dcloudio/uni-app'
+import api from "../../api/api";
+
+const data = ref('')
+onShow(() => {
+  api.getConfig().then(res => {
+    data.value = res.privacy_policy
+  }).catch(() => {})
+})
+</script>
+
+<style lang="scss" scoped>
+.ctr {
+  background-color: var(--containerBgColor);
+  padding: 32rpx 32rpx 100rpx 32rpx;
+  color: var(--titleColor);
+}
+</style>
diff --git a/pages/user/user-agreement.vue b/pages/user/user-agreement.vue
new file mode 100644
index 0000000..d23a897
--- /dev/null
+++ b/pages/user/user-agreement.vue
@@ -0,0 +1,26 @@
+<template>
+	<view class="ctr">
+    <rich-text :nodes="data"></rich-text>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import {onShow} from '@dcloudio/uni-app'
+import api from "../../api/api";
+
+const data = ref('')
+onShow(() => {
+  api.getConfig().then(res => {
+    data.value = res.user_agreement
+  }).catch(() => {})
+})
+</script>
+
+<style lang="scss" scoped>
+.ctr {
+  background-color: var(--containerBgColor);
+  padding: 32rpx 32rpx 100rpx 32rpx;
+  color: var(--titleColor);
+}
+</style>
diff --git a/utils/helpers.js b/utils/helpers.js
index f766b8c..a545c0c 100644
--- a/utils/helpers.js
+++ b/utils/helpers.js
@@ -29,6 +29,10 @@ class helpers {
 			'report-order-exception': '/pages/order/report-order-exception',
 			//更新师傅备注
 			'worker-remark': '/pages/order/worker-remark',
+			//用户协议
+			'user-agreement': '/pages/user/user-agreement',
+			//隐私政策
+			'privacy-policy': '/pages/user/privacy-policy',
 		}
 
 		url = paths[pathName]