diff --git a/app.wxss b/app.wxss
index 3e5ba4b..0d85c34 100644
--- a/app.wxss
+++ b/app.wxss
@@ -367,6 +367,7 @@ button {
.ai_end{
align-items: flex-end;
}
+
.cover-layer {
position: fixed;
left: 0;
@@ -1332,4 +1333,10 @@ background: #ffe3e2;
100% {
transform: translateY(550rpx);
}
-}
\ No newline at end of file
+}
+
+checkbox .wx-checkbox-input {
+ width: 32rpx !important;
+ height: 32rpx !important;
+ margin-right: 16rpx;
+}
diff --git a/components/privacy_pop/privacy_pop.js b/components/privacy_pop/privacy_pop.js
new file mode 100644
index 0000000..11d1b0b
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.js
@@ -0,0 +1,63 @@
+var t = getApp(),os =t.globalData.setting;
+Component({
+ properties: {
+ },
+ data: {
+ show_pri:0,
+ is_all_ok:0,
+ store:null
+ },
+ //获取一下商家的信息
+ ready: function () {
+ getApp().getConfig(e=>{
+ this.setData({store:e})
+ })
+ },
+ methods: {
+ //判断用户有没有同意安全隐私
+ check_pri_show(){
+ wx.getPrivacySetting({
+ success: res => {
+ console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
+ if (res.needAuthorization) {
+ // 需要弹出隐私协议
+ this.setData({
+ show_pri: 1
+ })
+ }
+ }
+ })
+ },
+ //--- 分享 ---
+ goto:function (e) {
+ var url= e.currentTarget.dataset.url;
+ getApp().goto(url);
+ },
+ need_ok:function (){
+ wx.showToast({
+ title: '请您先阅读和勾选指定的内容',
+ icon: 'none',
+ });
+ },
+ //同意隐私的内容
+ AgreePrivacy:function (){
+ this.setData({show_pri:0,});
+ this.triggerEvent('agree_pri');// 调用同意的函数
+ },
+
+ // 是否同意协议
+ isAgree(e) {
+ let isAgree = null;
+ if (e.detail.value[0]) {
+ isAgree = true;
+ } else { isAgree = false;}
+
+ this.setData({
+ is_all_ok:isAgree,
+ });
+ },
+
+ }
+
+})
+
diff --git a/components/privacy_pop/privacy_pop.json b/components/privacy_pop/privacy_pop.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/privacy_pop/privacy_pop.wxml b/components/privacy_pop/privacy_pop.wxml
new file mode 100644
index 0000000..ec2e7fc
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.wxml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+ 隐私政策更新提示
+
+
+
+ 为了更好地保障您的权益，我们更新了《{{store.store_name}}小程序隐私政策》，本次更新主要包括：
+
+ 1. 调整注销账户功能的描述
+
+ 请您务必在勾选同意前仔细阅读、充分理解《{{store.store_name}}小程序隐私政策》的内容。若您不同意《{{store.store_name}}小程序隐私政策》的内容，请您选择不同意或立即停止使用我们的产品
+
+ 如您对上述内容有任何疑问，可与我们电话联系[{{store.store_tel}}]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/privacy_pop/privacy_pop.wxss b/components/privacy_pop/privacy_pop.wxss
new file mode 100644
index 0000000..19556cf
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.wxss
@@ -0,0 +1,27 @@
+@import '../../app.wxss';
+.privacy_view{
+ position: fixed; z-index: 110000; background-color: #fff;
+ left:50%;top: 50%;border-radius: 10rpx;
+ width: 640rpx;margin-left: -320rpx;
+ height:940rpx;margin-top: -470rpx;
+}
+.pri_title{
+ color:#333;text-align: center;font-size: 30rpx; margin: 20rpx 0;
+}
+.pri_content{
+ border: 1rpx solid #eee; color:#666; height: 560rpx;width: 600rpx; margin: 0 auto; font-size: 26rpx;
+}
+.pri_content_p{ width: 560rpx;display: block; margin-top: 20rpx;margin-left: 20rpx;}
+.pri_btn{width: 600rpx; margin: 0 auto;margin-top: 20rpx}
+.gray {color: #767f8e;}
+.continue_btn{
+ width: 600rpx;
+ height: 94rpx;
+ line-height: 94rpx;
+ background-color: #f23030;
+ border-radius: 48rpx;
+ color: rgb(255,255,255);
+ font-size: 32rpx;
+ margin-top: 40rpx;
+}
+
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 1083a83..ca57a43 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -391,13 +391,18 @@ Page({
async onShow() {
- getApp().check_can_share();
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
- if (typeof this.getTabBar === 'function' && this.getTabBar()) {
- this.getTabBar().setData({
- cartGoodsNum: getApp().globalData.cartGoodsNum
- })
- }
+ getApp().check_can_share();
+ if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+ this.getTabBar().setData({
+ cartGoodsNum: getApp().globalData.cartGoodsNum
+ })
+ }
var th = this;
//-- 登录回来判断弹框 --
var user_id = getApp().globalData.user_id;
@@ -418,7 +423,7 @@ Page({
console.log(this.data.isTemplate, '首页');
if (!this.data.isTemplate) {
- // timetype: 1 仅查询已预售 置空查询全部,
+ //timetype: 1 仅查询已预售 置空查询全部,
var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 };
if (user_id) {
pre_data.user_id = user_id;
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index 315564c..0c4fc61 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -18,14 +18,15 @@
"picMax": "/components/diy_picMax/diy_picMax",
"mvideo": "/components/diy_video/diy_video",
"service": "/components/diy_service/diy_service",
- "scan": "/components/diy_scan/diy_scan",
- "store_select": "/components/diy_store_select/diy_store_select",
+ "scan": "/components/diy_scan/diy_scan",
+ "store_select": "/components/diy_store_select/diy_store_select",
"presell": "/components/diy_pregoods/diy_pregoods",
- "luckyGo": "/components/diy_luckyGo/diy_luckyGo",
- "serviceCard": "/components/diy_serviceCard/diy_serviceCard",
- "live": "/components/diy_live/diy_live",
- "mp-dialog": "weui-miniprogram/dialog/dialog",
- "mp-sticky": "/components/mp-sticky/mp-sticky"
+ "luckyGo": "/components/diy_luckyGo/diy_luckyGo",
+ "serviceCard": "/components/diy_serviceCard/diy_serviceCard",
+ "live": "/components/diy_live/diy_live",
+ "mp-dialog": "weui-miniprogram/dialog/dialog",
+ "mp-sticky": "/components/mp-sticky/mp-sticky",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
},
"enablePullDownRefresh": false,
"onReachBottomDistance":300
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 78cc564..7fc3649 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,3 +1,5 @@
+
+
跳过 {{sec_show}}
@@ -406,8 +408,6 @@
-
-