Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 42faa03b 2eaa2e90
Showing 3 changed files with 32 additions and 17 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
pages/goods/goodsInfo/goodsInfo.js
@@ -624,11 +624,12 @@
     <view class="sp">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" >
-            <view class='one'>
+          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" >
+            <view class='one' style="margin-left: 10rpx">
               <view class='sp_top'>
-                <view class='s_img' style="position: relative;">
-                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image>
+                <view class='s_img' style="position: relative; width: 100%">
+                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img"
+                         binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image>
 				  <block wx:if="{{object.goodicon==3}}">
 				      <image class='{{g_filter.get_class(object.column,object.position)}}'
@@ -808,5 +808,6 @@ top: 10rpx;
 	position: absolute;
 	right: 0rpx;
 	bottom: 10rpx;
+}
-}
 \ No newline at end of file
+.s_prom{ margin-left: -8rpx}
 \ No newline at end of file
@@ -1990,9 +1990,12 @@ Page({
     }
     var title= th.data.data.goods_name;
     var img=th.data.data.original_img;
-    if(th.data.prom_type==6){
+    if(th.data.prom_type==6 || th.data.prom_type==1){
+
       title=th.data.prom_act.share_title;
-      img=th.data.iurl+th.data.prom_act.share_imgurl;
+      if(!title)  title=th.data.prom_act.title;
+      if(th.data.prom_act.share_imgurl)
+          img=th.data.iurl+th.data.prom_act.share_imgurl;
     }
@@ -3963,14 +3966,19 @@ Page({
 			 context.setFillStyle("white");
 			 context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); 
 		  }
-		  
-         
+
+		  var share_title=th.data.data.goods_name;
+		  if(th.data.prom_type==1 || th.data.prom_type==4){
+             share_title=th.data.prom_act.share_title;
+             if(!share_title) share_title=th.data.prom_act.title;
+          }
+
           //---产品名称---
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
 		  if(type!=4){
 			 context.setFillStyle("black");
 			 context.setFontSize(21.3 * unit)
-			 th.draw_Text(context, th.data.data.goods_name,
+			 th.draw_Text(context, share_title,
 			     38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
 			 //------产品的价格-------
 			 context.setFontSize(23 * unit)
@@ -4431,18 +4439,23 @@ Page({
       tt();
       return false;
     }
+
+    var img_url=ee.data.data.original_img;
+    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;
+    }
+
     //获取商品是分享图信息
     wx.getImageInfo({
-      src: ee.data.data.original_img,
+      src: img_url,
       success: function(res) {
-        //res.path是网络图片的本地地址
-        ee.data.share_goods_img = res.path;
-        tt();
+           //res.path是网络图片的本地地址
+           ee.data.share_goods_img = res.path;
+           tt();
       },
       fail: function(res) {
-
-        ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
-        tt();
+           ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
+           tt();
       }
     });
   },