From c85fa94ad32115576fdc2faf27995af88613f798 Mon Sep 17 00:00:00 2001
From: antploy <antploy.ni@meidd.com>
Date: Sat, 31 Jul 2021 14:57:58 +0800
Subject: [PATCH] 节日营销接口入参调整

---
 pages/giftpack/festival/festival.js   | 8 +++-----
 pages/giftpack/festival/festival.wxml | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pages/giftpack/festival/festival.js b/pages/giftpack/festival/festival.js
index 0e8767b..98e0e51 100644
--- a/pages/giftpack/festival/festival.js
+++ b/pages/giftpack/festival/festival.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, //背景颜色
-
         })
       }
     })
diff --git a/pages/giftpack/festival/festival.wxml b/pages/giftpack/festival/festival.wxml
index a53246d..cd6ca6c 100644
--- a/pages/giftpack/festival/festival.wxml
+++ b/pages/giftpack/festival/festival.wxml
@@ -1,6 +1,6 @@
 <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">
--
libgit2 0.21.4