From 35da1d29c4f1a56565f21349b7330b575fa6ef98 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 30 Aug 2023 10:00:36 +0800
Subject: [PATCH] 拼团参团优化 隐私安全的优化

---
 packageA/pages/serviceCard_pd/team_show/team_show.js   | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 packageA/pages/serviceCard_pd/team_show/team_show.json |  3 ++-
 packageA/pages/serviceCard_pd/team_show/team_show.wxml | 37 ++++++++++++++++++++-----------------
 pages/team/team_show/team_show.js                      | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 pages/team/team_show/team_show.json                    |  3 ++-
 pages/team/team_show/team_show.wxml                    |  3 +++
 6 files changed, 120 insertions(+), 23 deletions(-)

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 @@
+<!-- 判断隐私是不是显示 -->
+<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>
        
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 @@
+<!-- 判断隐私是不是显示 -->
+<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}}">
--
libgit2 0.21.4