From 90c70ceb6401e7fe516fff23b205e937323e8b2f Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 14 Sep 2024 18:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C-=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_components/fuwu/index.vue        |   9 ++-
 page_fenbao/statulist/about/index.vue | 112 +++++++++++++++-----------
 pages/shouye/index.vue                |   2 +-
 3 files changed, 75 insertions(+), 48 deletions(-)

diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 77e3cf9..69038fa 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -113,7 +113,7 @@
 			<view class="tongyi" v-if="deviceobj.suitList != null">
 				<u-checkbox-group>
 					<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
-					</u-checkbox><text>《用户服务协议》</text>
+					</u-checkbox><text @click="btnyinsi">《用户服务协议》</text>
 				</u-checkbox-group>
 				<view class="zf" @click="btnzhifu" v-if="zhifuflag"> 
 					立即支付
@@ -332,6 +332,13 @@
 					}
 				})
 			},
+			
+			// 用户服务协议
+			btnyinsi(){
+				uni.navigateTo({
+					url: '/page_fenbao/statulist/about/index?tit=' + '用户服务协议'
+				})
+			},
 
 			gettrue() {
 				this.$u.get("/app/device/isBind?deviceNo=" + this.id).then((res) => {
diff --git a/page_fenbao/statulist/about/index.vue b/page_fenbao/statulist/about/index.vue
index 01ff185..d6f8c5d 100644
--- a/page_fenbao/statulist/about/index.vue
+++ b/page_fenbao/statulist/about/index.vue
@@ -1,19 +1,15 @@
 <template>
 	<view class="page">
-		<u-navbar title="关于我们" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
-			height='50'></u-navbar>
-        <view class="box">
-        	<view class="title">
-        		{{obj.title == undefined ? '' : obj.title}}
-        	</view>
-		
+		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='50'></u-navbar>
+		<view class="box">
+			<view class="title">
+				{{obj.title == undefined ? '' : obj.title}}
+			</view>
+
 			<view class="js" v-html="obj.content">
 			</view>
-<!-- 			
-			<view class="nav_bom">
-				
-			</view> -->
-        </view>
+		</view>
 	</view>
 </template>
 
@@ -21,48 +17,66 @@
 	export default {
 		data() {
 			return {
-                obj:{}
+				obj: {},
+				tit: ''
 			}
 		},
 		// 分享到好友（会话）
-		  onShareAppMessage: function () {  
-		    return {  
-		      title: '创想物联',  
-		      path: '/pages/shouye/index'  
-		    }  
-		  },  
-		  
-		  // 分享到朋友圈  
-		  onShareTimeline: function () {  
-		    return {  
-		      title: '创想物联',  
-		      query: '',  
-		      path: '/pages/shouye/index'  
-		    }  
-		  },
-		onLoad() {
-			this.getabout()
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		onLoad(option) {
+			this.tit = option.tit
+			if (option.tit == '关于我们') {
+				this.getabout()
+			}else{
+				this.getabouts()
+			}
 		},
 		methods: {
-             getabout(){
-				 let type = 'about'
-				 this.$u.get(`/app/article/licence/${type}`).then((res) => {
-				 	if (res.code == 200) {
-				 		this.obj= res.data
-				 	}
-				 })
-			 }
+
+			getabout() {
+				let type = 'about'
+				this.$u.get(`/app/article/licence/${type}`).then((res) => {
+					if (res.code == 200) {
+						this.obj = res.data
+					}
+				})
+			},
+			// 用户隐私协议
+			getabouts() {
+				let type = 'privacy'
+				this.$u.get(`/app/article/licence/${type}`).then((res) => {
+					if (res.code == 200) {
+						this.obj = res.data
+					}
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
+	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-	/deep/ .u-icon__icon{
+
+	/deep/ .u-icon__icon {
 		padding-bottom: 22rpx;
 	}
+
 	page {
 		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}
@@ -73,7 +87,8 @@
 		// top: 0;
 		// left: 0;
 		overflow: hidden;
-		.box{
+
+		.box {
 			width: 750rpx;
 			height: 1440rpx;
 			background: #F4F5F7;
@@ -81,18 +96,21 @@
 			padding: 40rpx 34rpx;
 			box-sizing: border-box;
 			overflow: scroll;
-			.title{
+
+			.title {
 				font-weight: 600;
 				font-size: 36rpx;
 				color: #3D3D3D;
 			}
-			.tit{
+
+			.tit {
 				font-weight: 600;
 				font-size: 36rpx;
 				color: #3D3D3D;
 				margin-top: 32rpx;
 			}
-			.nav_top{
+
+			.nav_top {
 				width: 680rpx;
 				height: 322rpx;
 				background: #EEEEEE;
@@ -100,12 +118,14 @@
 				margin: auto;
 				margin-top: 32rpx;
 			}
-			.js{
+
+			.js {
 				font-size: 28rpx;
 				color: #3D3D3D;
 				margin-top: 32rpx;
 			}
-			.nav_bom{
+
+			.nav_bom {
 				width: 680rpx;
 				height: 322rpx;
 				background: #EEEEEE;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 3839343..5ec941f 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -444,7 +444,7 @@
 						})
 					} else if (num == 3) {
 						uni.navigateTo({
-							url: '/page_fenbao/statulist/about/index'
+							url: '/page_fenbao/statulist/about/index?tit=' + '关于我们'
 						})
 					} else if (num == 1) {
 						uni.navigateTo({