Merge branch 'dev_oa_fu17' into dev

WXD-SEASON\season
2 parents c9a60728 c40e4c9b
Showing 40 changed files with 619 additions and 75 deletions
app.wxss
components/privacy_pop/privacy_pop.js
components/privacy_pop/privacy_pop.json
components/privacy_pop/privacy_pop.wxml
components/privacy_pop/privacy_pop.wxss
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.json
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/team_show/team_show.js
packageA/pages/serviceCard_pd/team_show/team_show.json
packageA/pages/serviceCard_pd/team_show/team_show.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.json
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -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;
+}
+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,
+          });
+    },
+
+  }
+
+})
+
+{
+  "component": true,
+  "usingComponents": {}
+}
 \ No newline at end of file
+<view wx:if="{{show_pri}}">
+    <!-- 遮罩层 -->
+    <view class="cover-layer" style="z-index:11111"></view>
+    <!-- 内容层 -->
+    <view class="privacy_view">
+        <view class="pri_title">
+            隐私政策更新提示
+        </view>
+        <view class="pri_content">
+            <view class="pri_content_p" >
+                为了更好地保障您的权益，我们更新了《{{store.store_name}}小程序隐私政策》，本次更新主要包括：
+
+                <view style="margin:40rpx 0">1. 调整注销账户功能的描述</view>
+
+                请您务必在勾选同意前仔细阅读、充分理解《{{store.store_name}}小程序隐私政策》的内容。若您不同意《{{store.store_name}}小程序隐私政策》的内容，请您选择不同意或立即停止使用我们的产品
+
+                <view style="margin-top:40rpx">如您对上述内容有任何疑问，可与我们电话联系[{{store.store_tel}}]</view>
+            </view>
+        </view>
+
+        <!-- 用户使用协议和隐私政策 -->
+        <view class="pri_btn">
+            <view class="flex-vertical fs24">
+                <checkbox-group bindchange="isAgree">
+                    <checkbox class="m_ck_box" value="true">
+                        <label for="true">
+                            <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>
+                        </label>
+                    </checkbox>
+                </checkbox-group>
+            </view>
+        </view>
+
+        <view class="pri_btn">
+            <block wx:if="{{!is_all_ok}}">
+                <button  class="continue_btn" bindtap="need_ok">
+                    <view class="flex flex-center ali-c">
+                        <view>同意，继续使用</view>
+                    </view>
+                </button>
+            </block>
+            <block wx:else>
+                <button  class="continue_btn" open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="AgreePrivacy">
+                    <view class="flex flex-center ali-c">
+                        <view>同意，继续使用</view>
+                    </view>
+                </button>
+            </block>
+        </view>
+
+    </view>
+</view>
+@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;
+}
+
@@ -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"});
+                    }
+
+                }
+            })
+        }
+    },
+	
-		
-	  
 });
@@ -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
@@ -3,6 +3,9 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
 	<view class="container">
@@ -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" });
+                    }
+
+                }
+            })
+        }
+    },
 });
@@ -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
@@ -3,6 +3,9 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
 	<view class="container">
@@ -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"
+              });
+            }
+
+          }
+        })
+      }
+    },
@@ -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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <!---- //文字"-->
 <view wx:if="{{is_show}}">
@@ -11,13 +14,13 @@
 			<view class='cenrt'>
 				<view class='xc-goods-details ellipsis-2 fs28'>
-					<span>{{goods.serviceName}}</span>
+					<text>{{goods.serviceName}}</text>
 				</view>
 			</view>
 			<view class='cenrcen flex-vertical-between'>
 				<view>
 					<view class="fs40 xc-wc" style='font-size:40rpx'>
-						<span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
+						<text class="fs28" style="font-weight:500;">￥</text>{{teamlist.price}}</view>
 					<view class="fs22 word-line xc-wc">
 						零售价￥{{goods.show_price}}
 					</view>
@@ -62,7 +65,7 @@
 			<view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key>
 				<view class='d'>
 					<image src='{{item.head_pic}}'></image>
-					<span wx:if="{{item.is_pt_tz==1}}">团长</span>
+					<text wx:if="{{item.is_pt_tz==1}}">团长</text>
 				</view>
 			</view>
 			<view class='d' wx:for="{{sf_arr}}">
@@ -84,10 +87,10 @@
 			<!--许程 <view class='bodytimecen' wx:if='{{obj}}'> -->
 			<view class='bodytimecen'>
 				剩余
-				<span wx:if="{{obj.day!=0}}"> {{obj.day}} </span>:
-				<span> {{obj.hou}} </span>:
-				<span> {{obj.min}} </span>:
-				<span> {{obj.sec}} </span>结束
+				<text wx:if="{{obj.day!=0}}"> {{obj.day}} </text>:
+				<text> {{obj.hou}} </text>:
+				<text> {{obj.min}} </text>:
+				<text> {{obj.sec}} </text>结束
 			</view>
