Commit b5bc85d7f61a4c57b897cedfec4a6c506941d3d3
1 parent
7aae027c
助力活动的数据添加, 帮拆, 帮拆成功页
Showing
5 changed files
with
105 additions
and
58 deletions
pages/user/assistance/assistance_success.js
@@ -8,6 +8,8 @@ Page({ | @@ -8,6 +8,8 @@ Page({ | ||
8 | */ | 8 | */ |
9 | data: { | 9 | data: { |
10 | iurl: s.imghost, | 10 | iurl: s.imghost, |
11 | + user:app_d.userInfo, | ||
12 | + zl_act:null, //助力活动 | ||
11 | }, | 13 | }, |
12 | 14 | ||
13 | /** | 15 | /** |
@@ -28,22 +30,22 @@ Page({ | @@ -28,22 +30,22 @@ Page({ | ||
28 | * 生命周期函数--监听页面显示 | 30 | * 生命周期函数--监听页面显示 |
29 | */ | 31 | */ |
30 | onShow: function () { | 32 | onShow: function () { |
31 | - | 33 | + this.init(); |
32 | }, | 34 | }, |
33 | 35 | ||
34 | - | ||
35 | - // 初始化判断微信余额 | ||
36 | - async weixin() { | 36 | + // ----初始化---- |
37 | + init:function() { | ||
38 | + | ||
37 | var user_id = getApp().globalData.user_id; | 39 | var user_id = getApp().globalData.user_id; |
38 | var store_id = os.stoid; | 40 | var store_id = os.stoid; |
39 | - await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", { | 41 | + var th=this; |
42 | + getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", { | ||
40 | data: { | 43 | data: { |
41 | user_id: user_id, | 44 | user_id: user_id, |
42 | store_id: store_id | 45 | store_id: store_id |
43 | } | 46 | } |
44 | }).then(res => { | 47 | }).then(res => { |
45 | - console.log("是什么东西", res.data.code); | ||
46 | - | 48 | + if(res.data.code==0) th.setData({zl_act:res.data.data}) |
47 | }) | 49 | }) |
48 | 50 | ||
49 | }, | 51 | }, |
@@ -55,19 +57,6 @@ Page({ | @@ -55,19 +57,6 @@ Page({ | ||
55 | 57 | ||
56 | }, | 58 | }, |
57 | 59 | ||
58 | - /** | ||
59 | - * 生命周期函数--监听页面卸载 | ||
60 | - */ | ||
61 | - onUnload: function () { | ||
62 | - | ||
63 | - }, | ||
64 | - | ||
65 | - /** | ||
66 | - * 页面相关事件处理函数--监听用户下拉动作 | ||
67 | - */ | ||
68 | - onPullDownRefresh: function () { | ||
69 | - | ||
70 | - }, | ||
71 | 60 | ||
72 | /** | 61 | /** |
73 | * 页面上拉触底事件的处理函数 | 62 | * 页面上拉触底事件的处理函数 |
pages/user/assistance/assistance_success.wxml
1 | 1 | ||
2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> | 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
3 | <view class="flex-vertical user_assis"> | 3 | <view class="flex-vertical user_assis"> |
4 | - <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
5 | - <view class="user_name white fs28 ellipsis-1">你好</view> | ||
6 | - </view> | ||
7 | - <view class="caption_title white fs32 t-c"> | ||
8 | - 助力成功,自己也差拆一个吧~ | 4 | + <image class="circle user_img" src="{{user.head_pic}}"></image> |
5 | + <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view> | ||
9 | </view> | 6 | </view> |
7 | + <view class="caption_title white fs32 t-c">助力成功,自己也差拆一个吧~</view> | ||
10 | <!-- 礼包图片 --> | 8 | <!-- 礼包图片 --> |
11 | <view class="t-c"> | 9 | <view class="t-c"> |
12 | <image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> | 10 | <image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> |
13 | </image> | 11 | </image> |
14 | </view> | 12 | </view> |
15 | <view class="flex jc-center"> | 13 | <view class="flex jc-center"> |
16 | - <view class="activity_time fs24 white"> | ||
17 | - 活动时间:5月23日-6月15日 | ||
18 | - </view> | 14 | + <view class="activity_time fs24 white"> |
15 | + 活动时间:{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}} | ||
16 | + </view> | ||
19 | </view> | 17 | </view> |
20 | </view> | 18 | </view> |
21 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view> | 19 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view> |
22 | -<view class="fs26 white t-c">已有126人领取礼盒</view> | ||
23 | -<!-- 礼盒弹框 --> | ||
24 | -<!-- <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> | ||
25 | -<view class="libao_frame t-c" wx:if='{{is_show!=0}}'> | ||
26 | - <view class="layer-img" style="background-image: url({{iurl}}/miniapp/images/friendhelp/success.png)"> | ||
27 | - <view class="button-img t-c fs28 flex-center" style="background-image: url({{iurl}}/miniapp/images/friendhelp/participate.png)"> | ||
28 | - 我也要参加 | ||
29 | - </view> | ||
30 | - <view class=" fs24 success white t-c">已成功帮你的小伙伴助力!</view> | ||
31 | - </view> | ||
32 | - <view class="link_div"> | ||
33 | -</view> | ||
34 | -<image class="close-none"bindtap="clike_none" src="{{iurl}}/miniapp/images/plus/Close.png"></image> | ||
35 | -</view> --> | 20 | +<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view> |
21 | + | ||
36 | <!-- 引入提示组件 --> | 22 | <!-- 引入提示组件 --> |
37 | <warn id="warn"></warn> | 23 | <warn id="warn"></warn> |
38 | <!-- 制作一个圆球导航 --> | 24 | <!-- 制作一个圆球导航 --> |
pages/user/assistance/friend_assistance.js
@@ -9,13 +9,34 @@ Page({ | @@ -9,13 +9,34 @@ Page({ | ||
9 | data: { | 9 | data: { |
10 | iurl: s.imghost, | 10 | iurl: s.imghost, |
11 | is_show:0,//显示弹框 | 11 | is_show:0,//显示弹框 |
12 | + user:app_d.userInfo, | ||
13 | + zl_act:null, //助力活动 | ||
14 | + task_id:0, //助力任务ID | ||
15 | + userId:0, //任务用户的ID | ||
12 | }, | 16 | }, |
13 | 17 | ||
14 | /** | 18 | /** |
15 | * 生命周期函数--监听页面加载 | 19 | * 生命周期函数--监听页面加载 |
16 | */ | 20 | */ |
17 | onLoad: function (options) { | 21 | onLoad: function (options) { |
18 | - | 22 | + var th=this; |
23 | + this.data.task_id=options.options; | ||
24 | + this.data.userId=options.userId; | ||
25 | + //任务是不是为空 | ||
26 | + if(this.data.task_id==0 || this.data.task_id==undefined){ | ||
27 | + this.data.task_id= decodeURIComponent(options.scene); | ||
28 | + if(this.data.task_id){ | ||
29 | + getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{ | ||
30 | + data:{}, | ||
31 | + success:function(res){ | ||
32 | + if(res.data.code==0){ | ||
33 | + th.data.userId=res.data.data.user_id; | ||
34 | + } | ||
35 | + } | ||
36 | + }) | ||
37 | + | ||
38 | + } | ||
39 | + } | ||
19 | }, | 40 | }, |
20 | 41 | ||
21 | 42 | ||
@@ -25,22 +46,34 @@ Page({ | @@ -25,22 +46,34 @@ Page({ | ||
25 | url: '/pages/user/assistance/assistance_success', | 46 | url: '/pages/user/assistance/assistance_success', |
26 | }) | 47 | }) |
27 | }, | 48 | }, |
28 | - /** | ||
29 | - * 生命周期函数--监听页面初次渲染完成 | ||
30 | - */ | ||
31 | - onReady: function () { | ||
32 | - | ||
33 | - }, | ||
34 | - | 49 | + |
35 | /** | 50 | /** |
36 | * 生命周期函数--监听页面显示 | 51 | * 生命周期函数--监听页面显示 |
37 | */ | 52 | */ |
38 | onShow: function () { | 53 | onShow: function () { |
39 | - | 54 | + this.init(); |
40 | }, | 55 | }, |
41 | //点击开启礼盒 | 56 | //点击开启礼盒 |
42 | cklie_button:function(){ | 57 | cklie_button:function(){ |
43 | - this.setData({ is_show:1}); | 58 | + var th=this; |
59 | + var t_user_id=app_d.user_id; | ||
60 | + var data={id:this.data.task_id,storeId:os.store_id,userId:this.data.user_id, zlUserId:t_user_id}; | ||
61 | + getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert", | ||
62 | + data, //入参 | ||
63 | + function(res){ //成功 | ||
64 | + if(res.data.code==0) | ||
65 | + this.setData({ is_show:1}); | ||
66 | + else{ | ||
67 | + getApp().my_warnning(res.data.msg,0,th) | ||
68 | + } | ||
69 | + }, | ||
70 | + function(){//失败 | ||
71 | + | ||
72 | + } | ||
73 | + ) | ||
74 | + | ||
75 | + | ||
76 | + | ||
44 | }, | 77 | }, |
45 | //点击关闭礼盒 | 78 | //点击关闭礼盒 |
46 | clike_none:function(){ | 79 | clike_none:function(){ |
@@ -86,5 +119,22 @@ Page({ | @@ -86,5 +119,22 @@ Page({ | ||
86 | */ | 119 | */ |
87 | onShareAppMessage: function () { | 120 | onShareAppMessage: function () { |
88 | 121 | ||
89 | - } | 122 | + }, |
123 | + | ||
124 | + // ----初始化---- | ||
125 | + init:function() { | ||
126 | + | ||
127 | + var user_id = getApp().globalData.user_id; | ||
128 | + var store_id = os.stoid; | ||
129 | + var th=this; | ||
130 | + getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", { | ||
131 | + data: { | ||
132 | + user_id: user_id, | ||
133 | + store_id: store_id | ||
134 | + } | ||
135 | + }).then(res => { | ||
136 | + if(res.data.code==0) th.setData({zl_act:res.data.data}) | ||
137 | + }) | ||
138 | + | ||
139 | + }, | ||
90 | }) | 140 | }) |
91 | \ No newline at end of file | 141 | \ No newline at end of file |
pages/user/assistance/friend_assistance.wxml
1 | +<wxs module="filter" src="c_filter.wxs"></wxs> | ||
1 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> | 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
2 | <view class="flex-vertical user_assis"> | 3 | <view class="flex-vertical user_assis"> |
3 | - <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
4 | - <view class="user_name white fs28 ellipsis-1">你好</view> | 4 | + <image class="circle user_img" src="{{user.head_pic}}"></image> |
5 | + <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view> | ||
5 | </view> | 6 | </view> |
6 | <view class="caption_title white fs32 t-c"> | 7 | <view class="caption_title white fs32 t-c"> |
7 | 拜托拜托,帮我拆礼盒得好礼~ | 8 | 拜托拜托,帮我拆礼盒得好礼~ |
8 | </view> | 9 | </view> |
9 | <!-- 礼包图片 --> | 10 | <!-- 礼包图片 --> |
10 | <view class="t-c"> | 11 | <view class="t-c"> |
11 | -<image class="assis_liba" src="../../../images/frinedhelp/libao_asiss.png"> | 12 | +<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> |
12 | </image> | 13 | </image> |
13 | </view> | 14 | </view> |
14 | <view class="flex jc-center"> | 15 | <view class="flex jc-center"> |
15 | <view class="activity_time fs24 white"> | 16 | <view class="activity_time fs24 white"> |
16 | - 活动时间:5月23日-6月15日 | 17 | + 活动时间:{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}} |
17 | </view> | 18 | </view> |
18 | </view> | 19 | </view> |
19 | </view> | 20 | </view> |
20 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">帮他拆礼盒</view> | 21 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">帮他拆礼盒</view> |
21 | -<view class="fs26 white t-c">已有126人领取礼盒</view> | 22 | +<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view> |
22 | <!-- 礼盒弹框 --> | 23 | <!-- 礼盒弹框 --> |
23 | <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> | 24 | <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> |
24 | <view class="libao_frame t-c" wx:if='{{is_show!=0}}'> | 25 | <view class="libao_frame t-c" wx:if='{{is_show!=0}}'> |
utils/request.js
@@ -212,5 +212,26 @@ module.exports = { | @@ -212,5 +212,26 @@ module.exports = { | ||
212 | if(req) req.abort(); | 212 | if(req) req.abort(); |
213 | },time*1000) | 213 | },time*1000) |
214 | } | 214 | } |
215 | + | ||
216 | + /** | ||
217 | + * @param {Object} url //url地址 | ||
218 | + * @param {Object} data //data入参 | ||
219 | + * @param {Object} succ //成功的回调 | ||
220 | + * @param {Object} fail //失败的回调 | ||
221 | + */ | ||
222 | + json_post:function(url,data,succ,fail){ | ||
223 | + if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url; | ||
224 | + var str = JSON.stringify(pdata); | ||
225 | + wx.request({ | ||
226 | + url: url, | ||
227 | + data: str, | ||
228 | + method: 'POST', | ||
229 | + header: { | ||
230 | + 'content-type': 'application/json' | ||
231 | + },// 设置请求的 header | ||
232 | + success: function (res) { succ(res); }, | ||
233 | + fail:function(res){fail(res);} | ||
234 | + }) | ||
235 | + } | ||
215 | 236 | ||
216 | }; | 237 | }; |
217 | \ No newline at end of file | 238 | \ No newline at end of file |