diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js index 679a63e..66f48af 100644 --- a/pages/user/assistance/assistance.js +++ b/pages/user/assistance/assistance.js @@ -133,7 +133,7 @@ Page({ }) } } else { - getApp().my_confirm(res.data.msg, 0, th); + getApp().my_warnning(res.data.msg, 0, th); th.setData({ is_show_more: 1, page: page diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml index 82516c5..cfb00d9 100644 --- a/pages/user/assistance/assistance.wxml +++ b/pages/user/assistance/assistance.wxml @@ -43,6 +43,7 @@ + {{item.helpTaskName}} @@ -59,7 +60,7 @@ 查看礼包 - + @@ -78,9 +79,7 @@ - 已有 - {{s_num}} - 人领取了任务 + 已有 {{s_num}}人领取了任务 @@ -105,5 +104,7 @@ + + \ No newline at end of file diff --git a/pages/user/assistance/assistance.wxss b/pages/user/assistance/assistance.wxss index 1e35456..18d173b 100644 --- a/pages/user/assistance/assistance.wxss +++ b/pages/user/assistance/assistance.wxss @@ -131,3 +131,9 @@ page { .receive { padding-bottom: 50rpx; } +.tesk_list{ + width: 100%; + max-height: 335rpx; + overflow: hidden; + overflow-y:auto; +} \ No newline at end of file diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml index afa13fa..bb0c715 100644 --- a/pages/user/assistance/task_assistance.wxml +++ b/pages/user/assistance/task_assistance.wxml @@ -58,7 +58,7 @@ - + @@ -142,9 +142,7 @@ - 已有 - {{usercount}} - 人领取了任务 + 已有{{usercount}}人领取了任务 diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss index 4b265e8..6c55454 100644 --- a/pages/user/assistance/task_assistance.wxss +++ b/pages/user/assistance/task_assistance.wxss @@ -8,7 +8,7 @@ page { .top-back { width: 100%; - height: 60%; + height:70%; background-repead: no-repead; background-size: 100% 100%; } @@ -36,7 +36,7 @@ page { } .task-number { - margin-top: 50rpx; + margin-top: 35rpx; } .task_clike { diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index b4a1052..55d36dd 100644 --- a/pages/user/coupons/coupons.js +++ b/pages/user/coupons/coupons.js @@ -57,6 +57,7 @@ Page({ b_isuse_arr:null,//包邮券的已使用的内容 isloading:0, //正在加载中的代码 + isset:0, }, // 点击选中二维码 click: function(e) { @@ -194,7 +195,7 @@ Page({ b_isuse_arr.push(b_arr[i]); } } - data.cashcount= data.cashcount+b_arr.length; //加上包邮券的数量 + data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 th.data.b_can_arr=b_can_arr; //可使用 th.data.b_out_arr=b_out_arr; //过期 th.data.b_isuse_arr=b_isuse_arr; //已使用 @@ -235,7 +236,7 @@ Page({ if(big_arr.length==0 && this.data.b_can_arr){ big_arr=this.data.b_can_arr; } - init_num=this.data.b_can_arr.length; + if(this.data.b_can_arr) init_num=this.data.b_can_arr.length; wx.showLoading(); th.data.isloading=1; getApp().request.promiseGet("/api/weshop/users/listQuan", { @@ -246,6 +247,8 @@ Page({ var a = res.data; val = a.data.total; var details = a.data.pageData; + + th.setData({isset:1}); //没有找到优惠券的时候 if (details.length == 0 && th.data.current_page==1) { @@ -289,6 +292,7 @@ Page({ }, overdue:function(){ + if(this.data.isloading) return; var len = this.data.details.length; @@ -348,7 +352,6 @@ Page({ }); - setTimeout(function () { if(th.data.current_page==1) details=big_arr; for (var i = 0; i < details.length; i++) { diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml index 83ec009..2aea6bb 100644 --- a/pages/user/coupons/coupons.wxml +++ b/pages/user/coupons/coupons.wxml @@ -20,7 +20,7 @@ ({{number}} - + 没有微券? 快去兑换吧 diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 61da0e9..c084455 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -102,7 +102,7 @@ Page({ /*-----获取会员包邮券的数量-----*/ rq.get("/api/weshop/userfeemail/page", { - data: { user_id: e.user_id, store_id: os.stoid, pageSize:1}, + data: { user_id: e.user_id, store_id: os.stoid, pageSize:1,isuse:0}, success: function (su) { if (su.data.code == 0) { th.setData({ byquan: parseInt(su.data.data.total)}); @@ -505,7 +505,6 @@ Page({ // } // }) - }