6.18

components/remaining/remaining.vue

@@ -1,6 +1,6 @@
-<template>
+<template>
 	<view>
-		<image  v-if="type"  class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image>
+		<image  v-if="type"  class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image>
 		<view  v-if="type" class="welcome_jumpes" @click="leap_over" >跳过{{remaining}}</view>
 		<view  v-if="banner" class="welcome_jumpes" @click="leap_overto" >跳过</view>
 		<!-- 轮播图 -->
@@ -20,20 +20,21 @@
 		<!-- 用户协议弹窗 -->
 		<view class="welcome_backes" v-if="protocol">
 			<view class="content">
-				<view class="title">用户协议</view>
-				<text class="protocol_content">
-					亲，感谢您对德铭阳光在线的信任!
-					请注意，在您使用本软件过程中我们会按照《德铭阳光在线隐私保护声明》、《权限声明》 收集、使用和共享您的个人信息，请认真阅读并充分理解。特别提示:
+				<view class="title">{{ agreement.document_title }}</view>
+				<!-- <text class="protocol_content"></text> -->
+				<scroll-view scroll-y class="scroll">
+					<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
+				</scroll-view>
 				<view class="to_agree" @click="to_agree">我同意</view>
 			</view>
-					3、我们会采取业界先进的安全措施保护您的信息安全;
-					4、未经您同意，我们不会从第三方处获取、共享或向其提供您的信息;
-					5、您可以查询、更正、删除您的个人信息，我们也提供账户注销的渠道。
-				</text>
-				<view class="to_agree" @click="to_agree">我同意</view>
-			</view>
-		</view>
-	</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				remaining : 3,
 				type:true,
 				banner : false,
@@ -43,25 +44,35 @@
 				indicatorDots: true,
 				autoplay: true,
 				interval: 3000,
-				protocol : false,
-				heightes:'',
+				duration: 500,
+				agreement: { // 用户协议内容
+					document_title: "",
+					document_content: ""
+				}
+			};
 		},
 		onLoad() {
 			
-				interval: 3000,
 		},
 		methods: {
+			unescapeHTML (temp){
+				temp = "" + temp;
+				return temp.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
+			},
 			apiwelcome(){
 				this.$u.api.documentInfo({
 					document_code:'agreement'
 				}).then((res)=>{
-		},
-		methods: {
+					if (res.errCode == 0) {
+						let agreement = res.data;
+						agreement.document_content = this.unescapeHTML(agreement.document_content);
+						// console.log(agreement);
+						this.agreement = agreement;
+					}
 				})
 				// 启动页
 				this.$u.api.pageList({}).then((res)=>{
 					console.log('协议',res)
-					console.log('协议',res)
 				})
 			},
 			// 3秒倒计时
@@ -105,12 +116,11 @@
 			// 获取屏幕高度
 			this.getSystemInfo()
 			this.apiwelcome()
-		mounted(){
-			// 3秒倒计时调用
-			this.remaining_time()
-			// 获取屏幕高度
-			this.getSystemInfo()
+		}
+	}
+</script>
 
+<style lang="scss" scoped>
 	.welcome_jumpes{
 		width: 90rpx;
 		height: 35rpx;
@@ -133,7 +143,7 @@
 	}
 	uni-swiper,uni-view,uni-image{
 		width: 100%;
-		width: 100%;
+		// position: fixed;
 		height: 100%
 	}
 	uni-image{
@@ -168,18 +178,22 @@
 				line-height:29rpx;
 				margin: 30rpx 0 24rpx 0;
 			}
-				font-size:30rpx;
-				font-weight:bold;
-				color:rgba(51,51,51,1);
-				line-height:29rpx;
-				margin: 30rpx 0 24rpx 0;
-			}
-			.protocol_content{
-				width:494rpx;
-				height:528rpx;
-				font-size:24rpx;
-				font-weight:400;
-				color:rgba(51,51,51,1);
+			.scroll {
+				height: 560rpx;
+				.protocol_content{
+					width:494rpx;
+					height:528rpx;
+					font-size:24rpx;
+					font-weight:400;
+					color:rgba(51,51,51,1);
+					display: block;
+					text-align: left;
+					margin: 80rpx auto 33rpx;
+					letter-spacing: 1rpx;
+					text-align: justify;
+					line-height: 36rpx;
+
+				}
 			}
 			.to_agree{
 				width:558rpx;
@@ -191,5 +205,5 @@
 				border-top: #D8D8D8 solid 1px;
 			}
 		}
-				color:rgba(255,121,16,1);
-				text-align: center;
+	}
+</style>