From 2f054672027fe30ca00bb27598ba9e11bfea9b58 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 6 Dec 2021 17:46:10 +0800
Subject: [PATCH] 幸运购商品详情页修改

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   |  9 +++++++++
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 8a96fbd..1c70c57 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -6450,5 +6450,14 @@ Page({
 			return newTypeArr;
 		},
 		
+		
+		//弹出活动已经结束
+		timeUp() {
+			wx.showToast({
+				title: '本商品活动已经结束！',
+				icon: 'none',
+			});
+		},
+		
 
 });
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index cf82181..b45faa9 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -198,7 +198,7 @@
 							
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-             <view class="xc-share-frame t-c" bindtap="clickShare">
+             <view class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
                 <view class="iconfont icon-share"></view>
                 <!-- <view class="fs22 c-7b">分享</view> -->
               </view>
@@ -335,7 +335,7 @@
 					  <view class="xc-partner-frame">
 					    <view class="zzk-1 flex jc_sb">
 					      <view class="pdl10">已参团{{filters.show_default(luckGoInfo.num, '0')}}人，还差<text class="c-red">{{filters.show_default(luckGoInfo.group_num, '0')- filters.show_default(luckGoInfo.num, '0')}}</text>人成团</view>
-					      <view class="ckgd flex ai_c" bindtap="showReward">
+					      <view class="ckgd flex ai_c" bindtap="{{isTimeUp ? 'timeUp':'showReward'}}">
 					        查看奖励
 					        <view class="bg_right arrow-one"></view>
 					      </view>
@@ -392,7 +392,7 @@
 					      <!-- <view class="clear"></view> -->
 					    </view>
 							
-							<view class="fs24 pdh20 pdt20">*<text class="c-red">{{luckGoInfo.group_num}}</text>人成团，<text class="c-red">{{luckGoInfo.group_win}}</text>人得商品，<text class="c-red">{{luckGoInfo.group_num - luckGoInfo.group_win}}</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
+							<view class="fs24 pdh20 pdt20">*<text class="c-red">{{filters.show_default(luckGoInfo.group_num, '0')}}</text>人成团，<text class="c-red">{{filters.show_default(luckGoInfo.group_win, '0')}}</text>人得商品，<text class="c-red">{{filters.show_default(luckGoInfo.group_num - luckGoInfo.group_win, '0')}}</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
 					  </view>
 					</view>
 					
--
libgit2 0.21.4