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 @@
- 兑换结束时间:{{filter.format_time(details.expdate,1)}}
+
+
+ 活动结束时间:{{filter.format_time(details.endtime,1)}}
+
+
+
+ 兑换结束时间:{{filter.format_time(details.expdate,1)}}
+
+
+
+
@@ -30,7 +40,7 @@
已售{{details.salenum}}件
- 活动结束日期 {{filter.format_time(details.endtime)}}
+