From c2846e865f6d1031f4f8b85125b3dc369093c7ec Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 15 Feb 2024 22:46:53 +0800
Subject: [PATCH] 直播间分享的优化

---
 packageA/pages/liveStreamDetails/liveStreamDetails.js   | 28 +++++++++++++++++++---------
 packageA/pages/liveStreamDetails/liveStreamDetails.wxml |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 5263c76..0664236 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -34,7 +34,8 @@ Page({
     screenWidth: 0,
     canvasHidden: 1,
     gid: '',
-    shareImgPath: ''
+    shareImgPath: '',
+    id:''
   },
 
   // 点击商品
@@ -55,10 +56,10 @@ Page({
   // 分享操作表
   clickShare: function () {
 
-    if(!getApp().globalData.user_id){
-       getApp().goto("/packageE/pages/togoin/togoin");
-       return false;
-    }
+    // if(!getApp().globalData.user_id){
+    //    getApp().goto("/packageE/pages/togoin/togoin");
+    //    return false;
+    // }
     this.setData({
       showActionSheet: !this.data.showActionSheet
     })
@@ -172,9 +173,10 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
       });
     
   
-    var path2 = getApp().globalData.userInfo.head_pic;
+    var path2 = getApp().globalData.userInfo?getApp().globalData.userInfo.head_pic:'';
     if (path2 == "") {
       path2 = "../../../images/share/hui_hear_pic.png";
+      that.data.avatarUrl=path2;
     } else {
       getApp().request.promiseGet("/api/weshop/marketing/help/help/imgbase64/get", {
         data: {
@@ -216,7 +218,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
 
     // 请求二维码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-        os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+        os.stoid + "?sceneValue="+this.data.id + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails";
 
     if(!this.data.ewm) {
 
@@ -236,8 +238,8 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
 
     // console.log('----------------v', headImg);
 
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails";
+    //var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+      //os.stoid + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails";
     
     // 以iPhone6为例，375/750 = 0.5
     // let scale = this.data.windowWidth / 375;
@@ -515,6 +517,14 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
 	var staffId=options.staffId;
 	var storageId=options.storageId;
 
+    if(!options.id){
+      var id = decodeURIComponent(t.scene);
+      if(id){
+        options.id=id;
+      }
+    }
+    this.data.id=options.id;
+
 	if(first_leader){
 		 //--  user_id代过来免登录 --
 	     getApp().globalData.first_leader=first_leader;	  
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
index 83eea5e..a09fa35 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
@@ -50,7 +50,7 @@
   
   <!-- 分享 -->
   <view class="share-container">
-    <image wx:if="{{isLogin}}" src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
+    <image src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
     <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image>
   </view>
 
--
libgit2 0.21.4