From 145811ebbd10d7acf70b2f3b090b1064088ce3be Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 22 Feb 2025 13:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                        |  8 ++++++++
 components/config/configPopup.vue |  4 ++++
 pages/index/agreement.vue         | 35 +++++++++++++++++++++++------------
 pages/index/introduce.vue         | 12 ++++++++++--
 pages/index/logoInfo.vue          |  3 ++-
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/api/api.js b/api/api.js
index 11d9972..67f2f98 100644
--- a/api/api.js
+++ b/api/api.js
@@ -141,6 +141,14 @@ const config = {
 		method: 'GET',
 		limit : 500,
 	},
+	
+	
+	// 查询所有隐私政策列表
+	privacyPolicyList: {
+		url: '/applet_index/privacyPolicyList',
+		method: 'GET',
+		limit : 500,
+	},
 }
 
 
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index 7986f91..a6f40db 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -58,6 +58,10 @@
 		methods: {
 
 			//打开配置信息菜单
+			openContent(content) {
+				this.content = content
+				this.$refs.popup.open('bottom');
+			},
 			open(key) {
 				this.content = this.configList[key]
 				this.$refs.popup.open('bottom');
diff --git a/pages/index/agreement.vue b/pages/index/agreement.vue
index fea8ff7..d5cd33b 100644
--- a/pages/index/agreement.vue
+++ b/pages/index/agreement.vue
@@ -34,20 +34,22 @@
 						icon-size="30rpx" 
 						activeColor="#ecb864" 
 						:name="1"></uv-checkbox>
-						<view>我已仔细阅读并已同意以下条款：</view>
-						<text @click="$refs.popup.open('user_ys_one')">《全球隐私声明1》</text>
+						<view>
+							我已仔细阅读并已同意以下
+							
+							<text@click="$refs.checkboxPopup.open('bottom')">
+								{{ privacyPolicyList.length }}项条款
+							</text>
+						</view>
+						<!-- <text @click="$refs.popup.open('user_ys_one')">《全球隐私声明1》</text>
 						
 						<text @click="$refs.popup.open('user_ys_two')">《全球隐私声明2》</text>
 						
 						<text @click="$refs.popup.open('user_xy_three')">《全球隐私声明3》</text>
-						
+						 -->
 						<!-- <text @click="$refs.popup.open('user_xy_four')">《全球隐私声明4》</text> -->
 						
-						<text
-						@click="$refs.checkboxPopup.open('bottom')"
-						>
-						查看40项协议
-						</text>
+						
 						
 					</view>
 				</uv-checkbox-group>
@@ -70,10 +72,10 @@
 		<uv-popup ref="checkboxPopup" 
 		:round="30">
 			<view class="checkboxPopupContent">
-				<view @click="$refs.popup.open('user_xy_four')"
-				v-for="item in 40"
-				:key="item"
-				>《全球隐私声明{{item + 1}}》</view>
+				<view @click="$refs.popup.openContent(item.details)"
+				v-for="item in privacyPolicyList"
+				:key="item.id"
+				>《 {{ item.title }} 》</view>
 			</view>
 		</uv-popup>
 		
@@ -91,6 +93,7 @@
 				checkboxValue : [],
 				configObj : {},
 				keys : ['user_ys_one', 'user_ys_two', 'user_xy_three', 'user_xy_four'],
+				privacyPolicyList : [],
 			}
 		},
 		computed : {
@@ -99,6 +102,7 @@
 			uni.$on('initConfig', data => {
 				this.configObj = data
 			})
+			this.getPrivacyPolicyList()
 		},
 		onShow() {
 		},
@@ -106,6 +110,13 @@
 			setActive(value){
 				this.isActive = value
 			},
+			getPrivacyPolicyList(){
+				this.$api('privacyPolicyList', res => {
+					if(res.code == 200){
+						this.privacyPolicyList = res.result
+					}
+				})
+			},
 			next(){
 				if(!this.isActive){
 					uni.showToast({
diff --git a/pages/index/introduce.vue b/pages/index/introduce.vue
index 736ed02..37811af 100644
--- a/pages/index/introduce.vue
+++ b/pages/index/introduce.vue
@@ -17,7 +17,9 @@
 			<view class="logoo-item"
 			:key="index"
 			v-for="(item, index) in list">
-				<image :src="item.image" mode="aspectFill"></image>
+				<view class="image">
+					<image :src="item.image" mode="widthFix"></image>
+				</view>
 				<view class="btn"
 				@click="toBrand(item.id)">
 					点击进入
@@ -100,9 +102,15 @@
 			display: flex;
 			gap: 30rpx;
 			margin-top: 20rpx;
-			image{
+			.image{
 				width: 160rpx;
 				height: 90rpx;
+				display: flex;
+				align-items: center;
+				image{
+					width: 160rpx;
+					height: 90rpx;
+				}
 			}
 			.logoo-item{
 				background-color: #fff;
diff --git a/pages/index/logoInfo.vue b/pages/index/logoInfo.vue
index bc5f5bb..cbbdc6b 100644
--- a/pages/index/logoInfo.vue
+++ b/pages/index/logoInfo.vue
@@ -4,7 +4,8 @@
 			<video :src="video"></video>
 		</view>
 		<uv-parse :content="content"></uv-parse>
-		<view class="uni-color-btn">
+		<view class="uni-color-btn"
+		@click="$utils.navigateBack(-1)">
 			返回
 		</view>
 	</view>