小程序增加隐私协议授权,对应弹出的场景：④商品详情页的优化完成

yvan.ni
1 parent affc0b6a
Showing 19 changed files with 251 additions and 19 deletions
components/privacy_pop/privacy_pop.js
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
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
pages/cart/cart/cart.js
pages/cart/cart/cart.json
pages/cart/cart/cart.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.json
pages/goods/goodsInfo/goodsInfo.wxml
@@ -13,6 +13,7 @@ Component({
            this.setData({store:e})
       })
   },
+    
   methods: {
     //判断用户有没有同意安全隐私
     check_pri_show(){
@@ -25,6 +26,9 @@ Component({
                         show_pri: 1
                     })
                 }else{
+                    this.setData({
+                        show_pri: 0
+                    })
                     this.triggerEvent('agree_pri');// 调用同意的函数
                 }
             }
@@ -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">
@@ -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}}">
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
@@ -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({
@@ -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;
@@ -8741,7 +8748,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>