一版上线后修改

pages/user/login.vue

@@ -40,10 +40,13 @@
 			<view class="protocol_box">
 				<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
 				我已同意
-				<text @click="onPageJump('/pages/user/protocol')">《用户协议》</text>
+				<!-- <a href="https://main.nuttyreading.com/agreement.html">《用户协议》</a> -->
+				<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
+				<span class="highlight" @click="showXieyi('user')">《用户协议》</span>
 				和
-				<text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>
-			</view>
+				<span class="highlight" @click="showXieyi('privacy')">《隐私协议》</span>
+				<!-- <text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>-->
+			</view> 
 			<view class="btn_box">
 				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
 				<button v-else>登 录</button>
@@ -95,10 +98,10 @@
 						<view @click="onSubmit_Health">确定</view>
 					</view>
 				</view>
-			</z-popup>
+			</z-popup>		
 
 			<!-- #ifdef APP-PLUS -->  
-			<!-- <view class="third_party_login_box" v-if="isIos && system >= 13">
+			<!-- <view class="third_party_login_box" v-if="isIos && system >= 13">6
 				<view class="third_party_title"><text>第三方登录</text></view>
 				<view class="third_party_content">
 					<image src="../../static/icon/ic_login_weixin.png" v-if="isWeixin" @click="onWxAppLogin"
@@ -108,12 +111,22 @@
 				</view>
 			</view> -->
 			<!-- #endif -->
+			
+			<u-popup :show="xieyiShow" :round="10" @close="xieyiShow=false">
+				<view class="tanchu">
+					<view class="dp_title">{{xieyi.title}}</view>
+					<view style="max-height: 1000rpx;overflow-y: scroll;">
+						<view v-html="xieyi.content"></view>
+					</view>				
+				</view>
+			</u-popup>
 		</view>
-
+		
 	</view>
 </template>
 
 <script>
+	import $http from '@/config/requestConfig.js';
 	import md5 from '@/plugins/md5';
 	var clear;
 	import {
@@ -145,6 +158,11 @@
 				health_phone: '13333333333',
 				health_password: '123456',
 				isSee_H: false,
+				xieyiShow : false,
+				xieyi:{
+					title:'',
+					content:''
+				},
 			};
 		},
 		//第一次加载
@@ -165,6 +183,20 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 显示协议
+			showXieyi(str){	
+				this.xieyi = {}
+				this.$http
+					.get(`sys/agreement/list?key=${str}`)
+					.then(res => {	
+						
+						this.xieyi = res.page.list[0]
+						this.xieyiShow = true
+					}).catch((e)=>{
+						console.log(e)
+					})
+				
+			},
 			onPageJump(url) {
 				uni.navigateTo({
 					url: url
@@ -558,7 +590,23 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+.highlight{color: $themeColor;}
+.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		
+		
+	}
 	.logo_bg {
 		background-image: url('@/static/icon/login_bg.png');
 		// background-position: center center;

pages/user/protocol.vue

@@ -18,6 +18,7 @@ export default {
 	},
 	//第一次加载
 	onLoad(e) {
+		console.log(e)
 		if(e.type){
 			this.type = parseInt(e.type);
 			let title;
@@ -40,6 +41,7 @@ export default {
 					type: this.type
 				})
 				.then(res => {
+					console.log(res)
 					this.$refs.article.setContent(res);
 				});
 		}