From 152a7f833168434907a723a98c61df3c7b2fd8a2 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 15 Jan 2020 10:46:05 +0800
Subject: [PATCH] 助力查询及助力选中

---
 pages/user/assistance/assistance.js        |  3 ++-
 pages/user/assistance/assistance.wxml      |  5 +++--
 pages/user/assistance/task_assistance.js   | 29 +++++++++++++++++------------
 pages/user/assistance/task_assistance.wxml |  7 +++++--
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index 52cefee..2b67166 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -162,6 +162,7 @@ Page({
   //查看礼包id
   select_libao:function(){
     var libao_id = e.currentTarget.dataset.libaoid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" +0 );    
+    var ordersn = e.currentTarget.dataset.orderid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0 + "&ordersn=" + ordersn );    
   }
 })
\ No newline at end of file
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index aa5bc2e..c6171b7 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -1,4 +1,5 @@
 <wxs module="filter" src="c_filter.wxs"></wxs>
+<wxs module="filter_s" src="../../../utils/filter.wxs"></wxs>
 <view class="page" bindtap="close">
   <!-- 背景图片 -->
   <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
@@ -15,7 +16,7 @@
       </view>
       <view class="flex-center fs26 time">
         <view>活动时间：</view>
-        <view>{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
+        <view>{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}
         </view>
       </view>
       <view class="flex-center" bindtap="go_task">
@@ -57,7 +58,7 @@
 			  <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
 			</view>
 			<view class="flex-center width state" wx:if="{{item.status==2}}">
-			  <view class="ellipsis-1" bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
+			  <view class="ellipsis-1" bindtap="select_libao" data-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
 			</view>
 			
 			
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 59b3fec..5a6469c 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -254,9 +254,9 @@ Page({
   // 领取礼包
   get_libao: function (e) {
     var libao_id = e.currentTarget.dataset.libaoid;
-    var completeid = e.currentTarget.dataset.completeid;
+  //  var completeid = e.currentTarget.dataset.completeid;
     console.log("礼包id", libao_id);
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao="+1 );
   },
   //查看礼包id
   select_libao: function () {
@@ -377,9 +377,7 @@ Page({
           th.setData({
             usercount: usercount
           });
-        } else {
-
-        }
+        } 
       }
     })
 
@@ -424,8 +422,7 @@ Page({
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
     var task_id = aitem[index].id;
-    console.log("轮播图点击左边", "任务id", task_id, "任务总的data", aitem,
-      "任务总库存", task_number);
+    console.log("轮播图点击左边");
     this.setData({
       sw_index: index,
       task_number: task_number,
@@ -447,8 +444,7 @@ Page({
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
     var task_id = aitem[index].id;
-    console.log("轮播图点击右边", "任务id", task_id, "任务总的data",aitem,
-      "任务总库存", task_number);
+    console.log("轮播图点击右边");
     this.setData({
       sw_index: index,
       task_number: task_number,
@@ -1030,10 +1026,10 @@ Page({
   },
 //好友猜一猜
   save_share: function (e) {
-    var aitem = this.data.aitem; //任务的数据集
-    var sw_index = this.data.sw_index; //轮播的下标
+   // var aitem = this.data.aitem; //任务的数据集
+   // var sw_index = this.data.sw_index; //轮播的下标
     //任务id
-    var taskid = aitem[sw_index].id;
+    var taskid = e.currentTarget.dataset.taskid;
     console.log("好友猜一猜的任务id", taskid);
     var th = this;
 
@@ -1144,5 +1140,14 @@ Page({
       dynamic: images
     })
   },
+  test:function(e){
+   var task_id=e.currentTarget.dataset.taskid;
+    console.log("正在进行中任务的id",task_id);
+  },
+  //礼包的详情 轮播图
+  libao_details:function(e){
+    var giftbagid=e.currentTarget.dataset.giftbagid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0);
+  }
 
 })
\ No newline at end of file
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 44bc564..edd8f18 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -17,7 +17,7 @@
     </view>
     <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
       <swiper-item wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
-        <image class="xc-center-img " src="{{iurl+aitem.giftBagUrl}}"></image>
+        <image class="xc-center-img"bindtap="libao_details"  data-giftbagid="{{aitem.giftbagid}}" src="{{iurl+aitem.giftBagUrl}}"></image>
       </swiper-item>
     </swiper>
 
@@ -41,9 +41,12 @@
   <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="add_onlicke">
     就选它了
   </view>
-   <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="save_share">
+   <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="save_share">
   好友拆一拆
   </view>
+   <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="test">
+    测试专用
+  </view>
 
 </view>
 <!-- 底部列表 -->
--
libgit2 0.21.4