Commit fbfd395a979c40c5651fb1f97e7022520a4568d8

Authored by 后端开发-许程
1 parent db759695

助力首页数据填充及会员中心页面的助力判断

pages/user/assistance/assistance.js
1 -var i = require("../../../utils/util.js")  
2 -var e = getApp(),  
3 - a = e.globalData.setting,  
4 - os = a,  
5 - t = e.request,  
6 - d = e.globalData; 1 +var t = getApp(),
  2 + a = t.request,
  3 + o = t.globalData.setting,
  4 + os = o,
  5 + i = require("../../../utils/util.js"),
  6 + ut = i,
  7 + s = require("../../../utils/common.js");
  8 +var regeneratorRuntime = require('../../../utils/runtime.js');
  9 +var oo = t.globalData.setting;
7 Page({ 10 Page({
8 11
9 /** 12 /**
10 * 页面的初始数据 13 * 页面的初始数据
11 */ 14 */
12 data: { 15 data: {
13 - url: a.url, //接口网址  
14 - iurl: a.imghost, //图片前缀网址 16 + url: os.url, //接口网址
  17 + iurl: os.imghost, //图片前缀网址
15 switch_head: 0, //0:我的任务,1:活动说明 18 switch_head: 0, //0:我的任务,1:活动说明
16 zl_act: null, //助力活动 19 zl_act: null, //助力活动
17 zl_user_list: [], //任务列表 20 zl_user_list: [], //任务列表
@@ -19,6 +22,9 @@ Page({ @@ -19,6 +22,9 @@ Page({
19 cur_page: 1, //页码 22 cur_page: 1, //页码
20 page_num: 5, //每页多少个 23 page_num: 5, //每页多少个
21 is_show_more: 0, //是否加载更多 24 is_show_more: 0, //是否加载更多
  25 + help_id:"",//助力活动的id
  26 + timer:"",//任务列表的定时器
  27 +
22 }, 28 },
23 29
24 /** 30 /**
@@ -28,54 +34,65 @@ Page({ @@ -28,54 +34,65 @@ Page({
28 var th = this; 34 var th = this;
29 var nav_b = th.selectComponent("#nav_b"); //组件的id 35 var nav_b = th.selectComponent("#nav_b"); //组件的id
30 nav_b.set_name("助力", ""); 36 nav_b.set_name("助力", "");
  37 + // 助力活动
  38 + this.assistance();
31 }, 39 },
32 40
33 /** 41 /**
34 * 生命周期函数--监听页面显示 42 * 生命周期函数--监听页面显示
35 */ 43 */
36 onShow: function() { 44 onShow: function() {
37 - var th = this;  
38 - e.request.get("http://172.20.3.102:8022/api/weshop/zl_act", {  
39 - success: function(res) {  
40 - if (res.data.code == 0) {  
41 - th.setData({  
42 - zl_act: res.data.data 45 + var th=this;
  46 + this.data.timer= setInterval(function () {
  47 + th.get_list();
  48 +
  49 + },2000)
  50 +
  51 + },
  52 + // 助力活动
  53 + async assistance() {
  54 + var th=this;
  55 + var user_id = getApp().globalData.user_id;
  56 + var store_id = os.stoid;
  57 +
  58 + await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
  59 + data: {
  60 + storeId: store_id,
  61 + userId: user_id
  62 + }
  63 + }).then(res => {
  64 + if (res.data.code == 0) {
  65 +
  66 + var help_data=res.data.data;
  67 + console.log(help_data.id,'数据', res.data.data);
  68 + th.setData({
  69 + zl_act:help_data,
  70 + help_id:help_data.id
43 }); 71 });
44 - } 72 +
45 } 73 }
46 }) 74 })
47 75
48 - this.get_list();  
49 -  
50 -  
51 - },  
52 - switch_head: function(e) {  
53 - var th = this;  
54 - var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明  
55 - var switch_head = th.data.switch_head; //0任务,1活动说明  
56 - if (index != switch_head) {  
57 - th.setData({  
58 - switch_head: index  
59 - })  
60 - }  
61 }, 76 },
62 77
63 - //关闭导航  
64 - close: function() { 78 + //--点击获取用户任务列表--会员的任务列表
  79 + get_list:function() {
65 var th = this; 80 var th = this;
66 - var nav_b = th.selectComponent("#nav_b"); //组件的id  
67 - nav_b.close_box();  
68 - },  
69 -  
70 - //--点击获取用户任务列表--  
71 - get_list: function() {  
72 - var th = this;  
73 - e.request.get("http://172.20.3.102:8022/api/weshop/zl_user_list", { 81 + var help_id=this.data.help_id;
  82 + t.request.get("/api/weshop/marketing/help/help/user/page", {
  83 + data: {
  84 + userId:getApp().globalData.user_id,
  85 + storeId: os.stoid,
  86 + helpId: help_id
  87 + },
74 success: function(res) { 88 success: function(res) {
  89 + clearTimeout(th.data.timer);
  90 +
75 if (!th.data.is_load) th.setData({ 91 if (!th.data.is_load) th.setData({
76 is_load: 1 92 is_load: 1
77 }) 93 })
78 if (res.data.code == 0) { 94 if (res.data.code == 0) {
  95 +
79 var list = th.data.zl_user_list; 96 var list = th.data.zl_user_list;
80 list = list.concat(res.data.data.pageData) //连接数组 97 list = list.concat(res.data.data.pageData) //连接数组
81 th.setData({ 98 th.setData({
@@ -102,7 +119,26 @@ Page({ @@ -102,7 +119,26 @@ Page({
102 119
103 //-----跳转到领取礼包的页面------ 120 //-----跳转到领取礼包的页面------
104 go_task: function() { 121 go_task: function() {
105 - getApp().goto("/pages/user/assistance/task_assistance");  
106 - } 122 + var help_id=this.data.help_id;
  123 +
  124 + getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
  125 + },
  126 + switch_head: function (e) {
  127 + var th = this;
  128 + var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明
  129 + var switch_head = th.data.switch_head; //0任务,1活动说明
  130 + if (index != switch_head) {
  131 + th.setData({
  132 + switch_head: index
  133 + })
  134 + }
  135 + },
  136 +
  137 + //关闭导航
  138 + close: function () {
  139 + var th = this;
  140 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  141 + nav_b.close_box();
  142 + },
107 143
108 }) 144 })
109 \ No newline at end of file 145 \ No newline at end of file
pages/user/assistance/assistance.wxml
1 -<!-- <wxs module="../../../filter" src="c_filter.wxs"></wxs> --> 1 +<wxs module="filter" src="c_filter.wxs"></wxs>
2 <view class="page" bindtap="close"> 2 <view class="page" bindtap="close">
3 <!-- 背景图片 --> 3 <!-- 背景图片 -->
4 <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image> 4 <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
@@ -11,11 +11,11 @@ @@ -11,11 +11,11 @@
11 <view class="excitation">机会总是留给最有行动力的人</view> 11 <view class="excitation">机会总是留给最有行动力的人</view>
12 </view> 12 </view>
13 <view class="flex-center"> 13 <view class="flex-center">
14 - <image class="gift" src="{{iurl+'miniapp/images/friendhelp/gift.png'}}" lazy-load="true"></image> 14 + <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
15 </view> 15 </view>
16 <view class="flex-center fs26 time"> 16 <view class="flex-center fs26 time">
17 <view>活动时间:</view> 17 <view>活动时间:</view>
18 - <view>{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.enddate)}} 18 + <view>{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
19 </view> 19 </view>
20 </view> 20 </view>
21 <view class="flex-center" bindtap="go_task"> 21 <view class="flex-center" bindtap="go_task">
@@ -62,12 +62,15 @@ @@ -62,12 +62,15 @@
62 62
63 </view> 63 </view>
64 <!-- 加载更多 --> 64 <!-- 加载更多 -->
  65 + <block wx:if="{{is_load && zl_user_list.length!=0}}">
65 <view class="fs28 flex-center"> 66 <view class="fs28 flex-center">
66 <view class="line"></view> 67 <view class="line"></view>
67 <view class="load" bindtap="get_list">点击加载更多</view> 68 <view class="load" bindtap="get_list">点击加载更多</view>
68 <view class="line"></view> 69 <view class="line"></view>
69 </view> 70 </view>
  71 + </block>
70 </view> 72 </view>
  73 +
71 74
72 <view class="fs30" style="margin-top: 30rpx;"> 75 <view class="fs30" style="margin-top: 30rpx;">
73 <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}"> 76 <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
@@ -76,7 +79,7 @@ @@ -76,7 +79,7 @@
76 <view class="flex-center receive"> 79 <view class="flex-center receive">
77 <view class="flex-center"> 80 <view class="flex-center">
78 <view>已有</view> 81 <view>已有</view>
79 - <view>126</view> 82 + <view>{{zl_act.countAll}}</view>
80 <view>人领取了任务</view> 83 <view>人领取了任务</view>
81 </view> 84 </view>
82 85
@@ -88,7 +91,8 @@ @@ -88,7 +91,8 @@
88 <view wx:if="{{switch_head}}" class="white"> 91 <view wx:if="{{switch_head}}" class="white">
89 <view class="items"> 92 <view class="items">
90 <view class="content fs28 padding"> 93 <view class="content fs28 padding">
91 - <view>{{zl_act.remark}}</view> 94 + <!-- <view>{{zl_act.remark}}</view> -->
  95 + <rich-text nodes="{{zl_act.remark}}"></rich-text>
92 </view> 96 </view>
93 </view> 97 </view>
94 98
pages/user/assistance/task_assistance.js
1 var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js"); 1 var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js");
2 -var e = getApp(), app = e, s = e.globalData.setting, os = s, app_d = e.globalData; 2 +var e = getApp(), app = e, i = require("../../../utils/util.js"),
  3 + ut = i,s = e.globalData.setting, os = s, app_d = e.globalData;
3 var regeneratorRuntime = require('../../../utils/runtime.js'); 4 var regeneratorRuntime = require('../../../utils/runtime.js');
4 Page({ 5 Page({
5 6
@@ -13,15 +14,7 @@ Page({ @@ -13,15 +14,7 @@ Page({
13 activity_data:"25:20:59",//活动剩余时间 14 activity_data:"25:20:59",//活动剩余时间
14 task_number:12,//任务数 15 task_number:12,//任务数
15 is_task:0,//历史记录与任务 16 is_task:0,//历史记录与任务
16 - aitem:[  
17 - { PrivilegeICOUrl:"https://mshopimg.yolipai.net/public/upload/userqy/ppt/2019/08-19/1e53fef14465c1f4db262fd569e78483.jpg",tite_name:'一页纸活动'},{  
18 - PrivilegeICOUrl: "https://mshopimg.yolipai.net/public/upload/userqy/ppt/2019/08-19/aa50f43dc3b9dceff951cb2145c2df3b.jpg", tite_name: '辉煌活动'  
19 - },{  
20 - PrivilegeICOUrl: "https://mshopimg.yolipai.net/public/upload/userqy/ppt/2019/08-19/5c2ff38b48ed350f2c54b19f0b9319e0.jpg", tite_name: '密码活动'  
21 - },{  
22 - PrivilegeICOUrl: "https://mshopimg.yolipai.net//miniapp/images/plus/card_one.jpg", tite_name: '啊啊活动'  
23 - },  
24 - ],//活动的轮播图 17 + aitem:"",//活动的轮播图
25 switch_head: 0, //0:我的任务,1:记录 18 switch_head: 0, //0:我的任务,1:记录
26 }, 19 },
27 20
@@ -29,6 +22,8 @@ Page({ @@ -29,6 +22,8 @@ Page({
29 * 生命周期函数--监听页面加载 22 * 生命周期函数--监听页面加载
30 */ 23 */
31 onLoad: function (options) { 24 onLoad: function (options) {
  25 + var help_id=options.help_id;
  26 + console.log("是什么鬼",help_id);
32 var th=this; 27 var th=this;
33 th.close(); 28 th.close();
34 }, 29 },
@@ -74,7 +69,7 @@ Page({ @@ -74,7 +69,7 @@ Page({
74 sw_index:ind 69 sw_index:ind
75 }) 70 })
76 }, 71 },
77 - //关闭导航 72 + //导航球
78 close: function () { 73 close: function () {
79 var th = this; 74 var th = this;
80 var nav_b = th.selectComponent("#nav_b"); //组件的id 75 var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -93,8 +88,98 @@ Page({ @@ -93,8 +88,98 @@ Page({
93 * 生命周期函数--监听页面显示 88 * 生命周期函数--监听页面显示
94 */ 89 */
95 onShow: function () { 90 onShow: function () {
  91 + var th=this;
  92 + /*-----统计-----*/
  93 + rq.get("/api/weshop/zl_task", {
  94 + data: { user_id: app_d.user_id,
  95 + strod_id:os.stoid
  96 + },
  97 + success: function (su) {
  98 +
  99 + var data=su.data;
  100 + console.log('waitlist5555555555' + data.code);
  101 + if (data.code!=0){
  102 + getApp().my_warnning(data.msg,0, th);
  103 + return false;
  104 + }
  105 + if (data.code==0){
  106 + //轮播图的数据
  107 + var data_aissa=data.data.pageData;
  108 + //当前时间戳
  109 + var nt = ut.gettimestamp();
  110 +
  111 + data_aissa.forEach(function (val, ind) {
  112 + console.log(nt, "当前时间","结束时间", val.end_time,"开始时间");
  113 + //已开始
  114 + if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0;
  115 + //未开始
  116 + else if (val.start_time > nt && val.end_time > nt) data_aissa[ind].status = 1;
  117 + //已结束
  118 +
  119 + else if (val.start_time < nt && val.end_time < nt) data_aissa[ind].status = 2;
  120 +
  121 + });
  122 +
  123 + console.log("是什么东西2222222222",data_aissa);
  124 +
  125 + th.setData({ aitem:data_aissa});
  126 +
  127 +
  128 + }
  129 +
  130 + }
  131 + })
96 132
97 }, 133 },
  134 + //----助力任务-----
  135 + countDown() {
  136 + if (!this.data.is_timer) return false;
  137 + var th = this;
  138 + // 获取当前时间,同时得到活动结束时间数组
  139 + var newTime = ut.gettimestamp();
  140 + var List = this.data.aitem;
  141 + for (var j = 0; j < List.length; j++) {
  142 + var endTimeList = List[j];
  143 + // 对结束时间进行处理渲染到页面
  144 + for (var i = 0; i < endTimeList.length; i++) {
  145 + var o = endTimeList[i];
  146 + var endTime = o.end_time
  147 + if (o.status == 0) endTime = o.start_time
  148 +
  149 + var obj = null;
  150 + // 如果活动未结束,对时间进行处理
  151 + if (endTime - newTime > 0) {
  152 + var time = (endTime - newTime);
  153 + // 获取天、时、分、秒
  154 + var day = parseInt(time / (60 * 60 * 24));
  155 + var hou = parseInt(time % (60 * 60 * 24) / 3600);
  156 + var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
  157 + var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
  158 + obj = {
  159 + day: this.timeFormat(day),
  160 + hou: this.timeFormat(hou),
  161 + min: this.timeFormat(min),
  162 + sec: this.timeFormat(sec)
  163 + }
  164 + } else {
  165 + //活动已结束,全部设置为'00'
  166 + obj = {
  167 + day: '00',
  168 + hou: '00',
  169 + min: '00',
  170 + sec: '00'
  171 + }
  172 + }
  173 + var txt = "aitem[" + j + "][" + i + "].djs";
  174 + th.setData({
  175 + [txt]: obj
  176 + });
  177 + }
  178 +
  179 + }
  180 + setTimeout(th.countDown, 1000);
  181 +
  182 + },
98 183
99 /** 184 /**
100 * 生命周期函数--监听页面隐藏 185 * 生命周期函数--监听页面隐藏
pages/user/index/index.js
@@ -34,6 +34,7 @@ Page({ @@ -34,6 +34,7 @@ Page({
34 giftbagid:"",//生日活动的类型 34 giftbagid:"",//生日活动的类型
35 actId:"",//生日活动的id 35 actId:"",//生日活动的id
36 actImg:"", 36 actImg:"",
  37 + is_assistance:0,//助力活动
37 }, 38 },
38 goto_nav: function (e) { 39 goto_nav: function (e) {
39 var th = this; 40 var th = this;
@@ -51,6 +52,7 @@ Page({ @@ -51,6 +52,7 @@ Page({
51 */ 52 */
52 onLoad: function (options) { 53 onLoad: function (options) {
53 this.birthday(); 54 this.birthday();
  55 + this.is_assistance();
54 }, 56 },
55 57
56 /** 58 /**
@@ -486,7 +488,22 @@ Page({ @@ -486,7 +488,22 @@ Page({
486 488
487 getApp().showWarning("请稍后重试"); 489 getApp().showWarning("请稍后重试");
488 } 490 }
489 - } 491 + },
  492 + // 判断助力活动是不是存在
  493 + is_assistance:function(){
  494 + var th = this;
  495 + rq.get("/api/weshop/marketing/help/act/judge", {
  496 + data: { storeId: os.stoid, userId: app_d.user_id },
  497 + success: function (res) {
  498 + var code = res.data.code;
  499 + if (code == 0) {
  500 + th.setData({ is_assistance:1});
  501 + }
  502 +
  503 + }
  504 + })
  505 +
  506 + }
490 507
491 508
492 509
pages/user/index/index.wxml
@@ -228,6 +228,13 @@ @@ -228,6 +228,13 @@
228 <image class="xc-center-img " src="{{iurl}}/miniapp/images//user/wdlb.png"></image> 228 <image class="xc-center-img " src="{{iurl}}/miniapp/images//user/wdlb.png"></image>
229 <view class="four-level-word">我的礼包</view> 229 <view class="four-level-word">我的礼包</view>
230 </view> 230 </view>
  231 + <block wx:if="{{is_assistance==1}}">
  232 + <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav">
  233 + <image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
  234 + <view class="four-level-word">助力活动</view>
  235 + </view>
  236 + </block>
  237 +
231 </view> 238 </view>
232 239
233 </view> 240 </view>