From 80b4ad922c13fdbd4d6afc66099062edb1860651 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 2 Aug 2021 17:20:22 +0800
Subject: [PATCH] 1.我的礼包的优化，

---
 components/qr_code/qr_code.wxss                 |  6 +++---
 packageA/pages/myGift/myGift.js                 | 14 ++++++++++++++
 packageA/pages/myGift/myGift.wxml               | 18 ++++++++++++++++--
 packageA/pages/myGift/myGift.wxss               | 26 +++++++++++++++++++++++++-
 packageA/pages/myGiftDetails/myGiftDetails.js   |  2 +-
 packageA/pages/myGiftDetails/myGiftDetails.wxml | 30 ++++++++++++++++++++++++++++--
 6 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss
index 72ba6ce..cb454b0 100644
--- a/components/qr_code/qr_code.wxss
+++ b/components/qr_code/qr_code.wxss
@@ -90,14 +90,14 @@ top: 5rpx;
 .qrcode{
  width:520rpx;
  height:520rpx;
- margin-top:-27rpx 
+ margin-top:-18rpx 
  
 
 }
 .r-code{
   font-size:28rpx;
-  padding-left: 25rpx;
-margin-top: -5.5rpx;
+  margin-top: -5.5rpx;
+  text-align: center;
 
 }
 
diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index 68eefe9..ae90c8c 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -315,5 +315,19 @@ Page({
 
 			})
 	},
+	
+	
+	show_remark:function(e){
+		var index=e.currentTarget.dataset.index;
+		var item=this.data.list.pageData[index];
+		this.setData({
+			show_rem_pop:1,
+			pop_remark_text:item.lbintro
+		})
+	},
+	
+	close_remark:function(){
+		this.setData({show_rem_pop:0,})
+	}
 
 })
\ No newline at end of file
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 3b6bebb..378203b 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -8,7 +8,10 @@
 			<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 ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
+					<view class="img-container rel">
+						<image src="{{imghost + (item.lburl ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/>					
+						<view catchtap="show_remark" data-index="{{index}}" class="lb_remark ellipsis-1" wx:if="{{item.lbintro}}">活动说明:{{item.lbintro}}</view>
+					</view>
 					<view class="desc-container">
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
@@ -53,9 +56,10 @@
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
 						<!-- 时间 -->
 						<view class="date pdb20">兑换截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
 					</view>
 					<!-- 说明 -->
-					<!-- <view class="c-red fs24">*请到线下门店兑换</view> -->
+					<view wx:if="{{item.lbtype==1}}" class="c-red fs24">注:请到线下门店兑换</view>
 				</view>
 			</view>
 		</block>
@@ -68,3 +72,13 @@
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <my_confirm id="my_confirm"></my_confirm>
+<view wx:if="{{show_rem_pop}}">
+	<view class="cover-layer" bindtap="close_remark"></view>
+	<view class="rem_pop;">
+		<view style="text-align: right;"bindtap="close_remark"><text class="iconfont icon-close" style="font-size: 40rpx;"></text></view>
+		<view style="padding: 0 16rpx;">
+			<view class="fs32">活动说明：</view>
+			<view class="fs30">{{pop_remark_text}}</view>
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss
index 04a155b..1e961aa 100644
--- a/packageA/pages/myGift/myGift.wxss
+++ b/packageA/pages/myGift/myGift.wxss
@@ -164,4 +164,28 @@ page {
 	color: #bbb;
 	text-align: center;
 	font-size: 22rpx;
-}
\ No newline at end of file
+}
+.lb_remark{
+	    position: absolute;
+	    bottom: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 50rpx;
+	    line-height: 50rpx;
+	    font-size: 30rpx;
+	    color: #333;
+	    padding-left: 10rpx;
+	    background-color: rgba(250,250,250,0.5);
+}
+
+.rem_pop{
+	    position: fixed;
+	    top: 30%;
+	    left: 6%;
+	    width: 88%;
+	    margin: 0 auto;
+	    height: 460rpx;
+	    background-color: #fff;
+	    z-index: 100; border-radius: 10rpx;
+		padding: 10rpx;
+}
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index c38faeb..162a9db 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -11,7 +11,7 @@ Page({
   data: {
 	  qr_code_object: {
 		  val: "12121",
-		  content: "请将二维码展示给核销员，服务更快捷！"
+		  content: "当前核销码仅限当面使用！"
 	  },
   },
 
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 036ea05..a318257 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -71,14 +71,40 @@
 	</view>
 
 	<view wx:if="{{details.lbtype==2}}" class="flex" style="flex-wrap: wrap;">
-		<block wx:for="{{list}}">
+		<block wx:for="{{list}}" wx:for-index="f_idx">		
+			<block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
 				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
 					 <view class="flex fs28 fir_view">
 						 <view>满{{item.condition}}使用</view>
 						 <view class="fs8" style="text-align: right">￥{{item.money}}</view>
 					 </view>
-					 <view style="font-size: 16rpx; text-align: center">活动结束日期{{filter.format_time(item.use_end_time,1)}}</view>
+					
+				
+					  <view style="font-size: 16rpx; text-align: center"> {{index==0?'活动结束日期':'截至时间'}}：
+					  
+					   <block wx:if="{{item.endtype<1}}">
+						  <block wx:if="{{item.use_end_time}}">
+							  {{filter.format_time(item.use_end_time,1)}}
+						  </block>
+						  <block wx:else>
+							  不限
+						  </block>
+					   </block>	  
+					   
+						<block wx:else>	
+							<block wx:if="{{item.days>0}}">
+								  有效期{{item.days}}天
+							</block>
+							<block wx:else>
+								不限
+							</block>
+						
+						</block>						  
+					  </view>
+					
+						 
 				</view>
+		    </block>
 		</block>
 	</view>
 
--
libgit2 0.21.4