@@ -131,21 +134,21 @@
 	<view class='mck'>
 		<view class='bodyfoot'>
 			<view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
-				<span>展开拼团列表
+				<text>展开拼团列表
 					<view class='down-arrow'></view>
-				</span>
+				</text>
 			</view>
 			<!----收起拼团列表---->
 			<view class='zhangxi' wx:if="{{hiddenName}}">
-				<view class='zspan' bindtap='click'>收起拼团列表
+				<view class='ztext' bindtap='click'>收起拼团列表
 					<view class='down-arrow1'></view>
 				</view>
 				<view class="ia" wx:for="{{ordertx}}" wx:for-index="ky">
 					<view class='img'>
 						<image src='{{item.head_pic}}'></image>
-						<span>{{item.nickname}}</span>
+						<text>{{item.nickname}}</text>
 					</view>
 					<view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view>
 					<view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
@@ -157,7 +160,7 @@
 	<!--大家都在团-->
 	<view class='goodslist'>
 		<view class='goodslisttop'>
-			<span class='goodslistspan'>大家都在团</span>
+			<text class='goodslisttext'>大家都在团</text>
 			<view class='goodslisttopright'></view>
 		</view>
 		<view class="changxin">
@@ -171,7 +174,7 @@
 				<view class='price'>
 					<view class='jgleft'>¥{{item.price}}</view>
 					<view class='jgright'>{{item.ct_num}}人
-						<span>参团</span>
+						<text>参团</text>
 					</view>
 				</view>
 			</view>
@@ -194,7 +197,7 @@
 						<view class="spec-goods-name ellipsis-1">{{goods.serviceName}}</view>
 						<view class="flex ai_end xc-val-money">						
 							<view class="spec-goods-price">
-								<span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>	
+								<text class='t1'>¥</text><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>	
 							</view>
 						</view>								
 						<view class="flex">
@@ -300,7 +303,7 @@
 					   </view>
                    </view>
                   <view>
-                    <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+                    <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
                     距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
                   </view>
               </view>
@@ -360,7 +363,7 @@
 						  </view>
                         </view>
                         <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+                          <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
 							  距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
                         </view>
                       </view>
@@ -377,7 +380,7 @@
               <view class="store-bottom flex-vertical-between">
                 <view class="determine red-b fs28 white t-c" bindtap="sure_pick" 
                 data-openindstore="{{open_ind_store}}">确定</view>
-                <view class="default  t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
+                <view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view>
              </view>
           </view>
@@ -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" });
+          }
+
+        }
+      })
+    }
+  },
@@ -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
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
@@ -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"
+            });
+          }
+
+        }
+      })
+    }
+
+
+  },
+
+
 });
@@ -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
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <block wx:if="{{show}}">
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
@@ -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);
 {
   "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
-<view>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+<view>
   <!-- 登录图 -->
   <view >
     <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;">
@@ -17,7 +19,7 @@
 		<view bindtap="" class="user-name flex-vertical fs24 jc-center">
 			<checkbox-group bindchange="isAgree">
-				<checkbox value="true">
+				<checkbox checked="{{isAgree}}" value="true">
 				<label for="true">
 					<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>
 				</label>
@@ -64,7 +66,6 @@
 </view>
-
 <view wx:if="{{show_bind}}">
 	<view class="cover-layer" bindtap="close_pop"></view>
 	<view class="p_content">
@@ -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;
               }
@@ -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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- 促销弹出框 -->
 <pro_pop id="pro_pop" bind:sure_cx_group="sure_cx_group"></pro_pop>
@@ -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
@@ -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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- 促销弹出框 -->
 <pro_pop id="pro_pop"></pro_pop>
@@ -1180,7 +1182,8 @@
               <text style="font-size: 23rpx">￥</text>
               {{filters.toFix(prom_act.tz_yyhjg,2)}}
             </view>
-            <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
+            <view style="margin-top:2rpx" wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
+            <view style="margin-top:2rpx"  wx:if="{{prom_act.tz_yhjgtype==4}}">送赠品</view>
           </view>
           <view wx:else>
             <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
@@ -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;
@@ -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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop"></privacy_pop>
 <!-- 全屏控制 -->
 <view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
   <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
@@ -406,8 +408,6 @@
   </view>
 </view>
-
-
 <block wx:if="{{f_hidden}}">
   <!--是否是自定义-->
   <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
@@ -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"
+            });
+          }
+
+        }
+      })
+    }
+  },
@@ -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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <!---- //文字"-->
 <view wx:if="{{is_show}}">
@@ -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) {
 {
   "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
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- <import src="../../tabbar/tabbar.wxml" />
 <template is="tabBar" data="{{tabBar}}" /> -->
 <wxs src="filter.wxs" module="util"></wxs>
@@ -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;
                     })
@@ -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;
           })