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

taiyuan
2 parents fe7bc33a 93d73303
Showing 3 changed files with 13 additions and 16 deletions
pages/giftpack/festival/festival.js
pages/giftpack/festival/festival.wxml
pages/goods/goodsInfo/goodsInfo.js
@@ -175,21 +175,20 @@ Page({
           }
         },
         function (res) {
-
         }
-
       )
-
     }
   },
   //获取节日有礼信息
   is_festival: function(e) {
     var th = this;
     var url = "/api/weshop/marketing/holiday/act/judge";
+    console.log(th.data.getActId);
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid, //商家ID
-        userId: d.user_id //用户ID
+        userId: d.user_id, //用户ID
+        id:th.data.getActId
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -197,7 +196,6 @@ Page({
           bimg: res.data.data.actImg,
           actFontColor: res.data.data.actFontColor, //字体颜色
           actBgColor: res.data.data.actBgColor, //背景颜色
-
         })
       }
     })
 <view style="background-color:{{actBgColor==undefined?'#FFB72D':actBgColor}}">
   <view class="image_box">
-    <image src="{{iurl+bimg}}" lazy-load="true"></image>
+    <image src="{{iurl+bimg?bimg:'/miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr1" data-errorimg="bimg" lazy-load="true"></image>
   </view>
   <block wx:if="{{itemShow}}">
     <view class="top rel">
@@ -2098,7 +2098,6 @@ Page({
   async get_sku(stoid, gd, g_id, is_normal, func) {
     var tt = this,arrdata=null;
     var now=ut.gettimestamp();
-
     await getApp().request.promiseGet("/api/weshop/goods/page", {
       data: {
         store_id: o.stoid,
@@ -4210,10 +4209,10 @@ Page({
 			  if(th.data.poster){
 					   var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
 					   var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
-					   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+					   context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);				  
 			  }else{
 					   //---二维吗图---
-					   context.drawImage(vpath, 410 * unit, 726 * unit, 115 * unit, 125 * unit);
+					   context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
 			  }	
               break;
@@ -4243,10 +4242,10 @@ Page({
               if(th.data.poster){
 				   var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
 				   var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
-				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit);				  
               }else{
 				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+				   context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit);
               }							  
               break;
@@ -4290,10 +4289,10 @@ Page({
               if(th.data.poster){
 				   var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
 				   var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
-				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);				  
               }else{
 				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+				   context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
               }	
               break
             case 3: //阶梯团的展示
@@ -4334,7 +4333,7 @@ Page({
 			  context.setFillStyle("black")
               context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);             
               //context.font = 'normal bold 18px sans-serif';
-              context.setFontSize(22 * unit)
+              context.setFontSize(21 * unit)
               context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * unit);
@@ -4342,10 +4341,10 @@ Page({
 			  if(th.data.poster){
 				   var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
 				   var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
-				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+				   context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);				  
 			  }else{
 				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+				   context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
 			  }			  
               break