From cbbca8f467eb89c2133380649f65ae41ceaff98d Mon Sep 17 00:00:00 2001
From: zmt <mate163@163.com>
Date: Fri, 1 Apr 2022 09:16:25 +0800
Subject: [PATCH] fix issue

---
 nxTemp/apis/userAPI.js     | 12 ++++++++
 pages/event/event_list.vue |  2 +-
 pages/login/agreement.vue  | 75 +++++++++++++++++++++++++++++++++-------------
 pages/login/login.vue      |  8 +++--
 4 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/nxTemp/apis/userAPI.js b/nxTemp/apis/userAPI.js
index 53d7fcb..74b8650 100644
--- a/nxTemp/apis/userAPI.js
+++ b/nxTemp/apis/userAPI.js
@@ -138,4 +138,16 @@ export function msgGet(data) {
 	return http.post(`${config.baseUrl}/matchAssistant/msgCenter/get`,data);
 }
 
+/**
+* @description: 隐私协议
+* @param {*}
+* // /config/get?key=
+// UserRegistrationServiceAgreement 用户注册服务协议
+// PrivacyPolicy 隐私政策
+*/
+export function configGet(data) {
+	return http.post(`${config.baseUrl}/config/get`,data,{
+		needLogin:false //未登录前操作取消登录验证
+	});
+}
 
diff --git a/pages/event/event_list.vue b/pages/event/event_list.vue
index 2e1544a..6997b64 100644
--- a/pages/event/event_list.vue
+++ b/pages/event/event_list.vue
@@ -36,7 +36,7 @@
 			
 		</view>
 		
-		<view class="load-finish" v-if="listLoadFinished">我是有底线的～</view>
+		<view class="load-finish" v-if="listLoadFinished&&pageList.length>0">我是有底线的～</view>
 		
 		<no-data :txt="no_data_txt" v-if="pageList.length==0"></no-data>
 		
diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue
index 81722e0..bc11e5f 100644
--- a/pages/login/agreement.vue
+++ b/pages/login/agreement.vue
@@ -1,27 +1,62 @@
 <template>
-  <view>
-    <web-view :webview-styles="webviewStyles" :src="articleurl"></web-view>
-  </view>
+	<view class="content">
+		<!-- <web-view :webview-styles="webviewStyles" :src="articleurl"></web-view> -->
+		<rich-text class="txt" :nodes="htmlData"></rich-text>
+	</view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        articleurl: '',
-        webviewStyles: {
-          progress: {
-            color: '#FF7200'
-          }
-        }
-      };
-    },
-    onLoad(options) {
-      this.articleurl = 'http://www.baidu.com/';
-    }
-  }
+	import {
+		configGet
+	} from "@/nxTemp/apis/userAPI.js"
+	export default {
+		data() {
+			return {
+				articleurl: '',
+				htmlData: "",
+				webviewStyles: {
+					progress: {
+						color: '#FF7200'
+					}
+				}
+			};
+		},
+		onLoad(options) {
+			this.updateAgreement()
+		},
+		methods: {
+			updateAgreement() {
+				// UserRegistrationServiceAgreement 用户注册服务协议
+				// PrivacyPolicy 隐私政策
+				configGet({
+					key: "UserRegistrationServiceAgreement"
+				}).then(res => {
+					this.htmlData = res
+				}).catch((e) => {
+					this.$tools.showNone(e.errMsg)
+				})
+			}
+		}
+	}
 </script>
 
-<style>
-
+<style lang="less">
+	page{
+		background-color: white;
+		background: #FFFFFF;
+		padding: 20rpx;
+	}
+	.content{
+		width: 720rpx;
+	}
+	.txt {
+		font-size: 32rpx;
+		color: #1A1A1A;
+		font-weight: 400;
+		// text-indent: 64rpx;
+		line-height: 60rpx;
+		// p {
+		// 	text-indent: 1rem;
+		// }
+	}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2d58e84..fb0ddb2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -32,7 +32,9 @@
 		<view class="agreement-box flex_row flex_start">
 			<image @click="agreed=!agreed" class="a-icon" src="../../static/images/login/agreed_circle.png" mode="aspectFit" v-if="agreed"></image>
 			<image @click="agreed=!agreed" class="a-icon" src="../../static/images/login/agree_circle.png" mode="aspectFit" v-else></image>
-			我已同意<text @click="jumpAgreement()">《隐私政策》</text>及<text @click="jumpAgreement()">《用户注册服务协议》</text>
+			我已同意
+			<!-- <text @click="jumpAgreement()">《隐私政策》</text>及 -->
+			<text @click="jumpAgreement()">《用户注册服务协议》</text>
 		</view>
 
 		<view class="button-login" hover-class="button-hover" @tap="bindLogin()">
@@ -53,7 +55,7 @@
 <script>
 	//没有挂载全局而按需引用接口,可以更清楚知道当前page所用接口
 	import {
-		postLogin,postSendSMS,wechatGetPhoneNumberLogin
+		postLogin,postSendSMS,wechatGetPhoneNumberLogin,configGet
 	} from "@/nxTemp/apis/userAPI.js"
 	import {mapActions} from 'vuex'
 	export default {
@@ -63,7 +65,7 @@
 				count:60,
 				code:"",
 				agreed:false,//是否同意协议
-				login: {//后台让先写死
+				login: {
 					mobile: '',//手机
 					ticket: '',//短信验证码返回的
 					verify_code:'',//验证码