From d4244aaec9cc8da085dc50b198639a1cc44b8744 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 3 Jun 2023 11:39:14 +0800
Subject: [PATCH] 1、 直播间 2、预售  幸运购 3、普通，秒杀 团购 积分 拼团 4、专享礼包  月包

---
 packageA/pages/liveStream/liveStream.js                         |  2 +-
 packageA/pages/liveStream/liveStream.wxml                       |  2 +-
 packageA/pages/liveStreamDetails/liveStreamDetails.js           | 11 +++++++----
 packageA/pages/liveStreamDetails/liveStreamDetails.wxml         |  2 +-
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js       |  2 +-
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml     |  6 +++---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   |  2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  2 +-
 packageC/pages/presell/goodsInfo/goodsInfo.js                   |  2 +-
 packageC/pages/presell/goodsInfo/goodsInfo.wxml                 |  2 +-
 packageC/pages/presell/pregoodsInfo/goodsInfo.js                |  2 +-
 packageC/pages/presell/pregoodsInfo/goodsInfo.wxml              |  2 +-
 packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js    |  2 +-
 packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js   |  2 +-
 packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js   |  2 +-
 pages/goods/goodsInfo/goodsInfo.js                              |  4 ++--
 pages/goods/goodsInfo/goodsInfo.wxml                            | 10 +++++-----
 pages/team/team_success/team_success.js                         |  2 +-
 pages/team/team_success/team_success.wxml                       |  4 ++--
 19 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js
