From 41100951ca7b2c6d069f49a2bac4ef7fff95ff87 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 19 Feb 2022 16:52:20 +0800
Subject: [PATCH] 用户协议添加

---
 pages/home/home.vue                 |   21 ++++++++++++++++-----
 pages/registerUser/registerUser.vue |   21 ++++++++++++++++++++-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8835c0e..151c9ca 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -71,7 +71,7 @@
 		<!-- 头部按钮 end -->
 
 		<!-- 公告 start -->
-		<view class="notice-box">
+		<!-- <view class="notice-box">
 			<image src="/static/images/home/notice.png" class="img" mode="widthFix"></image>
 			<view class="notice-info">
 				<navigator hover-class="none" class="notice-cell" v-for="(item, index) in noticeList" :key="index">
@@ -80,14 +80,16 @@
 					<u-icon name="arrow-right" size="12" color="#C9C9C9"></u-icon>
 				</navigator>
 			</view>
+		</view> -->
+		<view class="notice-class">
+			<u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal" type="none" :list="gdlist"></u-notice-bar>
 		</view>
 		<!-- 公告 end -->
-
 
 		<!-- 新闻模块 start -->
 		<view class="news">
 			<navigator hover-class="none" url="/pages/news/list" class="cell">
-				<view class="ctitle">温馨提示</view>
+				<view class="ctitle">资讯</view>
 				<view hover-class="bg-light" class="more" @click="goArticle()">
 					更多
 					<u-icon name="arrow-right" color="#A6ABB5" size="16"></u-icon>
@@ -144,7 +146,10 @@
 				newsList: [],
 				navButton: [],
 				serviceButton: [],
-				tabbar:this.$store.state.tabbar
+				tabbar:this.$store.state.tabbar,
+				gdlist: [
+					'国家发改委:防止和避免“放松防控”和“过度防控”'
+				]
 			};
 		},
 		onShow() {
@@ -416,6 +421,13 @@
 			}
 		}
 	}
+	
+	.notice-class{
+		background: #ffffff;
+		border-radius: 15px 15px 15px 15px;
+		margin: 0 20rpx;
+		padding: 20rpx 20rpx;
+	}
 
 	.notice-box {
 		display: flex;
@@ -434,7 +446,6 @@
 
 		.notice-info {
 			flex: 1;
-
 			.notice-cell:first-of-type {
 				margin-bottom: 15rpx;
 			}
diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 21faafb..c808459 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -35,7 +35,12 @@
 				(功能研发中)
 			</u-form-item>
 		</u-form>
-
+			<view class="agree">
+				注册即代表同意
+				<text class="a">《用户协议》</text>
+				和
+				<text class="a">《隐私政策》</text>
+			</view>
 		<div v-show="mapShow">
 			<div class="login-map-bc" @click="mapShow = false">
 
@@ -591,4 +596,18 @@
 	.registerUser {
 		padding: 0 1.2rem;
 	}
+	
+	.agree {
+		margin: 27rpx 95rpx 0;
+		font-size: 22rpx;
+		font-family: Adobe Heiti Std;
+		font-weight: normal;
+		color: #cacaca;
+		line-height: 34rpx;
+		
+		.a {
+			color: #000000;
+		}
+	}
+	
 </style>

--
Gitblit v1.9.3