|
|
@@ -108,12 +108,17 @@
|
|
|
|
|
|
</view>
|
|
|
<view v-if="bGetCode">
|
|
|
- <view class="action-row-text " style="margin-top: 30rpx;">
|
|
|
- <view class="text-gray">登录即代表同意哔蹦</view>
|
|
|
- <view class="text-bold text-decoration make-text-bPurple" @tap="onSwitchAgree('agreement')">用户协议
|
|
|
+ <view class="action-row-text " style="margin-top: 25rpx;">
|
|
|
+ <checkbox-group style="transform: scale(0.7,0.7);" @change="CheckboxChange">
|
|
|
+ <checkbox class='round red' :class="checkbox[0].checked?'checked':''"
|
|
|
+ :checked="checkbox[0].checked?true:false" value="A"></checkbox>
|
|
|
+ </checkbox-group>
|
|
|
+ <!-- 登录即代表同意哔蹦 我已阅读并同意-->
|
|
|
+ <view class="text-gray" style="margin-top: 2px;">我已阅读并同意</view>
|
|
|
+ <view class="text-bold text-decoration make-text-bPurple" style="margin-top: 2px;" @tap="onSwitchAgree('agreement')">用户协议
|
|
|
</view>
|
|
|
- <view class="text-gray">和</view>
|
|
|
- <view class="text-bold text-decoration make-text-bPurple" @tap="onSwitchAgree('privacy')">隐私政策
|
|
|
+ <view class="text-gray" style="margin-top: 2px;">和</view>
|
|
|
+ <view class="text-bold text-decoration make-text-bPurple" style="margin-top: 2px;" @tap="onSwitchAgree('privacy')">隐私政策
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -185,6 +190,10 @@
|
|
|
|
|
|
//苹果服务
|
|
|
appleOauth: null,
|
|
|
+ checkbox: [{
|
|
|
+ value: 'A',
|
|
|
+ checked: false
|
|
|
+ }],
|
|
|
}
|
|
|
},
|
|
|
computed: mapState(['bNewUser', 'forcedLogin', 'phoneNumber', 'mailboxNumber', 'bCodeDisabled', 'count',
|
|
|
@@ -195,6 +204,20 @@
|
|
|
...mapMutations(['login', 'addUserAvatarAndLogin', 'appleUserInfoLogin', 'accountLogin', 'countDown',
|
|
|
'resetCountDown'
|
|
|
]),
|
|
|
+ CheckboxChange(e) {
|
|
|
+ console.log(11);
|
|
|
+ var items = this.checkbox,
|
|
|
+ values = e.detail.value;
|
|
|
+ for (var i = 0, lenI = items.length; i < lenI; ++i) {
|
|
|
+ items[i].checked = false;
|
|
|
+ for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
|
|
|
+ if (items[i].value == values[j]) {
|
|
|
+ items[i].checked = true;
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
initProvider() {
|
|
|
// const filters = ['weixin', 'qq', 'sinaweibo'];
|
|
|
const filters = ['weixin'];
|
|
|
@@ -265,6 +288,13 @@
|
|
|
|
|
|
bindLogin() {
|
|
|
let _self = this;
|
|
|
+ if(!_self.checkbox[0].checked){
|
|
|
+ uni.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '请阅读并勾选下方协议'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
uni.showToast({
|
|
|
icon: 'loading',
|
|
|
title: '',
|
|
|
@@ -355,6 +385,13 @@
|
|
|
},
|
|
|
oauth(value) {
|
|
|
let _self = this;
|
|
|
+ if(!_self.checkbox[0].checked){
|
|
|
+ uni.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '请阅读并勾选下方协议'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
uni.showToast({
|
|
|
title: "",
|
|
|
icon: "loading",
|
|
|
@@ -554,6 +591,15 @@
|
|
|
this.bPhoneNumberAndPasswordLogin = !this.bPhoneNumberAndPasswordLogin;
|
|
|
},
|
|
|
onNavToReg() {
|
|
|
+
|
|
|
+ if(!this.checkbox[0].checked){
|
|
|
+ uni.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '请阅读并勾选下方协议'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (this.bMobileLogin) {
|
|
|
if (!verify.checkPhone(this.account)) {
|
|
|
uni.showToast({
|
|
|
@@ -706,6 +752,13 @@
|
|
|
})
|
|
|
},
|
|
|
onAppleReg() {
|
|
|
+ if(!this.checkbox[0].checked){
|
|
|
+ uni.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '请阅读并勾选下方协议'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.onAppleLogout(() => {
|
|
|
this.onAppleRegEvent();
|
|
|
})
|
