From c39a4157a75d0e149e75cc75aa9f0562f0d918a1 Mon Sep 17 00:00:00 2001
From: antploy <antploy.ni@meidd.com>
Date: Tue, 3 Aug 2021 18:34:09 +0800
Subject: [PATCH] 礼包优化

---
 components/my_confirm/my_confirm.wxss           | 21 +++++++++------------
 packageA/pages/myGift/myGift.js                 |  2 +-
 packageA/pages/myGiftDetails/myGiftDetails.wxml | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index fba1ba7..55f8f7a 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -22,24 +22,21 @@
 }
 
 .shut{
-    /* display: block;
-    width: 40rpx;
-    height: 40rpx;
-    
-    line-height:35rpx;
+    display: block;
+    width: 45rpx;
+    height: 45rpx; 
+    line-height:36rpx;
     border-radius: 50%;
     -moz-border-radius: 50%;
-    -webkit-border-radius: 50%; */
+    -webkit-border-radius: 50%;
     font-size: 40rpx;
-    color: #9F9F9F;
+    color: #fff;
     text-align: center;
     position: fixed;
     z-index: 66666;
-   right: 105rpx;
-   /* background: #c8162c; */
-}
-.icon-close:before {
-  content: "\e62e";
+    right: 75rpx;
+    top: 465rpx;
+   background: #c8162c;
 }
 .xc-qr-frame{ 
 	width:560rpx;
diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index ae90c8c..d94dd7d 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -144,7 +144,7 @@ Page({
 			isShowLoading: true,
 		})
 		.then(function(res) {
-		
+			console.log(res);
 			if(res.data.code == 0) {
 		
 				self.setData({
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 63f3da0..1e93278 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -3,7 +3,17 @@
 	<!-- 图片 -->
 	<view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
 
-	<view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
+	 <!-- 未买 -->    
+    <block wx:if="{{index==0}}">
+	  <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
+	 </block>
+	 <!-- 已买 -->
+     <block wx:else>
+       <view wx:if="{{details.lbtype==1}}"class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
+	 </block>
+
+	
+
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
@@ -30,7 +40,7 @@
 			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
 		</view>
 		<!-- 时间 -->
-		<view class="date" wx:if="{{details.lbtype==1}}">活动结束日期 {{filter.format_time(details.endtime)}}</view>
+		<!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> -->
 	</view>
 
 
--
libgit2 0.21.4