diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index 73d22d0..5ac2c25 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -24,7 +24,7 @@
 	<!--<block wx:for="{{wareCard}}" wx:if="{{now > filter.gettimestamp(items.starTime)  || (items.is_show && now > items.show_time)}}" wx:for-item="items" wx:for-index="index" wx:key="index">-->
 	<block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index">
 		<view class="content_box">
-			<view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
+			<view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&cover_img={{items.cover_img}}&orderSn=''">
 				<view class="content_box_img">
 					<image src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}" data-errorimg="wareCard[{{index}}].cover_img"></image>
 					<image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else data-errorimg="wareCard[{{index}}].lbUrl"></image>
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 4254171..162bacf 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -71,6 +71,7 @@ Page({
 
         sto_sele_name_1: '',
         share_goods_img:'',  //礼包的分享图
+        giftImageCover:null,
         canvasHidden:true,
 
         screenWidth: 0
@@ -251,8 +252,11 @@ Page({
             },
             success: function (res) {
                 if (res.data.code == 0) {
+                  console.log('商品------++')
+                  console.log(res)
                     th.setData({
-                        giftImage: th.data.iurl + res.data.data.lbUrl,
+                        giftImage: th.data.iurl +  res.data.data.lbUrl,
+                        giftImageCover: th.data.iurl + (th.data.params.cover_img ? th.data.params.cover_img: res.data.data.lbUrl),
                         giftTitle: res.data.data.giftTitle,
                         default_color: res.data.data.bgcolor
                     })
@@ -346,7 +350,8 @@ Page({
             success: function success(res) {
                 if (res.data.code == 0) {
                     _this2.setData({
-                        giftImage: th.iurl + res.data.data.lbUrl,
+                        giftImage: th.iurl +  res.data.data.lbUrl,
+                        giftImageCover: th.iurl + (_this2.data.params.cover_img ? _this2.data.params.cover_img: res.data.data.lbUrl),
                         giftTitle: res.data.data.giftTitle,
                         default_color: res.data.data.bgcolor
                     })
@@ -419,6 +424,7 @@ Page({
                 if (res.data.code == 0) {
                     th.setData({
                         giftImage: th.data.iurl + res.data.data.lbUrl,
+                        giftImageCover: th.data.iurl + (th.data.params.cover_img ? th.data.params.cover_img: res.data.data.lbUrl),
                         giftTitle: res.data.data.lbTitle,
                         default_color: res.data.data.bgcolor
                     })
@@ -964,6 +970,7 @@ Page({
                 th.get_goods_temp(function () {
                     var vpath = res.path;
                     var context = wx.createCanvasContext('share');
+                    // let share_goods_img = th.params.cover_img
                     th.drawPoster(context, unit, th.data.share_goods_img, vpath, 0);
 
                     //把画板内容绘制成图片，并回调 画板图片路径
@@ -1116,7 +1123,7 @@ Page({
             tt();
             return false;
         }
-        var img_url = ee.data.giftImage;
+        var img_url = ee.data.giftImageCover ? ee.data.giftImageCover : ee.data.giftImage;
         //获取商品是分享图信息
         wx.getImageInfo({
             src: img_url,
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index 06133a5..ebd43f0 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -23,7 +23,7 @@
   </view>
   <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
     <view class="content_box">
-      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
+      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
           <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
@@ -93,7 +93,7 @@
 
         </view>
       </view>
-      <view class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
+      <view class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.orderSn}}">
         <button>立即使用</button>
       </view>
     </view>
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 9f7e9a2..699a573 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -21,14 +21,16 @@ Page({
 		userId: 0, //任务用户的ID
 		s_num: 0, //分享的人数
 		taskId:0, //活动从表ID
-		helpId:0,
+    helpId:0,
+    invalidTime:0, //任务失效时间戳
 	},
 
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function(options) {
-
+    console.log('助力——————————————————————————————');
+    console.log(options);
 		var th = this;
 
 		var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -38,7 +40,7 @@ Page({
 		if (options.userId) this.data.userId = options.userId;
 		//任务是不是为空
 		if (this.data.tasking == 0 || this.data.tasking == undefined) {
-            this.data.tasking = decodeURIComponent(options.scene);
+      this.data.tasking = decodeURIComponent(options.scene);
 		}
 
 	},
@@ -73,10 +75,19 @@ Page({
 					storeId: os.stoid
 				}
 			}).then(res => {
+        console.log('任务时间-------------------------');
+        console.log(res);
 				if (res.data.code == 0) {
+
 					th.data.userId = res.data.data.userId;
 					th.data.taskId = res.data.data.helpTaskId;
-					th.data.helpId=res.data.data.helpFormId;
+          th.data.helpId=res.data.data.helpFormId;
+          // th.invalidTime = res.data.data.invalidTime
+          // th.setData({
+          //   invalidTime:1662138310
+          // })
+          let openTime = res.data.data.openTime
+          th.getInvalidTime(openTime)
 					//获取活动的时间
 					return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
 						data: {
@@ -110,9 +121,45 @@ Page({
 			})
 
 		}
-	},
+  },
+  getInvalidTime(openTime=0){
+    let th = this
+    rq.get("/api/weshop/marketing/giftbag/helpinfo/get", {
+      data: {
+        storeId: os.stoid,
+        // userId: user_id,
+        taskId: th.data.taskId,
+        helpId:th.data.helpId
+      },
+      success: function (res) {
+        console.log('获取失效时间------');
+        console.log(res);
+        if (res.data.code == 0) {
+          let validTime=res.data.data.validTime
+          let invalidTime =0
+          if (openTime && validTime > 0) {
+            invalidTime = openTime*1 + validTime*60*60
+          }
+          th.setData({
+            invalidTime
+          });
+        }
+      }
+    })
+  },
 	//点击开启礼盒
 	cklie_button: function() {
+    //判断任务是否失效
+    let invalidTime = this.data.invalidTime
+    let nowTime = parseInt((new Date().getTime())/1000)  
+    if (invalidTime > 0) {
+      let disTime = invalidTime - nowTime
+      if (disTime <=0) {
+        getApp().showWarning("该任务已失效");
+        return
+      }
+    }
+    
 		var th = this;
 		//--先判断会员状态--
 		var user_info = getApp().globalData.userInfo;
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index e7ec355..ea05751 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -7,6 +7,7 @@ var e = getApp(),
   s = e.globalData.setting,
   os = s,
   app_d = e.globalData;
+  var invalidSetTime = null
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
   /**
@@ -65,7 +66,15 @@ Page({
     zltime: "", //助力时间
     djs: "", //定时器的显示
     //*********************************************end
-		
+    //距离失效------
+    invalidTime:0,
+    invalidState:true,
+    invalidObj:{
+      h:'00',
+      m:'00',
+      s:'00'
+    },
+    //--------------
 		// Hei: 0, 
 		max_sw_height: 0,
 		
@@ -76,7 +85,7 @@ Page({
 		font_color:'',
   },
 
-  /**
+  /** 
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
@@ -443,6 +452,12 @@ Page({
   },
   //判断是否有领取任务 获取正在进行中的任务
   get_user_task: function () {
+    invalidSetTime ? clearTimeout(invalidSetTime) :''
+    this.setData({
+      invalidObj:{ h:'00', m:'00',s:'00'},
+      invalidState:true,
+      invalidTime:0
+    })
     var user_id = getApp().globalData.user_id;
     var th = this;
     var aitem = th.data.aitem;
@@ -452,18 +467,83 @@ Page({
       data: {
         storeId: os.stoid,
         userId: user_id,
-        taskId: taskid
+        taskId: taskid 
       },
       success: function (res) {
+        console.log('任务---------------------------------------');
+        console.log(res);
         if (res.data.code == 0) {
           var is_usertask = res.data.data;
           th.setData({
-            is_user_task: is_usertask
+            is_user_task: is_usertask,
           });
+          th.getInvalidTime(taskid) 
         }
       }
     })
   },
+  //获取失效时间
+  getInvalidTime(taskid){
+    let th = this
+    rq.get("/api/weshop/marketing/giftbag/helpinfo/get", {
+      data: {
+        storeId: os.stoid,
+        // userId: user_id,
+        taskId: taskid,
+        helpId:th.data.help_id
+      },
+      success: function (res) {
+        console.log('获取失效时间------');
+        console.log(res);
+        if (res.data.code == 0) {
+          let openTime =th.data.is_user_task ? th.data.is_user_task.openTime : 0
+          let validTime=res.data.data.validTime
+          let invalidTime =0
+          if (openTime && validTime > 0) {
+            invalidTime = openTime*1 + validTime*60*60
+          }
+          th.setData({
+            invalidTime
+          });
+          
+          th.invalid_count_down()  //失效倒计时
+        }
+      }
+    })
+  },
+  // 距离失效倒计时
+  invalid_count_down(){
+
+    let invalidTime = this.data.invalidTime
+    let nowTime = parseInt((new Date().getTime())/1000)   
+    if (invalidTime) {
+      let disTime = invalidTime - nowTime
+      if (disTime>0) {
+        let h = parseInt(disTime/(60*60))
+        h = h*1 < 10 ? '0'+ h : h
+        let m= parseInt((disTime/60)%60)
+        m = m*1 < 10 ? '0' + m : m
+        let s = disTime % 60
+        s = s*1 < 10 ? '0'+s : s
+        this.setData({
+          'invalidObj.h':h,
+          'invalidObj.m':m,
+          'invalidObj.s':s,
+        })
+        invalidSetTime=setTimeout(this.invalid_count_down,1000)
+      }else{
+        this.setData({
+          invalidObj:{ h:'00', m:'00',s:'00'},
+          invalidState:false
+        })
+      }
+    }else{
+      this.setData({
+        invalidObj:{h:'00', m:'00',s:'00'}
+      })
+    }
+  },
+
   //获取助力活动参与的人数
   get_user_task_num: function () {
     var th = this;
@@ -686,11 +766,13 @@ Page({
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/user/assistance/friend_assistance";
-    //读取文件成功则OK--
+      console.log('二维码路径');
+      console.log(path3);
+      //读取文件成功则OK--
     wx.getImageInfo({
       src: path3,
       success: function (res) {
-
+        
         var ewm_path = res.path; //
         //var act_time="2019.06.26 - 2019.07.02";  //活动的时间
         var bg_time = ut.formar_no_full(th.data.dynamic.beginDate,'.');
@@ -939,6 +1021,10 @@ Page({
 
   //好友猜一猜
   save_share: function (e) {
+    if (!this.data.invalidState) {
+      getApp().showWarning("该任务已失效");
+      return
+    }
     var th = this;
     var aitem = this.data.aitem; //任务的数据集
     var sw_index = this.data.sw_index; //轮播的下标
@@ -987,7 +1073,7 @@ Page({
     var block = th.data.block;
     if (images) {
       th.data.head_pic_arr.length = 0;
-      for (var i in images) {s
+      for (var i in images) {
         var img_path = images[i].headPic;
         img_path=img_path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
         img_path=img_path.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index f2a12b8..e344e70 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -60,10 +60,11 @@
 	    好友拆一拆
 	  </view>
     <!-- 任务超时失效 -->
-    <!-- <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}">
-      <text>距离失效</text>
-      <view><text>15</text>:<text>45</text>:<text>10</text></view>
-    </view> -->
+    <view class="invalid" wx:if="{{ is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}">
+      <text>距离失效:</text>
+      <view class="invalid_info" wx:if="{{invalidState}}"><text>{{invalidObj.h}}</text>:<text>{{invalidObj.m}}</text>:<text>{{invalidObj.s}}</text></view>
+      <view class="invalid_info" wx:else>该任务已失效</view>
+    </view>
 
 	  <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index 2fb2965..287d9eb 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -256,3 +256,25 @@ line-height: 48rpx;
 image{
 	-webkit-touch-callout:none
 }
+.invalid{
+  width: 100%;
+  height: 80rpx;
+  margin: 20rpx 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+
+}
+.invalid_info{
+  width: 180rpx;
+  padding: 10rpx;
+  color: #000;
+  background-color: #fff;
+  margin-left: 20rpx;
+  border: 1rpx solid #fff;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
\ No newline at end of file