From f400919d731aa047ec057668e36d5378b6ac7eb8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 23 Feb 2021 10:01:12 +0800
Subject: [PATCH] 礼包使用封面图标，如果没有上传封面图就使用礼包图片

---
 pages/giftpack/buygiftpack/giftpackbuy.js   | 2 +-
 pages/giftpack/buygiftpack/giftpackbuy.wxml | 5 ++++-
 pages/giftpack/mygiftpack/mygiftpack.js     | 2 +-
 pages/giftpack/mygiftpack/mygiftpack.wxml   | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index ef114b1..062f03f 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -249,7 +249,7 @@ Page({
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = "/public/images/empty.jpg";
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
   goto: function(e) {
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index ed1d5c4..6b36821 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -24,7 +24,10 @@
     <view class="content_box">
       <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
         <view class="content_box_img">
-          <image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}"
+		     data-errorimg="wareCard[{{index}}].cover_img"></image>
+		  <image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else
+		     data-errorimg="wareCard[{{index}}].lbUrl"></image>
         </view>
         <view class="content_box_title">
           <view class="content_ware_title">
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index 2bd7c82..5e38b80 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -129,7 +129,7 @@ Page({
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = "/public/images/empty.jpg";
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
 
   },
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index 1fdc67e..5d9fc3e 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -26,7 +26,9 @@
       <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
-          <image src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
+          <image wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+		  
           <block wx:if="{{item.actType!=0}}">
             <view class="{{[item.actType==1?'content_box_img_title content_box_img_ground1':item.actType==2?'content_box_img_title content_box_img_ground2':item.actType==4?'content_box_img_title content_box_img_ground3':'content_box_img_title content_box_img_ground4']}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift01.png'}}" lazy-load="true"></image>
--
libgit2 0.21.4