From 3afbb00cf2269ecd8bde1d30b4766765e246d59f Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 15 Feb 2024 11:09:41 +0800
Subject: [PATCH] 商品分享不需要判断会员的登陆

---
 packageA/pages/goods_share/goods_share.js | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index 15f3333..27b065b 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -114,9 +114,9 @@ Page({
 	  				} 
 	  })
 	  
-	  if(!app.globalData.userInfo) {
-		 getApp().goto("/packageE/pages/togoin/togoin");  
-	  }
+	  // if(!app.globalData.userInfo) {
+		//  getApp().goto("/packageE/pages/togoin/togoin");
+	  // }
 	  
 	  
   },
@@ -368,12 +368,12 @@ Page({
 	 //--定义的保存图片方法，分享团---
 	 saveImageToPhotosAlbum: function() {
 	   //--先判断会员状态--
-	   var user_info = getApp().globalData.userInfo;
-	   if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-	     //getApp().my_warnning("请先登录",0,this);
-	     wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
-	     return false;
-	   }	 
+	   // var user_info = getApp().globalData.userInfo;
+	   // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+	   //   //getApp().my_warnning("请先登录",0,this);
+	   //   wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
+	   //   return false;
+	   // }
 	   //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
 	   var type = 0;
 	   wx.showLoading({
@@ -416,7 +416,9 @@ Page({
 	 			  pg_path=th.data.share_b_img;
 	 		 }	  		  
 	         context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
-	 		  	  
+
+
+			  let nick=app.globalData.userInfo?app.globalData.userInfo.nickname:'';
 	 		  //-- 是自定义海报的情况下 --
 	 		  if(th.data.poster && parseInt(th.data.poster.style)==2){
 	 			  //在线上分享人的情况下
@@ -429,8 +431,8 @@ Page({
 	 				  //--昵称---
 	 				  context.setFontSize(24 * unit)
 	 				  context.setFillStyle("black")
-	 				  context.fillText(app.globalData.userInfo.nickname, x1, y1);
-	 				  var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;				  
+	 				  context.fillText(nick, x1, y1);
+	 				  var width = 24 * nick.length * unit + 4 * unit;
 	 				  //强烈推荐 改许程
 	 				  var tj_path = "../../../images/share/q_tj.png";
 	 				  context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit);
@@ -443,8 +445,8 @@ Page({
 	 			 //--昵称---
 	 			 context.setFontSize(24 * unit)
 	 			 context.setFillStyle("black")
-	 			 context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-	 			 var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+	 			 context.fillText(nick, 152 * unit, 76 * unit);
+	 			 var width = 24 * nick.length * unit + 2 * unit;
 	 			 //强烈推荐 改许程
 	 			 var tj_path = "../../../images/share/q_tj.png";
 	 			 context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
@@ -749,12 +751,12 @@ Page({
      //点击分享商品  
 	 share_good:function(e){		 
 		 //--先判断会员状态--
-		 var user_info = getApp().globalData.userInfo;
-		 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-		   //getApp().my_warnning("请先登录",0,this);
-		   wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
-		   return false;
-		 }
+		 // var user_info = getApp().globalData.userInfo;
+		 // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+		 //   //getApp().my_warnning("请先登录",0,this);
+		 //   wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
+		 //   return false;
+		 // }
 		 
 		 var index=e.currentTarget.dataset.index;
 		 var item=this.data.list[index];
@@ -773,7 +775,7 @@ Page({
 	     return false;
 	   }
 	   //---获取分享图片的本地地址,头像和商品图片----
-	   var path2 = getApp().globalData.userInfo.head_pic;
+	   var path2 =  getApp().globalData.userInfo?getApp().globalData.userInfo.head_pic:'';
 	   if (path2 == "") {
 	     ee.data.share_head = "../../../images/share/hui_hear_pic.png";
 	     tt(func);
--
libgit2 0.21.4