index 1e16b24..607abb2 100644
--- a/packageA/pages/liveStream/liveStream.js
+++ b/packageA/pages/liveStream/liveStream.js
@@ -283,7 +283,7 @@ Page({
    */
   onShow: function () {
 
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     if (app.globalData.userInfo) {
       if (!this.data.isLogin) {
         this.setData({
diff --git a/packageA/pages/liveStream/liveStream.wxml b/packageA/pages/liveStream/liveStream.wxml
index ed5c088..cbbfb52 100644
--- a/packageA/pages/liveStream/liveStream.wxml
+++ b/packageA/pages/liveStream/liveStream.wxml
@@ -84,7 +84,7 @@
                 
                 {{item['anchor_name']}}</view>
               </view>
-              <view style="width: 30%;height: 90rpx;align-items: center;justify-items: center;">
+              <view  wx:if="{{isLogin}}" style="width: 30%;height: 90rpx;align-items: center;justify-items: center;">
                 <view bindtap="clickShare" data-sharimg="{{item.share_img}}"  data-shartitle="{{item.name}}"  data-anchorname="{{item['anchor_name']}}"  class="display: flex;" style="width: 70%;border-radius: 25rpx;border: 1rpx solid #fc6247;height: 46rpx;margin-top: 25rpx;margin-left: 30rpx;">
                   <view class="share-image"></view>
                   <view class="fs26" style="color: #fc6247;margin-left: 10rpx;line-height: 46rpx;"> 分享 </view>
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 686b656..5263c76 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -580,9 +580,12 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
       }
     }
 
-    this.setData({
-      nickName: app.globalData.userInfo.nickname
-    })
+    if(app.globalData.userInfo){
+
+      this.setData({
+        nickName: app.globalData.userInfo.nickname
+      })
+    }
 
     // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
     //   os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
@@ -621,7 +624,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
 
   /**
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
index a09fa35..83eea5e 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
@@ -50,7 +50,7 @@
   
   <!-- 分享 -->
   <view class="share-container">
-    <image src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
+    <image wx:if="{{isLogin}}" src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
     <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image>
   </view>
 
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index cf05702..6b453d8 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -106,7 +106,7 @@ Page({
   },
 	
 	onShow: function() {
-        getApp().check_can_share();
+        getApp().check_can_share(this);
 		this.get_team_info();
 	},
 	
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
index 0d3d155..f28cbb7 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
@@ -182,7 +182,7 @@
       
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+				<button wx:if="{{p_status==1 && isLogin}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
         <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
@@ -194,7 +194,7 @@
     
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button>
         
       <!-- </view> -->
     <!-- </block> -->
@@ -240,7 +240,7 @@
 			<view class="pdh20 f1">
 				<button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
 			</view>
-			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
+			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0 && isLogin)}}">
 				<button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button>
 			</view>
 		 <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 4c45a9f..7f65661 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -894,7 +894,7 @@ Page({
   //---展示---
   onShow: async function () {
 
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     // console.log('onshow');
     var goods_list = null, th = this, that = this;
     var show_prew_img = this.data.show_prew_img
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 5ec27fe..3bd55de 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -208,7 +208,7 @@
 							
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-             <view class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
+             <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 2cfab4c..aa70361 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -699,7 +699,7 @@ Page({
 
   //---展示---
   onShow: function () {
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     var goods_list = null, th = this, that = this;
 
     //-- 如果是预览图片，页面不重新更新 --
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 7cc56c4..8fde05a 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -122,7 +122,7 @@
                   {{data.goods_name}}
                 </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
index 109d39e..c687687 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -673,7 +673,7 @@ Page({
   //---展示---
   onShow: function () {
 
-      getApp().check_can_share();
+      getApp().check_can_share(this);
     var goods_list = null, th = this, that = this;
 
     //-- 如果是预览图片，页面不重新更新 --
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml b/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
index 94b19bb..53f3938 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
@@ -120,7 +120,7 @@
                   {{data.goods_name}}
                 </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
                 <view class="iconfont icon-share fs60"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
diff --git a/packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js b/packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js
index 7749bed..f9bbec6 100644
--- a/packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js
+++ b/packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js
@@ -159,7 +159,7 @@ Page({
     },
 
     onShow: function () {
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
             var user_info = getApp().globalData.userInfo;
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index f76fa56..2fc2187 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -359,7 +359,7 @@ Page({
         var th=this;
         this.setData({submit:0})
         com.set_py_fir();
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
             var user_info = getApp().globalData.userInfo;
diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
index ffeaf1c..e278464 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
@@ -176,7 +176,7 @@ Page({
         var th=this;
         this.setData({submit:0})
         com.set_py_fir();
-        getApp().check_can_share();
+        getApp().check_can_share(this);
 
         setTimeout(()=>{
             ut.fy_back('',0,function (){
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index abe1d5f..cd996f1 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -903,7 +903,7 @@ Page({
   //---展示---
   onShow: function () {
 
-    getApp().check_can_share();
+    getApp().check_can_share(this);
 
     var goods_list = null,
       th = this,
@@ -5317,7 +5317,7 @@ Page({
   //-------跳转pt商品-------
   go_to_nopay: function () {
     var th = this;
-    url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
+    var url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
     getApp().goto(url);
 
   },
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 09923ec..7997753 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -187,7 +187,7 @@
                   {{data.goods_name}}
                 </view>
                 <!-- 这个是分享按钮 -->
-                <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+                <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                   <view class="iconfont icon-share"></view>
                   <view class="fs22 c-7b">分享</view>
                 </view>
@@ -278,7 +278,7 @@
               </view>
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                 <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
                 <view class="iconfont icon-share"></view>
                 <!-- <view class="share-font">1分享</view> -->
@@ -332,7 +332,7 @@
                 </view>
               </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2}}">
+              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2 && isLogin}}">
                 <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
@@ -428,7 +428,7 @@
                   <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
                 </view>
                 <!-- 这个是分享按钮 -->
-                <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+                <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                   <view class="iconfont icon-share"></view>
                   <view class="fs22 c-7b">分享</view>
                 </view>
@@ -444,7 +444,7 @@
             <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}">
               <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{sele_g.goods_name}}</view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 945c203..17f0cf2 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -87,7 +87,7 @@ Page({
 	  })	
   },
   onShow:function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
 
   //关闭展开列表
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index ca21c62..eed5363 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -166,7 +166,7 @@
       
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+				<button wx:if="{{p_status==1 && isLogin}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
         <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
@@ -178,7 +178,7 @@
     
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button>
         
       <!-- </view> -->
     <!-- </block> -->
--
libgit2 0.21.4