From 936600b2f731b4df516e76c2af9e1d839ab40a96 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 6 Oct 2020 16:22:03 +0800
Subject: [PATCH] 1。   分享海报默认海报时的bug修复

---
 pages/goods/goodsInfo/goodsInfo.js      | 11 +++++------
 pages/team/team_success/team_success.js |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 45663a0..7cc5f7a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3279,7 +3279,7 @@ Page({
       }
     })
   },
-
+  
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function() {
     //--先判断会员状态--
@@ -3338,7 +3338,7 @@ Page({
           context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
 		  	  
 		  //-- 是自定义海报的情况下 --
-		  if(th.data.poster){
+		  if(th.data.poster && parseInt(th.data.poster.style)==2){
 			  //在线上分享人的情况下
 			  if(parseInt(th.data.poster.show_headpic)){				 
 				  //获取坐标
@@ -3358,7 +3358,7 @@ Page({
 				  context.setLineJoin('round'); //交点设置成圆角
 				  context.setFillStyle("white")
 				  context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); 				  				  
-			  }	  
+			  }	
 		  }else{
 			 //--昵称---
 			 context.setFontSize(24 * unit)
@@ -3408,8 +3408,7 @@ Page({
           switch (type) {
             case 0: //普通商品的展示
               //中间的几个字
-			  if(th.data.poster ){		
-		 		 
+			  if(th.data.poster && parseInt(th.data.poster.style)==2 ){				 		 
 				 if(parseInt(th.data.poster.show_quality)){
 					 var g_path = "../../../images/share/s_gou.png";
 					 context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
@@ -3592,7 +3591,7 @@ Page({
 		  
 		  
 		  //--- 如果是自定义海报的时候 ---
-		  if(th.data.poster){
+		  if(th.data.poster && parseInt(th.data.poster.style)==2){
 			  
 			  //如果显示会员信息的话
 			  if(parseInt(th.data.poster.show_headpic)){				  
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 80841fe..0c72ea1 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -413,7 +413,7 @@ Page({
                     context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
 					
 					//-- 是自定义海报的情况下 --
-					if(th.data.poster){
+					if(th.data.poster && parseInt(th.data.poster.style)==2){
 						//在线上分享人的情况下
 						if(parseInt(th.data.poster.show_headpic)){				 
 							  //获取坐标
@@ -585,8 +585,8 @@ Page({
                     }
 
                     //--- 如果是自定义海报的时候 ---
-                    if(th.data.poster){
-                  			  
+                    if(th.data.poster && parseInt(th.data.poster.style)==2){
+                 			  
 						  //如果显示会员信息的话
 						  if(parseInt(th.data.poster.show_headpic)){				  
 							  //获取坐标
--
libgit2 0.21.4