From 542161d3d379e75409b9d22c7b122576644b07d7 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 20 May 2021 14:26:09 +0800
Subject: [PATCH] 礼包和礼包详情修改

---
 packageA/pages/myGift/myGift.js                 | 1 +
 packageA/pages/myGift/myGift.wxml               | 4 ++--
 packageA/pages/myGift/myGift.wxss               | 7 +++++++
 packageA/pages/myGiftDetails/myGiftDetails.js   | 4 ++--
 packageA/pages/myGiftDetails/myGiftDetails.wxml | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index fb8c06e..82a1c50 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -202,4 +202,5 @@ Page({
 		}
 		app.goto(url);
 	},
+	
 })
\ No newline at end of file
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index f0e37c7..bde6334 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -8,7 +8,7 @@
 			<view class="tab-item" wx:for="{{list.pageData}}">
 				<view bindtap="goto" data-url="{{'/packageA/pages/myGiftDetails/myGiftDetails?index=0&id=' + item.id}}">
 					<!-- 图片 -->
-					<view class="img-container"><image src="{{imghost + item.lburl}}" class="img" mode="widthFix"/></view>
+					<view class="img-container"><image src="{{imghost + (item.lburl ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
 					<view class="desc-container">
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
@@ -34,7 +34,7 @@
 		
 		<block wx:else>
 			<view class="tab-item flex pd20" wx:for="{{list.pageData}}" bindtap="goto" data-url="{{'/packageA/pages/myGiftDetails/myGiftDetails?index=1&id=' + item.lbvipid}}">
-				<view class="img-container2"><image src="{{imghost + item.lburl}}" class="img" mode="widthFix"/></view>
+				<view class="img-container2"><image src="{{imghost + (item.lburl ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix" data-index="{{index}}"/></view>
 				<view class="flex fdc jc_sb">
 					<view>
 						<!-- 标题 -->
diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss
index a263faf..9969433 100644
--- a/packageA/pages/myGift/myGift.wxss
+++ b/packageA/pages/myGift/myGift.wxss
@@ -105,6 +105,13 @@ page {
 	flex-shrink: 0;
 	display: flex;
 	align-items: center;
+	position: relative;
+}
+
+.img-container2.error::before {
+	font-family: iconfont;
+	position: absolute;
+	content: '\e8c1';
 }
 
 .img {
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 3cf4a1d..344ea64 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -89,7 +89,7 @@ Page({
 						},
 						isShowLoading: true,
 					}).then(function(res) {
-						console.log('res3-->', res);
+						// console.log('res3-->', res);
 						self.setData({
 							details: res.data.data.pageData[0],
 						});
@@ -102,7 +102,7 @@ Page({
 						},
 						isShowLoading: true,
 					}).then(function(res) {
-						console.log('res4-->', res);
+						// console.log('res4-->', res);
 						self.setData({
 							list: res.data.data.pageData,
 						});
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index e4b192b..fb7d720 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -1,7 +1,7 @@
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="pdb80">
 	<!-- 图片 -->
-	<view><image src="{{imghost + details.lburl}}" class="img" mode="widthFix"/></view>
+	<view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
--
libgit2 0.21.4