助力的跳转问题已经修复

后端研发-倪永富
1 parent 09f0f7ac
Showing 4 changed files with 50 additions and 12 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/task_assistance.js
pages/user/assistance/task_assistance.wxml
@@ -182,6 +182,13 @@ Page({
   select_libao: function(e) {
     var orderSn = e.currentTarget.dataset.ordersn; //订单号
     getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
+  },
+
+  //---查看任务---
+  go_to_task:function (e) {
+    var help_id = this.data.help_id;
+    var taskid=e.currentTarget.dataset.taskid;
+    getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
   }
  
 })
@@ -53,7 +53,7 @@
               <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}}" data-id="{{item.id}}">领取礼包</view>
               </view>
-              <view class="flex-center width state" wx:if="{{item.status==0}}">
+              <view class="flex-center width state" wx:if="{{item.status==0}}" data-taskId="{{item.helpTaskId}}" bindtap="go_to_task">
                 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
               </view>
               <view class="flex-center width state" wx:if="{{item.status==2}}">
@@ -107,4 +107,4 @@
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b id="nav_b"></nav_b>
@@ -82,6 +82,10 @@ Page({
         gid: options.gid
       })
     }
+    if (options.taskid != undefined) {
+       th.setData({taskid:options.taskid})
+    }
+
     th.close();
     th.syinfo();
     th.imageinfo();
@@ -181,7 +185,6 @@ Page({
           var nt = ut.gettimestamp();
  
           data_aissa.forEach(function (val, ind) {
-
             //已开始
             if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0;
             //未开始
@@ -191,14 +194,21 @@ Page({
           });
           var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
           var taskid = data_aissa[0].id;
-          th.setData({
-            aitem: data_aissa,
-            task_number: task_number,
-            taskid: taskid
-          });
-          //判断是不是领取的任务
-          th.get_user_task();
-
+          if(th.data.taskid) {
+            th.setData({
+              aitem: data_aissa,
+              task_number: task_number,
+            });
+            th.go_to_task(th.data.taskid);
+          }else{
+            th.setData({
+              aitem: data_aissa,
+              task_number: task_number,
+              taskid: taskid
+            });
+            //判断是不是领取的任务
+            th.get_user_task();
+          }
         }
  
       }
@@ -1002,6 +1012,27 @@ Page({
         this.user_task_list();
   },
  
+  go_task:function(e){
+    var taskid=e.currentTarget.dataset.taskid;
+    this.go_to_task(taskid);
+
+  },
+
+  go_to_task(task_id){
+    var index = 0;
+    var aitem = this.data.aitem;
+    for(var i=0;i<aitem.length;i++){
+      if(aitem[i].id==task_id){
+        index=i;break;
+      }
+    }
+    this.setData({
+      sw_index: index,
+      taskid: task_id,
+      is_dismantle: 0,
+      bc_page: 1,
+    })
+  },
  
   //--测试用--
   test:function(){
@@ -88,7 +88,7 @@
         </view>
         <view class="flex-center width state">
           <view class="ellipsis-1">
-            <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+            <text wx:if="{{item.status==0}}" bindtap="go_task"  data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
             <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
             <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text>
           </view>