diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue index 0e92b7b..8f85066 100644 --- a/packageA/my/person-detail.vue +++ b/packageA/my/person-detail.vue @@ -105,526 +105,524 @@ \ No newline at end of file diff --git a/pages/my/index.vue b/pages/my/index.vue index e82d006..e7b3a13 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -149,8 +149,6 @@ subdesc='以了解详细内容。如您同意,请点击“同意并继续”并开始使用我们的服务。' top_img='https://naweigetetest2.hschool.com.cn/dyqc/dyqclogo.png' color="#C9935C" hideTabBar="true" :onNeed='false' :other="other" - refuse_tbn_text="不同意" - agree_btn_text="同意" :title_style="'padding-top:60rpx;'" open_type='agreePrivacyAuthorization'> diff --git a/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue b/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue index 80f39b1..9f7747c 100644 --- a/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue +++ b/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue @@ -18,8 +18,10 @@ {{refuse_tbn_text}} {{refuse_tbn_text}} - + + + @@ -177,6 +179,7 @@ }, protocolClick(){ console.log(1); + this.agree=true; }, open(name) { if (this.hideTabBar) { @@ -219,26 +222,26 @@ // 授权手机号 getphonenumber(e){ console.log('// 授权手机号',e) - - if(this.open_type.indexOf('getPhoneNumber')>=0){ - if(e.detail.errMsg == 'getPhoneNumber:ok'){ - uni.showTabBar(); - this.close(); - this.$emit('agree_call') - this.$emit('get_phone_number',e); - }else{ - if(this.show_toast_phone){ - uni.showToast({ - title: this.show_toast_phone, - icon: 'none' - }) - } - if(this.is_force_phone){ - return; - } - } + this.close(); + // if(this.open_type.indexOf('getPhoneNumber')>=0){ + // if(e.detail.errMsg == 'getPhoneNumber:ok'){ + // uni.showTabBar(); + // this.close(); + // this.$emit('agree_call') + // this.$emit('get_phone_number',e); + // }else{ + // if(this.show_toast_phone){ + // uni.showToast({ + // title: this.show_toast_phone, + // icon: 'none' + // }) + // } + // if(this.is_force_phone){ + // return; + // } + // } - } + // } }, @@ -405,6 +408,12 @@ color: #fff; margin: 0; } + .agree-btn-no { + line-height: 80rpx; + background: #E4E4E4; + color: #9C9C9C; + margin: 0; + } } }