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..1ec796c
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.js
@@ -0,0 +1,69 @@
+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
+ })
+ }else{
+ this.setData({
+ show_pri: 0
+ })
+ this.triggerEvent('agree_pri');// 调用同意的函数
+ }
+ }
+ })
+ },
+ //--- 分享 ---
+ 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/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index f25da78..4cb8a4c 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -560,6 +560,12 @@ Page({
// gid 在onload阶段已经保存在this.data中
onShow: function() {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share();
var that=this;var th=this;
@@ -4047,22 +4053,43 @@ Page({
hiddenCS: true,
});
},
-
-
-
-
-
-
-
-
-
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({is_gps: 1});
+ th.get_sto();
+ },
+ fail: function (res) {
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({is_gps: "3"});
+ }
+
+ }
+ })
+ }
+ },
+
-
-
});
diff --git a/packageA/pages/goodsInfo/goodsInfo.json b/packageA/pages/goodsInfo/goodsInfo.json
index d201627..4d70c35 100644
--- a/packageA/pages/goodsInfo/goodsInfo.json
+++ b/packageA/pages/goodsInfo/goodsInfo.json
@@ -4,6 +4,7 @@
"usingComponents": {
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
- "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list"
+ "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 431ccb4..d0aa400 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,9 @@
+
+
+
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 0ebda43..5778cf0 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -554,6 +554,12 @@ Page({
// gid 在onload阶段已经保存在this.data中
onShow: function () {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share(this);
var that = this;
var ee = this, gid = this.data.gid, i = getApp().request;
@@ -3885,6 +3891,38 @@ Page({
getApp().goto(url);
},
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({ is_gps: 1 });
+ th.get_sto();
+ },
+ fail: function(res) {
+
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({ is_gps: "3" });
+ }
+
+ }
+ })
+ }
+ },
});
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
index ffdfeb2..b1f6157 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index 4e33079..5c2e02c 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,9 @@
+
+
+
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index e2f1254..84d9943 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.js
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -140,7 +140,13 @@ Page({
//显示加载
onShow:function(){
- getApp().check_can_share();
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
+ getApp().check_can_share();
var tg_id = this.data.tg_id,th=this;
this.init(tg_id);
},
@@ -1615,7 +1621,46 @@ Page({
go_to:function (e) {
var url=e.currentTarget.dataset.url;
getApp().goto(url);
- }
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+ },
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.json b/packageA/pages/serviceCard_pd/team_show/team_show.json
index 1f536c0..199474a 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.json
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.json
@@ -7,6 +7,7 @@
"backgroundColor": "#eeeeee"
},
"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/packageA/pages/serviceCard_pd/team_show/team_show.wxml b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
index e473387..abb7500 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxml
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -1,3 +1,6 @@
+
+
+
@@ -11,13 +14,13 @@
- {{goods.serviceName}}
+ {{goods.serviceName}}
- ￥{{teamlist.price}}
+ ￥{{teamlist.price}}
零售价￥{{goods.show_price}}
@@ -62,7 +65,7 @@
- 团长
+ 团长
@@ -84,10 +87,10 @@
剩余
- {{obj.day}} :
- {{obj.hou}} :
- {{obj.min}} :
- {{obj.sec}} 结束
+ {{obj.day}} :
+ {{obj.hou}} :
+ {{obj.min}} :
+ {{obj.sec}} 结束
@@ -131,21 +134,21 @@
- 展开拼团列表
+ 展开拼团列表
-
+
- 收起拼团列表
+ 收起拼团列表
- {{item.nickname}}
+ {{item.nickname}}
{{item.add_time_date}} 开团
{{item.add_time_date}} 参团
@@ -157,7 +160,7 @@
- 大家都在团
+ 大家都在团
@@ -171,7 +174,7 @@
¥{{item.price}}
{{item.ct_num}}人
- 参团
+ 参团
@@ -194,7 +197,7 @@
{{goods.serviceName}}
- ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
+ ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
@@ -300,7 +303,7 @@
-
+
距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}
@@ -360,7 +363,7 @@
-
+
距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
@@ -377,7 +380,7 @@
确定
- 设为默认
+ 设为默认
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 4d85d5a..f126775 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -898,6 +898,12 @@ Page({
//---展示---
onShow: async function () {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
//添加购物车的控制要清理0
this.data.adding=0;
@@ -7346,7 +7352,40 @@ Page({
break;
}
}
- }
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({ is_gps: 1 });
+ th.get_sto();
+ },
+ fail: function(res) {
+
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({ is_gps: "3" });
+ }
+
+ }
+ })
+ }
+ },
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
index 53c58c3..58bee0f 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"goods_recommend": "/components/goods_list/goods_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index f8fcb1c..a7b3b15 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -3,6 +3,8 @@
+
+
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index d6ef67f..3e8cfae 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -703,6 +703,13 @@ Page({
//---展示---
onShow: function () {
+
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share(this);
var goods_list = null, th = this, that = this;
@@ -4821,4 +4828,48 @@ Page({
});
},
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+
+
+ },
+
+
});
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.json b/packageC/pages/presell/goodsInfo/goodsInfo.json
index feb03a7..2bd588d 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.json
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"goods_recommend": "/components/goods_list/goods_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 47b3dcb..1320058 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,8 @@
+
+
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/cart/cart/cart.js b/pages/cart/cart/cart.js
index c902fac..4878549 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -125,6 +125,13 @@ Page({
},
onShow: function () {
+
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
//每次显示都清空
this.data.in_zhact_gdmap = {};
this.setData({
@@ -797,6 +804,30 @@ Page({
continue;
}
+ //把活动写入
+ item.prom=prom;
+
+ //判断团购的限购
+ if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) {
+ var cbuy = prom.buy_limit - promgoodsbuynum;
+ if (cbuy <= 0) {
+ // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+ // a.delete(url, {});
+ th.disInvalid(item, 2);
+ continue;
+ }
+ //-- 购物车更新 --
+ var updata1 = {
+ id: item.id,
+ goods_num: cbuy,
+ store_id: os.stoid,
+ user_id: getApp().globalData.userInfo.user_id
+ };
+ getApp().request.put("/api/weshop/cart/update", {
+ data: updata1,
+ })
+ item.goods_num = cbuy;
+ }
}
@@ -3382,13 +3413,18 @@ Page({
if (res.data.code == 0) gd = res.data.data;
})
- //判断秒杀的指定门店
- if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
+ //判断秒杀的指定门店和团购的指定门店
+ if([1,2].indexOf(py_type)>-1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
return e.pickup_id==i_arr[j].pick_id;
})
if(idx0<0){
- getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售");
+
+ var act_type=0;
+ if(py_type==1) act_type='秒杀';
+ if(py_type==2) act_type='团购';
+
+ getApp().confirmBox(i_arr[j].goods_name + act_type+"活动的门店不可售");
wx.hideLoading();
return false;
}
diff --git a/pages/cart/cart/cart.json b/pages/cart/cart/cart.json
index 08f0ff2..0aa5062 100644
--- a/pages/cart/cart/cart.json
+++ b/pages/cart/cart/cart.json
@@ -3,6 +3,7 @@
"usingComponents": {
"warn": "/components/long_warn/long_warn",
"goods_recommend":"/components/goods_list/goods_list",
- "pro_pop": "/components/promate_pop/promate_pop"
+ "pro_pop": "/components/promate_pop/promate_pop",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 4f49c23..f1a1e78 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -1,3 +1,5 @@
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index ccf0ccb..93bb253 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -921,6 +921,13 @@ Page({
//---展示---
onShow: function () {
+
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
//添加购物车的控制要清理0
this.data.adding=0;
@@ -3645,9 +3652,9 @@ Page({
}
-
+ var py=parseFloat(th.data.prom_type+'');
//指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
- if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
+ if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){
pickup_ids=th.data.prom_act.pick_up_lists
}
@@ -3675,7 +3682,7 @@ Page({
if(idx1<0){
//如果是秒杀的指定门店，就要设置秒杀的
- if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) ){
+ if(!is_normal && [1,2,6].indexOf(py)>-1 ){
th.data.def_pick_store.is_no_dis_act=1;
}else{
th.data.def_pick_store.is_no_dis_nor=1;
@@ -8748,7 +8755,46 @@ Page({
break;
}
}
- }
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+ },
})
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.json b/pages/goods/goodsInfo/goodsInfo.json
index 0fd8f27..8be378d 100644
--- a/pages/goods/goodsInfo/goodsInfo.json
+++ b/pages/goods/goodsInfo/goodsInfo.json
@@ -6,6 +6,7 @@
"warn": "/components/long_warn/long_warn",
"goods_recommend": "/components/goods_list/goods_list",
"share": "/components/share/share",
- "pro_pop": "/components/promate_pop/promate_pop"
+ "pro_pop": "/components/promate_pop/promate_pop",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 4a8445f..384f4b0 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1,3 +1,5 @@
+
+
@@ -1180,7 +1182,8 @@
￥
{{filters.toFix(prom_act.tz_yyhjg,2)}}
- 团长免单
+ 团长免单
+ 送赠品
￥{{ filters.toFix(prom_act.price,2)}}
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 @@
-
-
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 9202e8f..7068b32 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -144,7 +144,13 @@ Page({
//显示加载
onShow:function(){
- getApp().check_can_share();
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
+ getApp().check_can_share();
var tg_id = this.data.tg_id,th=this;
this.init(tg_id);
},
@@ -1633,7 +1639,45 @@ Page({
})
},
-
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+ },
diff --git a/pages/team/team_show/team_show.json b/pages/team/team_show/team_show.json
index 1f536c0..199474a 100644
--- a/pages/team/team_show/team_show.json
+++ b/pages/team/team_show/team_show.json
@@ -7,6 +7,7 @@
"backgroundColor": "#eeeeee"
},
"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/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index b5bc562..bdee04a 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -1,3 +1,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 @@
+
+
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index cff2a9e..496b672 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -1038,10 +1038,11 @@ Page({
var act_type='';
switch (c_type){
case 1:act_type='秒杀';break;
+ case 2:act_type='团购';break;
case 6:act_type='拼团';break;
}
//指定门店的控制
- if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
+ if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
var idx0=prom.pick_up_lists.findIndex(function (e){
return e.pickup_id==order.pickup_id;
})
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 4df4dac..7ac5f86 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -778,7 +778,6 @@ Page({
return false;
}
-
//-- 要进行判断指定门店的判断优化,先做普通商品 --
if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){
var idx0=gg.pick_up_lists.findIndex(function (e){
@@ -1354,11 +1353,12 @@ Page({
var act_type='';
switch (c_type){
case 1:act_type='秒杀';break;
+ case 2:act_type='团购';break;
case 6:act_type='拼团';break;
}
//指定门店的控制
- if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
+ if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
var idx0=prom.pick_up_lists.findIndex(function (e){
return e.pickup_id==order.pickup_id;
})