Commit affc0b6a235986f904fc96260b0cbf5d5fd16519

Authored by yvan.ni
1 parent 047ef2c4

隐私政策的优化

components/privacy_pop/privacy_pop.js
@@ -24,6 +24,8 @@ Component({ @@ -24,6 +24,8 @@ Component({
24 this.setData({ 24 this.setData({
25 show_pri: 1 25 show_pri: 1
26 }) 26 })
  27 + }else{
  28 + this.triggerEvent('agree_pri');// 调用同意的函数
27 } 29 }
28 } 30 }
29 }) 31 })
packageE/pages/togoin/togoin.js
@@ -26,6 +26,12 @@ Page({ @@ -26,6 +26,12 @@ Page({
26 this.data.is_reg=1; 26 this.data.is_reg=1;
27 } 27 }
28 28
  29 + //-- 看一下隐私政策要不要显示 --
  30 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  31 + if (privacy_pop) {
  32 + privacy_pop.check_pri_show();
  33 + }
  34 +
29 //--判断是否有接受到邀请人的ID-- 35 //--判断是否有接受到邀请人的ID--
30 if (options.first_leader) { 36 if (options.first_leader) {
31 this.setData({ first_leader: options.first_leader }); 37 this.setData({ first_leader: options.first_leader });
@@ -38,6 +44,7 @@ Page({ @@ -38,6 +44,7 @@ Page({
38 th.setData({ store: e, store_logo: logo }); 44 th.setData({ store: e, store_logo: logo });
39 }) 45 })
40 46
  47 +
41 //判断注册的条件 48 //判断注册的条件
42 app.getConfig2(function (e) { 49 app.getConfig2(function (e) {
43 if (e.reg_type == 1) { 50 if (e.reg_type == 1) {
@@ -490,7 +497,12 @@ Page({ @@ -490,7 +497,12 @@ Page({
490 }); 497 });
491 }, 498 },
492 499
493 - 500 + //弹出框的同意的优化
  501 + agree_pri:function (){
  502 + this.setData({
  503 + isAgree:1,
  504 + });
  505 + },
494 //通过路径跳转到其他页面 506 //通过路径跳转到其他页面
495 goto: function (e) { 507 goto: function (e) {
496 console.log('xxxx', e); 508 console.log('xxxx', e);
packageE/pages/togoin/togoin.json
1 { 1 {
2 "navigationBarTitleText": "授权登录", 2 "navigationBarTitleText": "授权登录",
3 "usingComponents": { 3 "usingComponents": {
4 - "warn": "/components/long_warn/long_warn" 4 + "warn": "/components/long_warn/long_warn",
  5 + "privacy_pop": "/components/privacy_pop/privacy_pop"
5 } 6 }
6 } 7 }
7 \ No newline at end of file 8 \ No newline at end of file
packageE/pages/togoin/togoin.wxml
1 -<view> 1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
2 3
  4 +<view>
3 <!-- 登录图 --> 5 <!-- 登录图 -->
4 <view > 6 <view >
5 <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;"> 7 <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;">
@@ -17,7 +19,7 @@ @@ -17,7 +19,7 @@
17 19
18 <view bindtap="" class="user-name flex-vertical fs24 jc-center"> 20 <view bindtap="" class="user-name flex-vertical fs24 jc-center">
19 <checkbox-group bindchange="isAgree"> 21 <checkbox-group bindchange="isAgree">
20 - <checkbox value="true"> 22 + <checkbox checked="{{isAgree}}" value="true">
21 <label for="true"> 23 <label for="true">
22 <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view> 24 <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
23 </label> 25 </label>
@@ -64,7 +66,6 @@ @@ -64,7 +66,6 @@
64 66
65 </view> 67 </view>
66 68
67 -  
68 <view wx:if="{{show_bind}}"> 69 <view wx:if="{{show_bind}}">
69 <view class="cover-layer" bindtap="close_pop"></view> 70 <view class="cover-layer" bindtap="close_pop"></view>
70 <view class="p_content"> 71 <view class="p_content">
pages/user/index/index.js
@@ -119,6 +119,12 @@ Page({ @@ -119,6 +119,12 @@ Page({
119 119
120 var _that=this; 120 var _that=this;
121 121
  122 + //-- 看一下隐私政策要不要显示 --
  123 + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
  124 + if (privacy_pop) {
  125 + privacy_pop.check_pri_show();
  126 + }
  127 +
122 getApp().check_can_share(); 128 getApp().check_can_share();
123 //看一下小程序是不是过期了 129 //看一下小程序是不是过期了
124 getApp().getConfig2(function (config2) { 130 getApp().getConfig2(function (config2) {
pages/user/index/index.json
1 { 1 {
2 "usingComponents": { 2 "usingComponents": {
3 "pop_txt": "/components/userqy_pop_up/userqy_pop_up", 3 "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
4 - "goods_recommend": "/components/goods_list/goods_list" 4 + "goods_recommend": "/components/goods_list/goods_list",
  5 + "privacy_pop": "/components/privacy_pop/privacy_pop"
5 }, 6 },
6 "navigationBarTitleText": "会员中心" 7 "navigationBarTitleText": "会员中心"
7 } 8 }
8 \ No newline at end of file 9 \ No newline at end of file
pages/user/index/index.wxml
  1 +<!-- 判断隐私是不是显示 -->
  2 +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
1 <!-- <import src="../../tabbar/tabbar.wxml" /> 3 <!-- <import src="../../tabbar/tabbar.wxml" />
2 <template is="tabBar" data="{{tabBar}}" /> --> 4 <template is="tabBar" data="{{tabBar}}" /> -->
3 <wxs src="filter.wxs" module="util"></wxs> 5 <wxs src="filter.wxs" module="util"></wxs>