diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index f7bf1af..fba1ba7 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -1,4 +1,4 @@
-
+@import '../../app.wxss';
 /* 弹窗样式 */
 .xc-pop-up{
  	   width: 100%;
@@ -22,21 +22,24 @@
 }
 
 .shut{
-    display: block;
-    width: 54rpx;
-    height: 54rpx;
-    font-size: 50rpx;
-    line-height:47rpx;
+    /* display: block;
+    width: 40rpx;
+    height: 40rpx;
+    
+    line-height:35rpx;
     border-radius: 50%;
     -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
-    color: #fff;
+    -webkit-border-radius: 50%; */
+    font-size: 40rpx;
+    color: #9F9F9F;
     text-align: center;
     position: fixed;
-    margin-top: -25rpx;
     z-index: 66666;
-   right: 65rpx;
-   background: #c8162c;
+   right: 105rpx;
+   /* background: #c8162c; */
+}
+.icon-close:before {
+  content: "\e62e";
 }
 .xc-qr-frame{ 
 	width:560rpx;
@@ -50,7 +53,7 @@
   margin-left: -280rpx; border-radius:10rpx 
 }
 
-.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
+.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
 
 .fs36{ font-size: 36rpx; }
 .fs30{ font-size: 30rpx; }
diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml
index 216c4fa..5219afc 100644
--- a/components/qr_code/qr_code.wxml
+++ b/components/qr_code/qr_code.wxml
@@ -24,7 +24,7 @@
      </view>
   
   </view>
-  <view class="shut" bindtap="close">ⅹ</view>
+  <view class="shut" bindtap="close"><text class="iconfont icon-close"></text></view>
 </view>
 <!-- </scroll-view> -->
 </view>
\ No newline at end of file
diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss
index cb454b0..d953bbd 100644
--- a/components/qr_code/qr_code.wxss
+++ b/components/qr_code/qr_code.wxss
@@ -1,3 +1,5 @@
+@import '../../app.wxss';
+
 .xc-pop-up{
 	width: 100%;
 	height: 100%;
@@ -102,17 +104,17 @@ top: 5rpx;
 }
 
 .shut{
-    display: block;
+    /* display: block;
     width: 54rpx;
     height: 54rpx;
     border: 2rpx solid #fff;
     font-size: 50rpx;
-    z-index:55;
-    line-height:47rpx;
+    line-height:54rpx;
     margin-top: 45rpx;
     border-radius: 50%;
     -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
+    -webkit-border-radius: 50%; */
+    z-index:55;
     color: #fff;
     text-align: center;
     position: fixed;
@@ -120,6 +122,10 @@ top: 5rpx;
     left:50%;
     transform: translateX(-50%);
 }
+.icon-close:before {
+  content: "\e62e";
+  font-size: 50rpx;
+}
 
 .mt{ margin-top:130rpx}
 .mts{ margin-top:70rpx}
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 378203b..a41b0ec 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -36,7 +36,7 @@
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
 						<!-- 时间 -->
-						<view class="date">活动截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
 						<!-- 按钮 -->
 					</view>
 				</view>
@@ -55,7 +55,7 @@
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
 						<!-- 时间 -->
-						<view class="date pdb20">兑换截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view class="date pdb20">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
 						<view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
 					</view>
 					<!-- 说明 -->
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index a318257..63f3da0 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -3,7 +3,7 @@
 	<!-- 图片 -->
 	<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.endtime,1)}}</view>
+	<view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
@@ -30,7 +30,7 @@
 			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
 		</view>
 		<!-- 时间 -->
-		<view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view>
+		<view class="date" wx:if="{{details.lbtype==1}}">活动结束日期 {{filter.format_time(details.endtime)}}</view>
 	</view>