Merge branch 'test' into 'qa'

Test See merge request !263

Merge branch 'test' into 'qa'
Test See merge request !263
后端研发-苏明海
2 parents 79d16656 d7f38adf
Showing 4 changed files with 36 additions and 29 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/giftpacklist.js
pages/user/coupons/coupons.js
@@ -168,14 +168,15 @@ Page({
   // 领取礼包
   get_libao: function(e) {
-    var help_id = e.currentTarget.dataset.help_id;
+    var help_id = e.currentTarget.dataset.help_id;//活动id
     var taskId = e.currentTarget.dataset.taskid;//任务id
-    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId);
+    var id = e.currentTarget.dataset.id;//用于跳到礼包详情一键全部领取用的任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId+"&id="+id);
   },
   //查看礼包id
-  select_libao: function() {
-    var orderSn = e.currentTarget.dataset.orderSn; //订单号
+  select_libao: function(e) {
+    var orderSn = e.currentTarget.dataset.ordersn; //订单号
     getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   }
@@ -51,7 +51,7 @@
               <!-- 已完成的颜色nostate -->
               <view class="flex-center width state" wx:if="{{item.status==1}}">
-                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view>
+                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}" data-id="{{item.id}}">领取礼包</view>
               </view>
               <view class="flex-center width state" wx:if="{{item.status==0}}">
                 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
@@ -22,7 +22,6 @@ Page({
     actTitle: '',
     getUrl: '',
     wareCard: [],
-    orderSn: "", //订单编号
     lbId: "",
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
@@ -31,31 +30,33 @@ Page({
     is_sub: 0, //判断是否重复提交
     is_libao: 0, //0轮播查看活动   1领取礼包 2.查看礼包详情
     held_id: "", //活动id
-    taskId: "", //任务id
+    taskId: "", //任务id用于查找礼包详情
     orderSn: "", //订单号
-    is_type:"",//类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
-    is_head:0,//数据是否加载完成
-    giftBagId:"",//礼包id
+    is_type: "", //类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
+    is_head: 0, //数据是否加载完成
+    giftBagId: "", //礼包id
+    id: "", //一键领取的时候使用
   },
   onLoad: function(options) {
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
-        held_id: options.help_id, 
-        taskId: options.taskId, 
-        is_type:0
+        held_id: options.help_id,
+        taskId: options.taskId,
+        is_type: 0
       })
       th.help();
     }
     if (options.is_libao == 1) {
       th.setData({
         held_id: options.help_id,
-        taskId: options.taskId, 
-        is_type: 1
+        taskId: options.taskId,
+        is_type: 1,
+        id: options.id
       })
       th.help();
     }
-    if (options.order_sn) {
+    if (options.orderSn) {
       th.setData({
         orderSn: options.orderSn,
         is_type: 2
@@ -84,16 +85,19 @@ Page({
         th.setData({
           giftImage: th.data.iurl + res.data.data.lbUrl,
           giftTitle: res.data.data.giftTitle,
-          is_head:1
+          is_head: 1
         })
         if (res.data.data.giftRemark == '') {
           th.setData({
             giftRemark: '暂无详情......'
           })
         } else {
-          th.setData({
-            giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
-          })
+          if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
+            th.setData({
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+            })
+          }
+
         }
         th.setData({
@@ -137,16 +141,18 @@ Page({
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            is_head:1
+            is_head: 1
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
               giftRemark: '暂无详情......'
             })
           } else {
-            th.setData({
-              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
-            })
+            if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
+              th.setData({
+                giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+              })
+            }
           }
           //---获取日期的时间戳---
@@ -202,7 +208,7 @@ Page({
         is_sub: 1
       })
       var json = {
-        "actId": th.data.taskId, //活动Id
+        "actId": th.data.id, //活动Id
         "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": 1, //礼包Id
         "storeId": a.stoid, //商家Id
@@ -247,7 +253,7 @@ Page({
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            is_head:1
+            is_head: 1
           })
           if (res.data.data.giftRemark == '') {
@@ -185,8 +185,8 @@ Page({
 					 for(var i in b_arr){
 						 b_arr[i].isby=1; 
 						 if(b_arr[i].isuse==0){		 
-							  if(b_arr[i].use_end_time<ut.gettimestamp()){
-								   b_can_arr.push(b_arr[i]);
+							  if(b_arr[i].use_end_time<=ut.gettimestamp()){
+								   b_out_arr.push(b_arr[i]);
 							  }else{
 								   b_can_arr.push(b_arr[i]);
 							  }
@@ -311,7 +311,7 @@ Page({
     var big_arr= this.data.details;
 	//可用券加入包邮券
 	if(big_arr.length==0 && this.data.b_out_arr){
-		big_arr=this.data.b_can_arr;	
+		big_arr=this.data.b_out_arr;	
 	}
 	init_num=this.data.b_out_arr.length;