Commit df10aa0ba61e4e0f23b03005f110bdf728886f6b

Authored by 后端开发-许程
1 parent 3d4ebe6d

助力模块

pages/user/assistance/assistance.js
@@ -43,12 +43,7 @@ Page({ @@ -43,12 +43,7 @@ Page({
43 * 生命周期函数--监听页面显示 43 * 生命周期函数--监听页面显示
44 */ 44 */
45 onShow: function() { 45 onShow: function() {
46 - var th=this;  
47 - this.data.timer= setInterval(function () {  
48 - th.get_list();  
49 -  
50 - },2000)  
51 - 46 +
52 }, 47 },
53 // 助力活动 48 // 助力活动
54 assistance() { 49 assistance() {
@@ -63,10 +58,14 @@ Page({ @@ -63,10 +58,14 @@ Page({
63 } 58 }
64 }).then(res => { 59 }).then(res => {
65 if (res.data.code == 0) { 60 if (res.data.code == 0) {
66 -  
67 var help_data=res.data.data; 61 var help_data=res.data.data;
68 - console.log(help_data.id,'数据', res.data.data);  
69 th.setData({ zl_act:help_data, help_id:help_data.id }); 62 th.setData({ zl_act:help_data, help_id:help_data.id });
  63 + console.log(th.data.help_id, '数据', res.data);
  64 + if (th.data.help_id != "" && th.data.help_id!=null) {
  65 + //我的任务
  66 + th.get_list();
  67 + }
  68 +
70 return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", { 69 return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
71 data: { 70 data: {
72 helpId: help_data.id, storeId: store_id 71 helpId: help_data.id, storeId: store_id
@@ -85,6 +84,7 @@ Page({ @@ -85,6 +84,7 @@ Page({
85 84
86 //--点击获取用户任务列表--会员的任务列表 85 //--点击获取用户任务列表--会员的任务列表
87 get_list:function() { 86 get_list:function() {
  87 + console.log("有走这里吗会员任务11111");
88 var th = this; 88 var th = this;
89 var help_id=this.data.help_id; 89 var help_id=this.data.help_id;
90 t.request.get("/api/weshop/marketing/help/help/user/page", { 90 t.request.get("/api/weshop/marketing/help/help/user/page", {
@@ -95,16 +95,20 @@ Page({ @@ -95,16 +95,20 @@ Page({
95 }, 95 },
96 success: function(res) { 96 success: function(res) {
97 clearTimeout(th.data.timer); 97 clearTimeout(th.data.timer);
98 -  
99 - if (!th.data.is_load) th.setData({  
100 - is_load: 1  
101 - }) 98 + console.log("有走这里吗会员任务6666666");
  99 + // if (!th.data.is_load)
  100 + // th.setData({
  101 + // is_load: 1
  102 + // })
102 if (res.data.code == 0) { 103 if (res.data.code == 0) {
103 - 104 +
104 var list = th.data.zl_user_list; 105 var list = th.data.zl_user_list;
105 - list = list.concat(res.data.data.pageData) //连接数组 106 + //连接数组
  107 + list = list.concat(res.data.data.pageData);
  108 + console.log("我的任务数据",list);
106 th.setData({ 109 th.setData({
107 - zl_user_list: list 110 + zl_user_list: list,
  111 + is_load: 1,
108 }); 112 });
109 var n_all_num = th.data.cur_page * th.data.page_num; 113 var n_all_num = th.data.cur_page * th.data.page_num;
110 if (res.data.data.total > n_all_num) th.setData({ 114 if (res.data.data.total > n_all_num) th.setData({
@@ -127,8 +131,8 @@ Page({ @@ -127,8 +131,8 @@ Page({
127 131
128 //-----跳转到领取礼包的页面------ 132 //-----跳转到领取礼包的页面------
129 go_task: function() { 133 go_task: function() {
  134 + console.log("跳转领取任务列表2222");
130 var help_id=this.data.help_id; 135 var help_id=this.data.help_id;
131 -  
132 getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id); 136 getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
133 }, 137 },
134 switch_head: function (e) { 138 switch_head: function (e) {
@@ -148,5 +152,16 @@ Page({ @@ -148,5 +152,16 @@ Page({
148 var nav_b = th.selectComponent("#nav_b"); //组件的id 152 var nav_b = th.selectComponent("#nav_b"); //组件的id
149 nav_b.close_box(); 153 nav_b.close_box();
150 }, 154 },
151 - 155 + // 领取礼包
  156 + get_libao:function(e){
  157 + var libao_id=e.currentTarget.dataset.libaoid;
  158 + var completeid= e.currentTarget.dataset.completeid;
  159 + console.log("礼包id", libao_id);
  160 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);
  161 + },
  162 + //查看礼包id
  163 + select_libao:function(){
  164 + var libao_id = e.currentTarget.dataset.libaoid;
  165 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" +0 );
  166 + }
152 }) 167 })
153 \ No newline at end of file 168 \ No newline at end of file
pages/user/assistance/assistance.wxml
@@ -45,18 +45,19 @@ @@ -45,18 +45,19 @@
45 <view class="items"> 45 <view class="items">
46 <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}"> 46 <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
47 <view class="flex-center width"> 47 <view class="flex-center width">
48 - <view class="ellipsis-1">{{item.help_taskname}}</view> 48 + <view class="ellipsis-1">{{item.helpTaskName}}</view>
49 </view> 49 </view>
50 50
51 <!-- 已完成的颜色nostate --> 51 <!-- 已完成的颜色nostate -->
52 - <view class="flex-center width state" wx:if="{{item.is_acting==0}}">  
53 - <view class="ellipsis-1">领取礼包</view> 52 + <view class="flex-center width state" wx:if="{{item.status==1}}">
  53 + <view class="ellipsis-1"bindtap="get_libao"data-libaoid="{{item.helpListGiftBagId}}"
  54 + data-completeid="{{item.id}}" >领取礼包</view>
54 </view> 55 </view>
55 - <view class="flex-center width state" wx:if="{{item.is_acting==1}}">  
56 - <view class="ellipsis-1">{{item.helped}}/{{item.help_num}}</view> 56 + <view class="flex-center width state" wx:if="{{item.status==0}}">
  57 + <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
57 </view> 58 </view>
58 - <view class="flex-center width state" wx:if="{{item.is_acting==2}}">  
59 - <view class="ellipsis-1">查看礼包</view> 59 + <view class="flex-center width state" wx:if="{{item.status==2}}">
  60 + <view class="ellipsis-1" bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
60 </view> 61 </view>
61 62
62 63
pages/user/assistance/task_assistance.js
@@ -4,12 +4,12 @@ var e = getApp(), @@ -4,12 +4,12 @@ var e = getApp(),
4 app = e, 4 app = e,
5 i = require("../../../utils/util.js"), 5 i = require("../../../utils/util.js"),
6 ut = i, 6 ut = i,
7 - s = e.globalData.setting, 7 + s = e.globalData.setting,
8 os = s, 8 os = s,
9 app_d = e.globalData; 9 app_d = e.globalData;
10 var regeneratorRuntime = require('../../../utils/runtime.js'); 10 var regeneratorRuntime = require('../../../utils/runtime.js');
11 Page({ 11 Page({
12 - 12 +
13 /** 13 /**
14 * 页面的初始数据 14 * 页面的初始数据
15 */ 15 */
@@ -33,7 +33,8 @@ Page({ @@ -33,7 +33,8 @@ Page({
33 taskid: "", //任务id 33 taskid: "", //任务id
34 usercount: 0, //参与的人数 34 usercount: 0, //参与的人数
35 dismantle: null, //帮拆记录数据集 35 dismantle: null, //帮拆记录数据集
36 - is_shares:111111,//判断是不是要分享的 36 +
  37 + is_user_task:null,//判断是不是领取的任务
37 38
38 //*********************************************start钱 39 //*********************************************start钱
39 canvasHidden: 0, //分享图片是否已经生成 40 canvasHidden: 0, //分享图片是否已经生成
@@ -79,6 +80,7 @@ Page({ @@ -79,6 +80,7 @@ Page({
79 add_onlicke: function(e) { 80 add_onlicke: function(e) {
80 var th = this; 81 var th = this;
81 var taskid = e.target.dataset.taskid; 82 var taskid = e.target.dataset.taskid;
  83 + console.log("任务id5555555", taskid);
82 var help_id = th.data.help_id; 84 var help_id = th.data.help_id;
83 var user_id = getApp().globalData.user_id; 85 var user_id = getApp().globalData.user_id;
84 var stoid = os.stoid 86 var stoid = os.stoid
@@ -137,8 +139,6 @@ Page({ @@ -137,8 +139,6 @@ Page({
137 139
138 } 140 }
139 } 141 }
140 -  
141 -  
142 }); 142 });
143 143
144 144
@@ -171,13 +171,14 @@ Page({ @@ -171,13 +171,14 @@ Page({
171 }); 171 });
172 var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty; 172 var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
173 var taskid = data_aissa[0].id; 173 var taskid = data_aissa[0].id;
174 - 174 + console.log("参考", data_aissa);
175 th.setData({ 175 th.setData({
176 aitem: data_aissa, 176 aitem: data_aissa,
177 task_number: task_number, 177 task_number: task_number,
178 taskid: taskid 178 taskid: taskid
179 }); 179 });
180 - 180 + //判断是不是领取的任务
  181 + th.get_user_task();
181 182
182 } 183 }
183 184
@@ -195,7 +196,7 @@ Page({ @@ -195,7 +196,7 @@ Page({
195 this.user_task_list(); 196 this.user_task_list();
196 // 获取会员的参与的任务列表 我的任务 197 // 获取会员的参与的任务列表 我的任务
197 this.get_user_task_num(); 198 this.get_user_task_num();
198 - 199 +
199 }, 200 },
200 201
201 202
@@ -212,11 +213,19 @@ Page({ @@ -212,11 +213,19 @@ Page({
212 console.log("任务id", taskid); 213 console.log("任务id", taskid);
213 var th = this; 214 var th = this;
214 var index = 1; //获取当前选择的是任务还是活动说明 215 var index = 1; //获取当前选择的是任务还是活动说明
215 - var is_task = th.data.is_task; //0任务,1帮拆 216 + var is_task = this.data.is_task; //0任务,1帮拆
  217 + if (is_task == undefined || is_task==null){
  218 + is_task=1;
  219 + }
  220 + var switch_head=this.data.switch_head;
  221 + if (switch_head == undefined || switch_head== null){
  222 + switch_head=1;
  223 + }
  224 +
216 console.log("0任务,1帮拆", is_task, ); 225 console.log("0任务,1帮拆", is_task, );
217 - th.setData({ 226 + this.setData({
218 is_task: 1, 227 is_task: 1,
219 - switch_head: 1 228 + switch_head:1
220 }); 229 });
221 rq.get("/api/weshop/marketing/help/help/task/involve/page", { 230 rq.get("/api/weshop/marketing/help/help/task/involve/page", {
222 data: { 231 data: {
@@ -227,18 +236,33 @@ Page({ @@ -227,18 +236,33 @@ Page({
227 success: function(res) { 236 success: function(res) {
228 237
229 if (res.data.code == 0) { 238 if (res.data.code == 0) {
230 - var dismantle = res.data.data.pageData; 239 + var dismantle = res.data.data.pageData[0].zlHelpUser;
  240 + console.log(dismantle.toString, "帮拆记录",dismantle[0].nickName);
  241 +
231 th.setData({ 242 th.setData({
232 dismantle: dismantle 243 dismantle: dismantle
233 }); 244 });
  245 + }else{
  246 + th.setData({
  247 + dismantle:null
  248 + });
234 } 249 }
235 } 250 }
236 251
237 }) 252 })
238 -  
239 -  
240 }, 253 },
241 - 254 + // 领取礼包
  255 + get_libao: function (e) {
  256 + var libao_id = e.currentTarget.dataset.libaoid;
  257 + var completeid = e.currentTarget.dataset.completeid;
  258 + console.log("礼包id", libao_id);
  259 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);
  260 + },
  261 + //查看礼包id
  262 + select_libao: function () {
  263 + var libao_id = e.currentTarget.dataset.libaoid;
  264 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0);
  265 + },
242 266
243 //划动的时候监听 267 //划动的时候监听
244 onSli: function(e) { 268 onSli: function(e) {
@@ -246,12 +270,22 @@ Page({ @@ -246,12 +270,22 @@ Page({
246 var ind = e.detail.current; 270 var ind = e.detail.current;
247 var aitem = this.data.aitem; 271 var aitem = this.data.aitem;
248 var task_number = aitem[ind].giftQty - aitem[ind].useGiftQty; 272 var task_number = aitem[ind].giftQty - aitem[ind].useGiftQty;
249 - console.log("划动的任务总数", task_number, "任务所有的参数", aitem); 273 + var task_id = aitem[ind].id;
  274 + console.log("划动的任务总数", task_number, "任务所有的参数", aitem,
  275 + "任务id",task_id);
250 th.setData({ 276 th.setData({
251 sw_index: ind, 277 sw_index: ind,
252 - task_number: task_number 278 + task_number: task_number,
  279 + taskid: task_id
253 }); 280 });
254 - console.log("可以领取的的任务数", aitem[ind].giftQty, '已领取的任务数据', aitem[ind].useGiftQty); 281 +
  282 + if (this.data.switch_head==1){
  283 + //判断有没有帮拆记录
  284 + this.dismantle_record();
  285 + }
  286 + //判断是不是领取的任务
  287 + th.get_user_task();
  288 +
255 }, 289 },
256 //导航球 290 //导航球
257 close: function() { 291 close: function() {
@@ -262,10 +296,22 @@ Page({ @@ -262,10 +296,22 @@ Page({
262 }, 296 },
263 // 获取会员的参与的任务列表 我的任务 297 // 获取会员的参与的任务列表 我的任务
264 user_task_list: function(e) { 298 user_task_list: function(e) {
  299 +
265 var th = this; 300 var th = this;
266 - 301 +
267 var index = 0; 302 var index = 0;
268 - var is_task = th.data.is_task; //0任务,1活动说明 303 + var is_task = this.data.is_task; //0任务,1帮拆
  304 + if (is_task == undefined || is_task==null){
  305 + is_task=0;
  306 + }
  307 + var switch_head = this.data.switch_head;
  308 + if (switch_head == undefined || switch_head == null) {
  309 + switch_head = 0;
  310 + }
  311 + this.setData({
  312 + is_task: index,
  313 + switch_head: index
  314 + });
269 var help_id = th.data.help_id; 315 var help_id = th.data.help_id;
270 var user_id = getApp().globalData.user_id; 316 var user_id = getApp().globalData.user_id;
271 rq.get("/api/weshop/marketing/help/help/user/page", { 317 rq.get("/api/weshop/marketing/help/help/user/page", {
@@ -275,10 +321,7 @@ Page({ @@ -275,10 +321,7 @@ Page({
275 userId: user_id 321 userId: user_id
276 }, 322 },
277 success: function(su) { 323 success: function(su) {
278 - th.setData({  
279 - is_task: index,  
280 - switch_head: index  
281 - }); 324 +
282 if (su.data.code == 0) { 325 if (su.data.code == 0) {
283 var user_list = su.data.data.pageData; 326 var user_list = su.data.data.pageData;
284 console.log("会员列表", user_list); 327 console.log("会员列表", user_list);
@@ -293,8 +336,32 @@ Page({ @@ -293,8 +336,32 @@ Page({
293 } 336 }
294 }) 337 })
295 }, 338 },
  339 + //判断是否有领取任务
  340 + get_user_task:function(){
  341 + var user_id = getApp().globalData.user_id;
  342 + var th=this;
  343 + var aitem= th.data.aitem;
  344 + var sw_index=th.data.sw_index;
  345 + console.log(sw_index,"判断是否有领取任务", aitem);
  346 + var taskid = aitem[sw_index].id
  347 + console.log("判断是否有领取任务 任务的id", taskid);
  348 + rq.get("/api/weshop/marketing/help/help/task/get",{
  349 + data:{
  350 + storeId: os.stoid,
  351 + userId: user_id,
  352 + taskId: taskid
  353 + },
  354 + success: function (res) {
  355 + if (res.data.code==0){
  356 + var is_usertask=res.data.data;
  357 + console.log('判断是不是领取的任务', is_usertask);
  358 + th.setData({is_user_task: is_usertask});
  359 + }
  360 + }
  361 + })
  362 + },
296 //获取助力活动参与的人数 363 //获取助力活动参与的人数
297 - get_user_task_num() { 364 + get_user_task_num:function(){
298 var th = this; 365 var th = this;
299 var help_id = th.data.help_id; 366 var help_id = th.data.help_id;
300 rq.get("/api/weshop/marketing/help/involve/help/act/people/count", { 367 rq.get("/api/weshop/marketing/help/involve/help/act/people/count", {
@@ -331,7 +398,7 @@ Page({ @@ -331,7 +398,7 @@ Page({
331 if (swiperError >= 3) { //在开关被触发3次以上 398 if (swiperError >= 3) { //在开关被触发3次以上
332 console.error(this.data.swiperError) 399 console.error(this.data.swiperError)
333 this.setData({ 400 this.setData({
334 - goodsIndex: this.data.preIndex 401 + sw_index: this.data.preIndex
335 }); //,重置current为正确索引 402 }); //,重置current为正确索引
336 this.setData({ 403 this.setData({
337 swiperError: 0 404 swiperError: 0
@@ -351,32 +418,45 @@ Page({ @@ -351,32 +418,45 @@ Page({
351 418
352 // 轮播图点击左边 419 // 轮播图点击左边
353 click_pre: function() { 420 click_pre: function() {
354 - console.log("轮播图点击左边");  
355 var index = this.data.sw_index; 421 var index = this.data.sw_index;
356 index--; 422 index--;
357 if (index < 0) return; 423 if (index < 0) return;
358 var aitem = this.data.aitem; 424 var aitem = this.data.aitem;
359 var task_number = aitem[index].giftQty - aitem[index].useGiftQty; 425 var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
  426 + var task_id = aitem[index].id;
  427 + console.log("轮播图点击左边", "任务id", task_id, "任务总的data", aitem,
  428 + "任务总库存", task_number);
360 this.setData({ 429 this.setData({
361 sw_index: index, 430 sw_index: index,
362 - task_number: task_number 431 + task_number: task_number,
  432 + taskid: task_id
363 }) 433 })
364 - 434 + if (this.data.switch_head == 1) {
  435 + //判断有没有帮拆记录
  436 + this.dismantle_record();
  437 + }
  438 + //判断有没有领取任务
  439 + this.get_user_task();
365 }, 440 },
366 //轮播图点击右边 441 //轮播图点击右边
367 click_next: function() { 442 click_next: function() {
368 443
369 var index = this.data.sw_index; 444 var index = this.data.sw_index;
370 index++; 445 index++;
371 - console.log("轮播图点击右边");  
372 if (index >= this.data.aitem.length) return; 446 if (index >= this.data.aitem.length) return;
373 var aitem = this.data.aitem; 447 var aitem = this.data.aitem;
374 var task_number = aitem[index].giftQty - aitem[index].useGiftQty; 448 var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
  449 + var task_id = aitem[index].id;
  450 + console.log("轮播图点击右边", "任务id", task_id, "任务总的data",aitem,
  451 + "任务总库存", task_number);
375 this.setData({ 452 this.setData({
376 sw_index: index, 453 sw_index: index,
377 - task_number: task_number 454 + task_number: task_number,
  455 + taskid: task_id
378 }) 456 })
379 - 457 + if (this.data.switch_head == 1) {
  458 + this.dismantle_record();
  459 + }
380 }, 460 },
381 461
382 /** 462 /**
pages/user/assistance/task_assistance.wxml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </view> 8 </view>
9 <view class="activity-data t-c fs28 white"> 9 <view class="activity-data t-c fs28 white">
10 活动剩余时间:<text class='tui-conutdown-box'> {{aitem[0].djs.day}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:<text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text> 10 活动剩余时间:<text class='tui-conutdown-box'> {{aitem[0].djs.day}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:<text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
11 - </view> 11 + </view>
12 </view> 12 </view>
13 <!-- 图片的轮播图 --> 13 <!-- 图片的轮播图 -->
14 <view class="xc-specific-more-frame flex-center"> 14 <view class="xc-specific-more-frame flex-center">
@@ -25,21 +25,23 @@ @@ -25,21 +25,23 @@
25 <view class="bg_right xc-right bcolor mt"></view> 25 <view class="bg_right xc-right bcolor mt"></view>
26 </view> 26 </view>
27 </view> 27 </view>
28 - <view class="plan-frame flex ai-center"> 28 + <view class="plan-frame flex ai-center" wx:if="{{is_user_task}}">
29 <view class="plan_num rel"> 29 <view class="plan_num rel">
30 - <view class="is_plam abs"></view> 30 + <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
31 </view> 31 </view>
32 - <text class="white fs24">/</text> 32 +
  33 +
  34 + <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
33 35
34 </view> 36 </view>
35 <view class="task-number fs28 white t-c "> 37 <view class="task-number fs28 white t-c ">
36 今天剩余可领{{task_number}}个任务 38 今天剩余可领{{task_number}}个任务
37 </view> 39 </view>
38 40
39 - <view wx:if="{{is_shares==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}" bindtap="add_onlicke"> 41 + <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}" bindtap="add_onlicke">
40 就选它了 42 就选它了
41 </view> 43 </view>
42 - <view wx:if="{{is_shares!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}" bindtap="save_share"> 44 + <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}" bindtap="save_share">
43 好友拆一拆 45 好友拆一拆
44 </view> 46 </view>
45 47
@@ -63,16 +65,17 @@ @@ -63,16 +65,17 @@
63 65
64 <view class="items" wx:if="{{is_task==0}}"> 66 <view class="items" wx:if="{{is_task==0}}">
65 67
66 - <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" > 68 + <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}"wx:key="*this">
67 <view class="flex-center width"> 69 <view class="flex-center width">
68 <view class="ellipsis-1">{{item.helpTaskName}} 70 <view class="ellipsis-1">{{item.helpTaskName}}
69 </view> 71 </view>
70 </view> 72 </view>
71 <view class="flex-center width state"> 73 <view class="flex-center width state">
72 <view class="ellipsis-1"> 74 <view class="ellipsis-1">
73 - <text wx:if="{{item.status==0&&item.zlHelpNum<item.helpNum}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>  
74 - <text wx:if="{{item.status==2&&item.zlHelpNum==item.helpNum}}">查看详情</text>  
75 - <text wx:if="{{item.status==1&&time.zlHelpNum==item.helpNum}}">领取礼包 </text> 75 + <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
  76 + <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</text>
  77 + <text wx:if="{{item.status==1}}"bindtap="get_libao"data-libaoid="{{item.helpListGiftBagId}}"
  78 + data-completeid="{{item.id}}">领取礼包 </text>
76 </view> 79 </view>
77 </view> 80 </view>
78 81
@@ -82,19 +85,30 @@ @@ -82,19 +85,30 @@
82 85
83 86
84 <view class="items" wx:if="{{is_task==1}}"> 87 <view class="items" wx:if="{{is_task==1}}">
85 - <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}"> 88 + <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
  89 +
  90 +
  91 + <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}"wx:for-index="idx">
  92 +
86 <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto"> 93 <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto">
87 - <image class="circle user_img" src="{{iurl+itme.headPic}}"></image>  
88 - <view class="ellipsis-1">{{itme.nickName}} 94 + <image class="circle user_img" src="{{item.headPic}}"></image>
  95 + <view class="ellipsis-1">{{item.nickName}}
89 </view> 96 </view>
90 - <view class="ellipsis-1">{{filter.format_time(itme.beginDate)}} 97 + <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
91 </view> 98 </view>
92 </view> 99 </view>
93 100
94 </view> 101 </view>
95 - 102 + </block>
  103 +
  104 + <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
  105 + <view class="flex-center nothing white">
  106 + <view>暂无任务记录</view>
  107 + </view>
96 </view> 108 </view>
97 - <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}"> 109 +
  110 + </view>
  111 + <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
98 <view class="flex-center nothing white"> 112 <view class="flex-center nothing white">
99 <view>暂无任务记录</view> 113 <view>暂无任务记录</view>
100 </view> 114 </view>
@@ -114,27 +128,13 @@ @@ -114,27 +128,13 @@
114 <view>人领取了任务</view> 128 <view>人领取了任务</view>
115 </view> 129 </view>
116 </view> 130 </view>
117 -<view wx:if="{{is_share}}">  
118 - <!-- 蒙尘 -->  
119 - <view class="dust">  
120 - </view>  
121 - <!-- 画布 -->  
122 - <view class="canvas" style="width:100%;">  
123 - <view class="flex-center">  
124 - <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>  
125 - </view>  
126 - <view class="closes flex-center">  
127 - <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>  
128 - </view>  
129 - </view>  
130 -</view> 131 +
131 132
132 <!--********** 钱巧玲 --> 133 <!--********** 钱巧玲 -->
133 -<view>  
134 - <!-- 蒙尘 -->  
135 - <view class="dust">  
136 - </view>  
137 - <!-- 画布 --> 134 +<!-- <view>
  135 +
  136 + <view class="dust"></view>
  137 +
138 <view class="canvas" style="width:100%;"> 138 <view class="canvas" style="width:100%;">
139 <view class="flex-center"> 139 <view class="flex-center">
140 <canvas wx:if="{{is_share}}" canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas> 140 <canvas wx:if="{{is_share}}" canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image> 143 <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
144 </view> 144 </view>
145 </view> 145 </view>
146 -</view> 146 +</view> -->
147 <!-- 引入提示组件 --> 147 <!-- 引入提示组件 -->
148 <warn id="warn"></warn> 148 <warn id="warn"></warn>
149 <!-- 制作一个圆球导航 --> 149 <!-- 制作一个圆球导航 -->
pages/user/assistance/task_assistance.wxss
@@ -165,8 +165,11 @@ border-color: #fff; @@ -165,8 +165,11 @@ border-color: #fff;
165 background: #ffe7ab; 165 background: #ffe7ab;
166 border-radius: 20rpx; 166 border-radius: 20rpx;
167 height: 22rpx; 167 height: 22rpx;
  168 + margin-right: 10rpx;
168 } 169 }
169 .is_plam{ 170 .is_plam{
  171 + border-radius: 20rpx;
  172 + background: #fcc001;
170 height: 100%; 173 height: 100%;
171 top: 0rpx; 174 top: 0rpx;
172 left: 0rpx; 175 left: 0rpx;