From 5b7042f55d6d8b04d68bca143da15047d5cde053 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Fri, 11 Aug 2023 17:05:08 +0800
Subject: [PATCH] oa单朋友圈分享

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js |  5 +++--
 packageC/pages/presell/goodsInfo/goodsInfo.js                 |  5 +++--
 pages/goods/goodsInfo/goodsInfo.js                            | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 3423071..6af75c1 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -6857,10 +6857,11 @@ Page({
       if (getApp().globalData.groupchat_id) {
         pagePath+="&groupchat_id="+getApp().globalData.groupchat_id
       }
-
+      let imgPath = this.data.iurl + this.data.luckGoInfo.original_img;
     return {
       title: this.data.data.goods_name + '-' + store_name,
-      imageUrl: this.data.gallery[0].image_url,
+      // imageUrl: this.data.gallery[0].image_url,
+      imageUrl: imgPath,
         query: pagePath
     }
   },
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 34f98c0..a2825ec 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -4492,11 +4492,12 @@ Page({
     if (getApp().globalData.groupchat_id) {
       url+="&groupchat_id="+getApp().globalData.groupchat_id
     }
-
+    let img = this.data.data.original_img;
     return {
       title: this.data.data.goods_name + '-' + store_name,
       query: 'first_leader='+user_id+url,
-      imageUrl: this.data.gallery[0].image_url,
+      // imageUrl: this.data.gallery[0].image_url,
+      imageUrl: img
     }
   },
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index e4bdc9c..6deb6c1 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -8004,9 +8004,25 @@ Page({
                                 url += "&groupchat_id=" + getApp().globalData.groupchat_id
                               }
 
+                              //获取有活动的取活动图片，没有活动的取主图
+                              var img = th.data.sele_g.original_img;
+                              if(th.data.new_share_imgurl){
+                                img = th.data.iurl + th.data.new_share_imgurl
+                              }
+                              if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) {
+                                // title = th.data.prom_act.share_title;
+                                // if (!title) title = th.data.prom_act.title;
+                                // if (th.data.prom_type == 4) title = th.data.prom_act.name;
+                  
+                                if (th.data.prom_act.share_imgurl)
+                                  img = th.data.iurl + th.data.prom_act.share_imgurl;
+                              }
+                              let user_id = getApp().globalData.user_id
+                              console.error(img);
                               return {
                                 title: this.data.data.goods_name + '-' + store_name,
-                                imageUrl: this.data.gallery[0].image_url,
+                                // imageUrl: this.data.gallery[0].image_url,
+                                imageUrl: img,
                                 query: 'first_leader=' + user_id + url
                               }
                             },
--
libgit2 0.21.4