增加隐私协议确认

src/manifest.json

@@ -88,7 +88,7 @@
         },
         "plugins" : {
             "contactPlugin" : {
-                "version" : "1.4.4",
+                "version" : "1.4.5",
                 "provider" : "wx104a1a20c3f81ec2"
             }
         }

src/pages/index/mine.vue

@@ -258,7 +258,7 @@ export default {
 	},
 	onShow() {
 		// 更新是否需要入住
-		if (!this.needSettled) return;
+		if (!this.vuex_token||!this.needSettled) return;
 		this.$u.api.getSettleBaseInfo().then(res => {
 			this.needSettled = res.data.needSettled;
 		});

src/pages/login/index.vue

@@ -22,6 +22,15 @@
 				<view class="button-text">立即绑定</view>
 			</u-button>
 		</view>
+		<view class="quick-title" @click="handleClickAgree">
+			<view class="icon-view" :class="{ 'icon-agree': agree }"><u-icon name="checkmark-circle-fill" v-if="agree" size="44" color="#2979ff"></u-icon></view>
+			<view class="agree-text-view">
+				我已阅读并同意
+				<text class="name-text" @tap.stop.prevent="toProtocol('protocol')">《用户服务协议》</text>
+				和
+				<text class="name-text" @tap.stop.prevent="toProtocol('policy')">《隐私政策》</text>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -31,8 +40,9 @@
 	export default {
 		data() {
 			return {
-				phone: '13423831191',
-				code: '174253',
+				agree:false,
+				phone: '',
+				code: '',
 				timer: null,
 				canGetCode: true,
 				seconds: 60,
@@ -70,7 +80,36 @@
 			}
 		},
 		methods: {
+			toProtocol(type) {
+				if(type==='protocol'){
+					uni.navigateTo({
+						url: '/pages/mine/about/user-agreement/user-agreement'
+					});
+				}else{
+					uni.navigateTo({
+						url: '/pages/mine/about/privacy-agreement/privacy-agreement'
+					});
+				}
+				
+			},
+			handleClickAgree() {
+				this.agree = !this.agree;
+			},
+			checkAgree() {
+				if (!this.agree) {
+					uni.showToast({
+						title: '请阅读并同意《用户服务协议》和《隐私政策》',
+						icon: 'none',
+						duration: 2000
+					});
+					return false;
+				}
+				return true;
+			},
 			handleClick() {
+				if (!this.checkAgree()) {
+					return;
+				}
 				if (this.phone == '') {
 					uni.showToast({
 						title: '请输入手机号',
@@ -126,6 +165,9 @@
 				}
 			},
 			handleClickSave() {
+				if (!this.checkAgree()) {
+					return;
+				}
 				this.signup();
 			},
 			signup() {
@@ -346,5 +388,53 @@
 				font-size: 32rpx;
 			}
 		}
+		.quick-title {
+			z-index: 10;
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: fixed;
+			left: 0;
+			bottom: 5%;
+			text-align: center;
+			line-height: 28upx;
+			font-size: 24upx;
+			color: #8d8d8d;
+			font-weight: 500;
+			&-weight {
+				font-weight: bold;
+				color: #333333;
+			}
+			&-icon {
+				width: 28upx;
+				height: 28upx;
+				border-radius: 50%;
+				margin-right: 16upx;
+				border: 2upx solid #333333;
+				display: inline-block;
+			}
+			.icon-view {
+				width: 36rpx;
+				height: 36rpx;
+				font-size: 18rpx;
+				border-radius: 50%;
+				border: 2rpx solid #333333;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: #ffffff;
+				margin-right: 12rpx;
+			}
+		
+			.icon-agree {
+				// background-color: #3383fe;
+				// color: #ffffff;
+				border: 0rpx;
+			}
+			.name-text {
+				color: #3383fe;
+			}
+		}
 	}
 </style>
\ No newline at end of file