diff --git a/components/privacy_pop/privacy_pop.js b/components/privacy_pop/privacy_pop.js index 11d1b0b..665b0a8 100644 --- a/components/privacy_pop/privacy_pop.js +++ b/components/privacy_pop/privacy_pop.js @@ -24,6 +24,8 @@ Component({ this.setData({ show_pri: 1 }) + }else{ + this.triggerEvent('agree_pri');// 调用同意的函数 } } }) diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index 4f82ffc..a4d52c9 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -26,6 +26,12 @@ Page({ this.data.is_reg=1; } + //-- 看一下隐私政策要不要显示 -- + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id + if (privacy_pop) { + privacy_pop.check_pri_show(); + } + //--判断是否有接受到邀请人的ID-- if (options.first_leader) { this.setData({ first_leader: options.first_leader }); @@ -38,6 +44,7 @@ Page({ th.setData({ store: e, store_logo: logo }); }) + //判断注册的条件 app.getConfig2(function (e) { if (e.reg_type == 1) { @@ -490,7 +497,12 @@ Page({ }); }, - + //弹出框的同意的优化 + agree_pri:function (){ + this.setData({ + isAgree:1, + }); + }, //通过路径跳转到其他页面 goto: function (e) { console.log('xxxx', e); diff --git a/packageE/pages/togoin/togoin.json b/packageE/pages/togoin/togoin.json index 23b89bc..10d9682 100644 --- a/packageE/pages/togoin/togoin.json +++ b/packageE/pages/togoin/togoin.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "授权登录", "usingComponents": { - "warn": "/components/long_warn/long_warn" + "warn": "/components/long_warn/long_warn", + "privacy_pop": "/components/privacy_pop/privacy_pop" } } \ No newline at end of file diff --git a/packageE/pages/togoin/togoin.wxml b/packageE/pages/togoin/togoin.wxml index 8cde9a2..c02dcf9 100644 --- a/packageE/pages/togoin/togoin.wxml +++ b/packageE/pages/togoin/togoin.wxml @@ -1,5 +1,7 @@ - + + + @@ -17,7 +19,7 @@ - + @@ -64,7 +66,6 @@ - diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 3180f93..53f1eb9 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -119,6 +119,12 @@ Page({ var _that=this; + //-- 看一下隐私政策要不要显示 -- + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id + if (privacy_pop) { + privacy_pop.check_pri_show(); + } + getApp().check_can_share(); //看一下小程序是不是过期了 getApp().getConfig2(function (config2) { diff --git a/pages/user/index/index.json b/pages/user/index/index.json index 8421248..700c0bf 100644 --- a/pages/user/index/index.json +++ b/pages/user/index/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "pop_txt": "/components/userqy_pop_up/userqy_pop_up", - "goods_recommend": "/components/goods_list/goods_list" + "goods_recommend": "/components/goods_list/goods_list", + "privacy_pop": "/components/privacy_pop/privacy_pop" }, "navigationBarTitleText": "会员中心" } \ No newline at end of file diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index c091c36..caaed88 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -1,3 +1,5 @@ + +