Merge branch 'dev_oa_luo12' into dev

WXD-SEASON\season
2 parents e682e1c9 edf14969
Showing 1 changed file with 14 additions and 1 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -272,6 +272,7 @@ Page({
         sec_i: -1, //选中分类门店 下标
         cx_prom_group: [], //促销活动，用于显示和判断默认要用什么促销活动
         showFold:true,
+        new_share_imgurl:'', //普通商品分享图片
       },
       //------初始化加载----------
@@ -2926,8 +2927,12 @@ Page({
               price = th.data.prom_act.price;
             }
+            
             var title = th.data.sele_g.goods_name;
             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;
@@ -3035,7 +3040,11 @@ Page({
                 if (e.data.code == 0) arrdata = e.data.data.pageData;
               })
               if (!arrdata) return false;
-
+              if(arrdata[0]){
+                tt.setData({
+                  new_share_imgurl:arrdata[0].share_imgurl
+                })
+              }
               var arrsku = new Array();
               var gitem = null;
               var gb = 1,
@@ -6650,6 +6659,9 @@ Page({
                         if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) {
                           img_url = this.data.iurl + this.data.prom_act.share_imgurl;
                         }
+                        if (this.data.new_share_imgurl) {
+                          img_url=this.data.iurl + this.data.new_share_imgurl
+                        }
                         //获取商品是分享图信息
                         wx.getImageInfo({
@@ -7894,6 +7906,7 @@ Page({
                             },
                             send() {
+                              
                               this.setData({
                                 share_hidden: false,
                               });