From b8b4fd6c5469d7a4bf2ee078b8d25ce706bbe430 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 10 Jan 2023 21:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B3=A8=E5=86=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/common/commonApi.js          | 29 ++++++++++++++++++++
 constant/url.js                  |  3 ++-
 pages.json                       |  9 +++++++
 pages/login/register.vue         | 46 +++++++++++++++++++++++++++-----
 pages/login/registerProtocol.vue | 37 +++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 7 deletions(-)
 create mode 100644 pages/login/registerProtocol.vue

diff --git a/api/common/commonApi.js b/api/common/commonApi.js
index 25d549e..c5a47cd 100755
--- a/api/common/commonApi.js
+++ b/api/common/commonApi.js
@@ -100,3 +100,32 @@ export function uploadImageAsync(_objData,_that) {
 		});
 	})
 }
+
+/**
+ * 刷新用户
+ * @param {Object} _objData
+ */
+export function getRegisterProtocol(){
+	return new Promise((resolve, reject) => {
+		requestNoAuth({
+			url: url.listRegisterProtocol,
+			method: "GET",
+			data: {
+				page:1,
+				row:1
+			}, //动态数据
+			success: function(res) {
+				if (res.data.code == 0) {
+					resolve(res.data.data);
+					return;
+				}
+				reject();
+			},
+			fail: function(e) {
+				reject();
+			}
+		});
+	})
+}
+
+
diff --git a/constant/url.js b/constant/url.js
index 1c2c2d8..8396b88 100755
--- a/constant/url.js
+++ b/constant/url.js
@@ -185,7 +185,8 @@ export default {
 	listReserveGoodsOrderTime:baseUrl+"app/reserveOrder.listMyReserveGoodsOrderTime", // 查询预约订单
     deleteReserveGoodsPerson:baseUrl+"app/reserveOrder.deleteReserveGoodsPerson", // 查询预约订单
 	listProductSeckill: baseUrl + "app/productSeckill.listProductSeckill",
-	listProductGroup: baseUrl + "app/productGroup.listProductGroup",
+	listProductGroup: baseUrl + "app/productGroup.listProductGroup",
+	listRegisterProtocol: baseUrl + "app/system.listRegisterProtocol",
 	
 
 	NEED_NOT_LOGIN_PAGE: [
diff --git a/pages.json b/pages.json
index 099885d..cc39dac 100755
--- a/pages.json
+++ b/pages.json
@@ -703,6 +703,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/login/registerProtocol",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#272636",
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 79980c4..9ec1704 100755
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -18,9 +18,15 @@
 			<input v-model="msgCode" placeholder="请输入短信验证码" name="input"></input>
 			<button class='cu-btn bg-green shadow' :disabled="btnDisabled" @click="sendMsgCode()">{{btnValue}}</button>
 		</view>
-		<!-- <view >
-			<view >{{codeMsg}}</view>
-		</view> -->
+		<view class="padding flex justify-start">
+			<checkbox-group @change="_changeReadme">
+				<checkbox style="transform: scale(0.7)" value="readme"></checkbox>
+			</checkbox-group>
+			<view class="read-me">
+				<text class="margin-left-xs">我已阅读</text>
+				<text class="user-read" @click="_readMe">《用户须知》</text>
+			</view>
+		</view>
 		<view class="padding flex flex-direction margin-top">
 			<button class="cu-btn bg-green   lg" @click="_doRegister()">绑定</button>
 		</view>
@@ -30,7 +36,7 @@
 <script>
 	import context from '../../lib/java110/Java110Context.js';
 	const constant = context.constant;
-	import conf from '../../conf/config'
+	import conf from '../../conf/config';
 
 	export default {
 		data() {
@@ -44,7 +50,7 @@
 				btnDisabled: false,
 				password: '',
 				rePassword: '',
-
+				readme:false,
 			};
 		},
 		/**
@@ -113,6 +119,13 @@
 					}
 				});
 			},
+			_changeReadme:function(e){
+				if(e.detail.value && e.detail.value.length>0){
+					this.readme = true;
+				}else{
+					this.readme =false;
+				}
+			},
 			_doRegister: function(e) {
 				let obj = {
 					"link": this.link,
@@ -121,6 +134,14 @@
 					"openId": uni.getStorageSync(constant.mapping.CURRENT_OPEN_ID),
 					"defaultCommunityId": conf.DEFAULT_COMMUNITY_ID
 				}
+				if(!this.readme){
+					wx.showToast({
+						title: '未选择我已阅读《用户须知》',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
 				let msg = "";
 				if (this.password == '' || this.password != this.rePassword) {
 					msg = "密码和重置密码不一致";
@@ -137,7 +158,6 @@
 					})
 					return;
 				}
-				console.log("提交数据", obj);
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -202,6 +222,11 @@
 				promise.then((setTimer) => {
 					clearInterval(setTimer)
 				})
+			},
+			_readMe:function(){
+				uni.navigateTo({
+					url:'/pages/login/registerProtocol'
+				})
 			}
 		}
 	};
@@ -219,4 +244,13 @@
 		height: 40rpx;
 		text-align: center;
 	}
+	
+	.read-me{
+		line-height: 64upx;
+	}
+	
+	.user-read{
+		margin-left: 10upx;
+		color: darkgreen;
+	}
 </style>
diff --git a/pages/login/registerProtocol.vue b/pages/login/registerProtocol.vue
new file mode 100644
index 0000000..0bc26ce
--- /dev/null
+++ b/pages/login/registerProtocol.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="padding">
+		<jyf-parser :html="protocol" ref="article"></jyf-parser>
+	</view>
+</template>
+
+<script>
+	import {
+		getRegisterProtocol
+	} from '../../api/common/commonApi.js';
+	import jyfParser from "@/components/jyf-parser/jyf-parser";
+	export default {
+		data() {
+			return {
+				protocol: ''
+			}
+		},
+		onLoad() {
+			this._loadProtocol();
+		},
+		components: {
+			jyfParser
+		},
+		methods: {
+			_loadProtocol: function() {
+				let _that = this;
+				getRegisterProtocol().then(_data => {
+					_that.protocol = _data[0].userProtocol
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>