wxd / MShopWeApp

Commit 60bf70148d2ecd26cd66280140be1b774ce19cd5

Authored by 后端研发-苏明海
2 parents cc847069 bbbbe374

Merge branch 'dev' into 'test' 

Dev

See merge request !259
Inline Side-by-side
Showing 15 changed files with 220 additions and 112 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @60bf701
... ... @@ -186,6 +186,7 @@ Component({
186 186 is_new: th.data.is_new,
187 187 pageSize: th.data.goodscount,
188 188 page: th.data.currentPage,
  189 + isonsale: 1,
189 190 }
190 191 }).then(res => {
191 192 //商品地址
... ... @@ -260,6 +261,7 @@ Component({
260 261 gpid: wgroup,
261 262 pageSize: th.data.goodscount,
262 263 page: th.data.currentPage,
  264 + isonsale: 1,
263 265 }
264 266 }).then(res => {
265 267 //商品地址
... ...
pages/giftpack/birthdaygift/birthdaygift.wxml
  View file @60bf701
... ... @@ -9,7 +9,7 @@
9 9 <text>______</text>
10 10 </view>
11 11 <view class="top_box_text">
12   - <text>新人专享\n你的美丽我来缔造</text>
  12 + <text>生日专享\n你的美丽我来缔造</text>
13 13 </view>
14 14 <view class="top_box_text">
15 15 <text>______</text>
... ... @@ -41,7 +41,7 @@
41 41 <text>{{item.fromName}}</text>
42 42 </block>
43 43 <block wx:if="{{item.lbType==3}}">
44   - <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
  44 + <text>{{"生日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
45 45 </block>
46 46 <view class="num flex-level-right fs26">
47 47 <view>数量：</view>
... ... @@ -67,7 +67,7 @@
67 67 <text>———</text>
68 68 </view>
69 69 <view class="top_box_text ">
70   - <text>新人专享优惠券</text>
  70 + <text>生日专享优惠券</text>
71 71 </view>
72 72 <view class="top_box_text ">
73 73 <text>———</text>
... ... @@ -99,8 +99,8 @@
99 99 </block>
100 100 <block wx:else>
101 101 <view class="top_card_counte ">{{item.sum+"元券"}}</view>
102   - <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
103 102 </block>
  103 + <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
104 104 </view>
105 105 </view>
106 106 </block>
... ... @@ -121,7 +121,7 @@
121 121 <text>———</text>
122 122 </view>
123 123 <view class="top_box_text ">
124   - <text>新人专享福利</text>
  124 + <text>生日专享福利</text>
125 125 </view>
126 126 <view class="top_box_text ">
127 127 <text>———</text>
... ... @@ -172,7 +172,7 @@
172 172 </view>
173 173 </block>
174 174 <block wx:else>
175   - <view class="foot_button_buy'}}" bindtap="GetReceive">
  175 + <view class="foot_button_buy'}}" bindtap="GetReceive">
176 176 <text>一键全部领取</text>
177 177 </view>
178 178 </block>
... ...
pages/giftpack/evaluategift/evaluategift.wxml
  View file @60bf701
... ... @@ -9,7 +9,7 @@
9 9 <text>______</text>
10 10 </view>
11 11 <view class="top_box_text">
12   - <text>新人专享\n你的美丽我来缔造</text>
  12 + <text>评价专享\n你的美丽我来缔造</text>
13 13 </view>
14 14 <view class="top_box_text">
15 15 <text>______</text>
... ... @@ -41,7 +41,7 @@
41 41 <text>{{item.fromName}}</text>
42 42 </block>
43 43 <block wx:if="{{item.lbType==3}}">
44   - <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
  44 + <text>{{"评价可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
45 45 </block>
46 46 <view class="num flex-level-right fs26">
47 47 <view>数量：</view>
... ... @@ -67,7 +67,7 @@
67 67 <text>———</text>
68 68 </view>
69 69 <view class="top_box_text ">
70   - <text>新人专享优惠券</text>
  70 + <text>评价专享优惠券</text>
71 71 </view>
72 72 <view class="top_box_text ">
73 73 <text>———</text>
... ... @@ -94,13 +94,13 @@
94 94 <view class="top_card_tite_a">分类限定</view>
95 95 </block>
96 96 </view>
97   - <block wx:if="{{item.isPack!=null}}">
  97 + <block wx:if="{{item.isPack!=null}}">
98 98 <view class="top_card_counte">包邮券</view>
99 99 </block>
100   - <block>
101   - <view class="top_card_counte ">{{item.sum+"元券"}}</view>
102   - <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
  100 + <block wx:else>
  101 + <view class="top_card_counte ">{{item.sum+"元券"}}</view>
103 102 </block>
  103 + <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
104 104 </view>
105 105 </view>
106 106 </block>
... ... @@ -121,7 +121,7 @@
121 121 <text>———</text>
122 122 </view>
123 123 <view class="top_box_text ">
124   - <text>新人专享福利</text>
  124 + <text>评价专享福利</text>
125 125 </view>
126 126 <view class="top_box_text ">
127 127 <text>———</text>
... ...
pages/giftpack/festival/festival.wxml
  View file @60bf701
... ... @@ -9,7 +9,7 @@
9 9 <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
10 10 </view>
11 11 <view class="top_box_text">
12   - <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享\n你的美丽我来缔造</text>
  12 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享\n你的美丽我来缔造</text>
13 13 </view>
14 14 <view class="top_box_text">
15 15 <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
... ... @@ -41,7 +41,7 @@
41 41 <text>{{item.fromName}}</text>
42 42 </block>
43 43 <block wx:if="{{item.lbType==3}}">
44   - <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
  44 + <text>{{"节日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
45 45 </block>
46 46 <view class="num flex-level-right fs26" style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
47 47 <view>数量：</view>
... ... @@ -67,7 +67,7 @@
67 67 <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
68 68 </view>
69 69 <view class="top_box_text ">
70   - <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享优惠券</text>
  70 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享优惠券</text>
71 71 </view>
72 72 <view class="top_box_text ">
73 73 <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
... ... @@ -94,7 +94,12 @@
94 94 <view class="top_card_tite_a">分类限定</view>
95 95 </block>
96 96 </view>
97   - <view class="top_card_counte ">{{item.sum+"元券"}}</view>
  97 + <block wx:if="{{item.isPack!=null}}">
  98 + <view class="top_card_counte">包邮券</view>
  99 + </block>
  100 + <block wx:else>
  101 + <view class="top_card_counte ">{{item.sum+"元券"}}</view>
  102 + </block>
98 103 <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
99 104 </view>
100 105 </view>
... ... @@ -116,7 +121,7 @@
116 121 <text>———</text>
117 122 </view>
118 123 <view class="top_box_text ">
119   - <text>新人专享福利</text>
  124 + <text>节日专享福利</text>
120 125 </view>
121 126 <view class="top_box_text ">
122 127 <text>———</text>
... ...
pages/user/assistance/assistance.js
  View file @60bf701
... ... @@ -111,9 +111,7 @@ Page({
111 111 th.setData({
112 112 is_load: 1
113 113 })
114   -
115 114 if (res.data.code == 0) {
116   -
117 115 var list = th.data.zl_user_list;
118 116 //连接数组
119 117 list = list.concat(res.data.data.pageData);
... ... @@ -170,13 +168,14 @@ Page({
170 168  
171 169 // 领取礼包
172 170 get_libao: function(e) {
173   - var libao_id = e.currentTarget.dataset.libaoid;
174   - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
  171 + var help_id = e.currentTarget.dataset.help_id;
  172 + var taskId = e.currentTarget.dataset.taskid;//任务id
  173 + getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId);
175 174 },
176 175  
177 176 //查看礼包id
178 177 select_libao: function() {
179   - var orderSn = e.currentTarget.dataset.orderSn;//订单号
  178 + var orderSn = e.currentTarget.dataset.orderSn; //订单号
180 179 getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
181 180 }
182 181  
... ...
pages/user/assistance/assistance.wxml
  View file @60bf701
... ... @@ -14,9 +14,9 @@
14 14 <view class="flex-center">
15 15 <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
16 16 </view>
17   - <view class="flex-center fs26 time">
  17 + <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
18 18 <view>活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
19   -
  19 +
20 20 </view>
21 21 <view class="flex-center" bindtap="go_task">
22 22 <view class="flex-center take">
... ... @@ -43,24 +43,24 @@
43 43 <!-- 我的任务 -->
44 44 <view wx:if="{{switch_head==0}}" class="white">
45 45 <view class="items">
46   - <view class="tesk_list">
47   - <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
48   - <view class="flex-center width">
49   - <view class="ellipsis-1">{{item.helpTaskName}}</view>
50   - </view>
  46 + <view class="tesk_list">
  47 + <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
  48 + <view class="flex-center width">
  49 + <view class="ellipsis-1">{{item.helpTaskName}}</view>
  50 + </view>
51 51  
52   - <!-- 已完成的颜色nostate -->
53   - <view class="flex-center width state" wx:if="{{item.status==1}}">
54   - <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包</view>
55   - </view>
56   - <view class="flex-center width state" wx:if="{{item.status==0}}">
57   - <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
58   - </view>
59   - <view class="flex-center width state" wx:if="{{item.status==2}}">
60   - <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
61   - </view>
  52 + <!-- 已完成的颜色nostate -->
  53 + <view class="flex-center width state" wx:if="{{item.status==1}}">
  54 + <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view>
  55 + </view>
  56 + <view class="flex-center width state" wx:if="{{item.status==0}}">
  57 + <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
  58 + </view>
  59 + <view class="flex-center width state" wx:if="{{item.status==2}}">
  60 + <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
  61 + </view>
62 62  
63   - </view>
  63 + </view>
64 64 </view>
65 65 <!-- 加载更多 -->
66 66 <block wx:if="{{is_show_more==0}}">
... ... @@ -78,8 +78,8 @@
78 78 <view>暂无任务记录</view>
79 79 </view>
80 80 <view class="flex-center receive" wx:if="{{is_load && s_num}}">
81   - <view class="flex-center">
82   - <view>已有 {{s_num}}人领取了任务</view>
  81 + <view class="flex-center ai-bas">
  82 + <view>已有{{s_num}}人领取了任务</view>
83 83 </view>
84 84  
85 85 </view>
... ...
pages/user/assistance/assistance.wxss
  View file @60bf701
... ... @@ -116,6 +116,8 @@ page {
116 116  
117 117 .item {
118 118 margin-bottom: 35rpx;
  119 + display: flex;
  120 + align-items: baseline;
119 121 }
120 122  
121 123 .state {
... ...
pages/user/assistance/friend_assistance.js
  View file @60bf701
... ... @@ -28,18 +28,20 @@ Page({
28 28 */
29 29 onLoad: function(options) {
30 30 var th = this;
  31 +
31 32 if (options.tasking) this.data.tasking = options.tasking;
32 33 if (options.userId) this.data.userId = options.userId;
33 34 //任务是不是为空
34 35 if (this.data.tasking == 0 || this.data.tasking == undefined) {
35 36 this.data.tasking = decodeURIComponent(options.scene);
36 37 }
37   -
  38 +
38 39 if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
39 40 0) {
  41 +
40 42 getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
41 43 data: {
42   - id: th.data.tasking,
  44 + taskingId: th.data.tasking,
43 45 storeId: os.stoid
44 46 }
45 47 }).then(res => {
... ... @@ -97,6 +99,7 @@ Page({
97 99 cklie_button: function() {
98 100 var th = this;
99 101 var t_user_id = app_d.user_id;
  102 + t_user_id = 1433320;
100 103 var data = {
101 104 id: this.data.tasking,
102 105 storeId: os.stoid,
... ...
pages/user/assistance/friend_assistance.wxml
  View file @60bf701
... ... @@ -3,7 +3,7 @@
3 3 <view class="flex-vertical user_assis">
4 4 <image class="circle user_img" src="{{user.head_pic}}" lazy-load="true"></image>
5 5 <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view>
6   - </view>
  6 + </view>
7 7 <view class="caption_title white fs32 t-c">
8 8 拜托拜托，帮我拆礼盒得好礼~
9 9 </view>
... ... @@ -14,7 +14,7 @@
14 14 </view>
15 15 <view class="flex jc-center">
16 16 <view class="activity_time fs24 white">
17   - 活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.beginDate)}}
  17 + 活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
18 18 </view>
19 19 </view>
20 20 </view>
... ...
pages/user/assistance/giftpacklist.js
  View file @60bf701
... ... @@ -49,10 +49,11 @@ Page({
49 49 }
50 50 if (options.is_libao == 1) {
51 51 th.setData({
52   - giftBagId: options.libao_id,
  52 + held_id: options.help_id,
  53 + taskId: options.taskId,
53 54 is_type: 1
54 55 })
55   - th.GetBuyGiftList();
  56 + th.help();
56 57 }
57 58 if (options.order_sn) {
58 59 th.setData({
... ... @@ -61,14 +62,11 @@ Page({
61 62 })
62 63 th.GetMyGiftList();
63 64 }
  65 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  66 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
64 67 },
65 68 onShow: function() {
66   - var th = this;
67   - var is_read = th.data.is_read;
68   - if (is_read){
69   - var nav_b = th.selectComponent("#nav_b"); //组件的id
70   - nav_b.set_name("助力", "/pages/user/assistance/assistance");
71   - }
  69 +
72 70 },
73 71 //助力活动查看礼包详情调用
74 72 help: function(e) {
... ... @@ -204,9 +202,9 @@ Page({
204 202 is_sub: 1
205 203 })
206 204 var json = {
207   - "actId": th.data.held_id, //活动Id
  205 + "actId": th.data.taskId, //活动Id
208 206 "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
209   - "giftBagId": th.data.giftBagId, //礼包Id
  207 + "giftBagId": 1, //礼包Id
210 208 "storeId": a.stoid, //商家Id
211 209 "userId": d.user_id //用户ID
212 210 };
... ...
pages/user/assistance/giftpacklist.wxml
  View file @60bf701
... ... @@ -141,4 +141,4 @@
141 141 <!-- 弹出框扫描 -->
142 142 <qr_code id="qc_com"></qr_code>
143 143 <!-- 制作一个圆球导航 -->
144   -<nav_b wx:if="{{is_head}}" id="nav_b"></nav_b>
145 144 \ No newline at end of file
  145 +<nav_b id="nav_b"></nav_b>
146 146 \ No newline at end of file
... ...
pages/user/assistance/task_assistance.js
  View file @60bf701
... ... @@ -9,7 +9,6 @@ var e = getApp(),
9 9 app_d = e.globalData;
10 10 var regeneratorRuntime = require('../../../utils/runtime.js');
11 11 Page({
12   -
13 12 /**
14 13 * 页面的初始数据
15 14 */
... ... @@ -44,15 +43,13 @@ Page({
44 43 screenWidth: "", //用户的屏幕宽度
45 44 gid: "",
46 45 images: ["miniapp/images/friendhelp/help.png", "miniapp/images/friendhelp/background.png", "miniapp/images/friendhelp/no_check.png",
47   - "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/unfinished.png",
48   - "/public/upload/libao/temp/2019/12-20/51f251f44ea0f67b8efdc5bfa3a434b0.jpg"
  46 + "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/unfinished.png","miniapp/images/xc_ellipsis.png"
49 47 ], //固的分享图片
50 48  
51 49 dynamic: null, //已助力的微信头像数组
52 50 head_pic_arr: [], //助力的头像
53 51 share_lb_img: "", //分享的礼包图片
54 52  
55   -
56 53 is_generate: 0, //是否重复点击拆一拆
57 54 already: 0, //已有几人助力
58 55 lack: 0, //还差几人助力
... ... @@ -215,6 +212,10 @@ Page({
215 212  
216 213 //帮拆记录的
217 214 dismantle_record: function(e) {
  215 + //优化444444444444444444
  216 + if (this.data.switch_head == 1) {
  217 + return false;
  218 + }
218 219 var aitem = this.data.aitem; //任务的数据集
219 220 var sw_index = this.data.sw_index; //轮播的下标
220 221 //任务id
... ... @@ -231,7 +232,8 @@ Page({
231 232 }
232 233 this.setData({
233 234 is_task: 1,
234   - switch_head: 1
  235 + switch_head: 1,
  236 + block: 0,
235 237 });
236 238 var bc_page = th.data.bc_page;
237 239 rq.get("/api/weshop/marketing/help/help/task/involve/page", {
... ... @@ -252,7 +254,7 @@ Page({
252 254 is_bc_show: 1
253 255 })
254 256 } else {
255   - getApp().showWarning("暂无更多内容", 0, th);
  257 + getApp().my_warnning("暂无更多内容", 0, th);
256 258 }
257 259  
258 260 th.setData({
... ... @@ -270,7 +272,8 @@ Page({
270 272 // 领取礼包
271 273 get_libao: function(e) {
272 274 var libao_id = e.currentTarget.dataset.libaoid; //礼包id
273   - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
  275 + var taskid= e.currentTarget.dataset.taskid;
  276 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 +"&taskId="+taskid);
274 277 },
275 278 //查看礼包id
276 279 select_libao: function(e) {
... ... @@ -308,6 +311,8 @@ Page({
308 311 // 获取会员的参与的任务列表 我的任务
309 312 user_task_list: function(e) {
310 313 var th = this;
  314 + //防止已经当前位置的时候多次点击
  315 + if (th.data.block == 1) { return false; }
311 316 var index = 0;
312 317 var is_task = this.data.is_task; //0任务，1帮拆
313 318 if (is_task == undefined || is_task == null) {
... ... @@ -333,6 +338,7 @@ Page({
333 338 userId: user_id
334 339 },
335 340 success: function(su) {
  341 + th.setData({block:1});
336 342 if (su.data.code == 0) {
337 343 if (su.data.data.total > 5) {
338 344 var rw_page = th.data.rw_page + 1;
... ... @@ -340,14 +346,15 @@ Page({
340 346 rw_page: rw_page,
341 347 is_show: 1
342 348 })
343   - getApp().my_warnning();
344   - getApp().showWarning("暂无更多内容", 0);
  349 + getApp().my_warnning(su.data.msg, 1, th);
345 350 }
346 351  
347 352 var user_list = su.data.data.pageData;
348 353 th.setData({
349 354 user_task_list: user_list
350 355 });
  356 + } else {
  357 + getApp().my_warnning(su.data.msg, 0, th);
351 358 }
352 359 }
353 360 })
... ... @@ -646,38 +653,91 @@ Page({
646 653 ctx.drawImage(images[3], 65 * unit, 445 * unit, 320 * unit * c, 12 * unit);
647 654 var head_list_num = 30;
648 655 var is_head_list = 0;
649   - if (help_num < 8) {
650   - // 判断已助力的人数
651   -
652   - for (var a = 0; a < head_list_img.length; a++) {
653   - ctx.save();
654   - ctx.beginPath(); //开始绘制
655   - ctx.arc(left + imagesize / 2, 505 * unit, imagesize / 2, 0, 2 * Math.PI);
656   - ctx.setLineWidth(4 * unit);
657   - ctx.setStrokeStyle('red');
658   - ctx.setFillStyle("white");
659   - ctx.fill();
660   - ctx.clip();
661   - ctx.drawImage(head_list_img[a], left , 505 * unit - imagesize / 2, imagesize, imagesize);
662   - ctx.restore();
663   - left += imagesize + spacing;
664   - }
665   - //这个是还未助力的位置
666   - for (var i = 0; i < q_num; i++) {
667   - // 助力人的头像
668   - ctx.drawImage(images[4], left , 505 * unit - imagesize / 2, imagesize, imagesize); //分享的背景图片
669   - left += imagesize + spacing;
670   - }
671   - }
672   -
673   -
  656 +
  657 + //当需要助力人数小与6个
  658 + if (help_num < 6) {
  659 + var pos_arr=ut.get_box_arr(help_num,225.25*unit,505 * unit,spacing,imagesize / 2);
  660 + var now_ind=0;
  661 + //--判断已助力的人数--
  662 + for (var a = 0; a < head_list_img.length; a++) {
  663 + var pos= pos_arr[now_ind];
  664 + ut.draw_circle(ctx,pos.x, pos.y, imagesize / 2,head_list_img[a],'red',unit);
  665 + now_ind++;
  666 + }
  667 + //--显示还差的人数--
  668 + if(help_num-head_list_img.length>0){
  669 + var neednum=help_num-head_list_img.length;
  670 + //这个是还未助力的位置
  671 + for (var i = 0; i < neednum; i++) {
  672 + var pos= pos_arr[now_ind];
  673 + now_ind++;
  674 + // 助力人的头像
  675 + ctx.drawImage(images[4], pos.x-imagesize/2, pos.y-imagesize/2,imagesize, imagesize); //分享的背景图片
  676 +
  677 + }
  678 + }
  679 +
  680 + }else if(help_num>7){
  681 + //助力头像数量, 是不是要显示省略图
  682 + var zl_head=0,is_sheng=0;
  683 + if(head_list_img.length>=6) {
  684 + zl_head=5;is_sheng=1;
  685 + }else{
  686 + zl_head=head_list_img.length;
  687 + }
  688 +
  689 +
  690 + //判断已助力的人数
  691 + for (var a = 0; a < zl_head; a++) {
  692 + //绘制头像
  693 + ut.draw_circle(ctx,left + imagesize / 2, 505 * unit, imagesize / 2,head_list_img[a],'red',unit);
  694 + left += imagesize + spacing;
  695 + }
  696 +
  697 + //如果是省略号的话
  698 + if(is_sheng){
  699 + ctx.drawImage(images[5], left , 505 * unit - imagesize / 2, imagesize, imagesize); //头像的省略图片
  700 + }else{
  701 + //这个是还未助力的位置
  702 + for (var i = 0; i < 6-head_list_img.length; i++) {
  703 + // 助力人的头像
  704 + ctx.drawImage(images[4], left , 505 * unit - imagesize / 2, imagesize, imagesize); //分享的?号图片
  705 + left += imagesize + spacing;
  706 + }
  707 + }
  708 + }else{
  709 + // 判断已助力的人数
  710 + for (var a = 0; a < head_list_img.length; a++) {
  711 + ctx.save();
  712 + ctx.beginPath(); //开始绘制
  713 + ctx.arc(left + imagesize / 2, 505 * unit, imagesize / 2, 0, 2 * Math.PI);
  714 + ctx.setLineWidth(4 * unit);
  715 + ctx.setStrokeStyle('red');
  716 + ctx.setFillStyle("white");
  717 + ctx.fill();
  718 + ctx.clip();
  719 + ctx.drawImage(head_list_img[a], left , 505 * unit - imagesize / 2, imagesize, imagesize);
  720 + ctx.restore();
  721 + left += imagesize + spacing;
  722 + }
  723 +
  724 + if(help_num-head_list_img.lengt>0){
  725 + var neednum=help_num-head_list_img.length;
  726 + //这个是还未助力的位置
  727 + for (var i = 0; i < neednum; i++) {
  728 + // 助力人的头像
  729 + ctx.drawImage(images[4], left , 505 * unit - imagesize / 2, imagesize, imagesize); //分享的背景图片
  730 + left += imagesize + spacing;
  731 + }
  732 + }
  733 +
  734 + }
674 735  
675 736 ctx.setFillStyle("rgb(255,255,255)");
676 737 ctx.setFontSize(size);
677 738 ctx.fillText("优惠乐翻天，精彩就在你身边!", 37 * unit, 595 * unit);
678 739 ctx.setFillStyle("rgb(255,255,255)");
679 740 ctx.setFontSize(size);
680   -
681 741 ctx.fillText(act_time, 37 * unit, 620 * unit); //绘制活动是时间
682 742 ctx.setFillStyle("rgb(255,255,255)");
683 743 ctx.setFontSize(size);
... ... @@ -825,7 +885,6 @@ Page({
825 885 info_head: async function(func) {
826 886 var th = this;
827 887 var images = th.data.dynamic.zlHelpUser;
828   - console.log(images,"图片长度", images.length);
829 888 var arr = new Array();
830 889 var block = th.data.block;
831 890 if (images) {
... ... @@ -839,19 +898,26 @@ Page({
839 898 }
840 899 func();
841 900 },
842   -
  901 +//立即兑换
  902 + redeem_now: function (e) {
  903 + var libao_id = e.currentTarget.dataset.libaoid;
  904 + var taskid = e.currentTarget.dataset.taskid;
  905 + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskid);
  906 + },
843 907  
844 908  
845 909 //礼包的详情 轮播图
846 910 libao_details: function(e) {
847 911 var th = this;
848 912 var help_id = th.data.help_id; //活动id
849   - var taskId = th.data.taskid; //任务id
  913 + var taskId = e.currentTarget.dataset.taskid; //任务id
850 914 getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
851 915 },
852   - //正在进行任务
853   - test: function(e) {
854   - getApp().goto("/pages/user/assistance/friend_assistance?tasking=13");
  916 + //测试正在进行任务
  917 + test: function (e) {
  918 + var taskid = e.currentTarget.dataset.taskid;
  919 + var uset_id = this.data.zlisuers_id;
  920 + getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taskid + "&userId=" + uset_id);
855 921 },
856 922  
857 923 })
858 924 \ No newline at end of file
... ...
pages/user/assistance/task_assistance.wxml
  View file @60bf701
... ... @@ -23,7 +23,7 @@
23 23 <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
24 24 <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
25 25  
26   - <image class="xc-center-img" bindtap="libao_details" src="{{iurl+aitem.giftBagUrl}}"></image>
  26 + <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}" src="{{iurl+aitem.giftBagUrl}}"></image>
27 27 <view class="abs select_details fs26 white">礼包详情</view>
28 28  
29 29 </swiper-item>
... ... @@ -49,16 +49,21 @@
49 49 <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke">
50 50 就选它了
51 51 </view>
52   - <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
  52 + <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
53 53 好友拆一拆
54 54 </view>
55   - <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test" >
56   - 测试专用
  55 + <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskid="{{is_user_task.id}}" bindtap="redeem_now">
  56 + 立即兑换
  57 + </view>
  58 + <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test">
  59 + <!-- <input placeholder="请输助力用户的id" maxlength="11" bindblur="testinput"></input>
  60 + <view ></view> -->
  61 + 测试专用
57 62 </view>
58 63  
59 64 </view>
60 65 <!-- 底部列表 -->
61   -<view style="margin-top:{{is_user_task!=null?130:35}}rpx">
  66 +<view style="margin-top:{{is_user_task!=null?52:0}}rpx">
62 67 <!-- 标题 -->
63 68  
64 69 <view class="flex-vertical-between fs28 padding head">
... ... @@ -73,9 +78,9 @@
73 78 </view>
74 79  
75 80 <view class="white">
76   -
  81 +
77 82 <view class="items" wx:if="{{is_task==0}}">
78   -
  83 + <view class="tesk_list">
79 84 <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" wx:key="*this">
80 85 <view class="flex-center width">
81 86 <view class="ellipsis-1">{{item.helpTaskName}}
... ... @@ -85,10 +90,10 @@
85 90 <view class="ellipsis-1">
86 91 <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
87 92 <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
88   - <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包 </text>
  93 + <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskid="{{item.id}}">领取礼包 </text>
89 94 </view>
90   - </view>
91   -
  95 + </view>
  96 + </view>
92 97 </view>
93 98  
94 99 <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
... ...
pages/user/assistance/task_assistance.wxss
  View file @60bf701
... ... @@ -5,10 +5,15 @@ page {
5 5  
6 6 }
7 7  
8   -
  8 +.tesk_list{
  9 + width: 100%;
  10 + max-height: 335rpx;
  11 + overflow: hidden;
  12 + overflow-y:auto;
  13 +}
9 14 .top-back {
10 15 width: 100%;
11   - height:70%;
  16 + height:65%;
12 17 background-repead: no-repead;
13 18 background-size: 100% 100%;
14 19 }
... ...
utils/util.js
  View file @60bf701
... ... @@ -322,6 +322,28 @@ function get_box_arr(num,x,y,sp,r){
322 322 if(num==5) return [{x:x-2*sp-4*r,y:y},{x:x-sp-2*r,y:y},{x:x,y:y},{x:x+sp+2*r,y:y},{x:x+2*sp+4*r,y:y}];
323 323 }
324 324  
  325 +/**
  326 + * @param {Object} ctx 画图句柄
  327 + * @param {Object} x x坐标
  328 + * @param {Object} y y坐标
  329 + * @param {Object} img 画的图片
  330 + * @param {Object} color 边框的颜色
  331 + */
  332 +
  333 +function draw_circle(ctx,x,y,r,img,color,unit){
  334 + ctx.save();
  335 + ctx.beginPath(); //开始绘制
  336 + ctx.arc(x,y,r,0,2 * Math.PI);
  337 + ctx.setLineWidth(4 * unit);
  338 + ctx.setStrokeStyle('red');
  339 + ctx.setFillStyle("white");
  340 + ctx.fill();
  341 + ctx.clip();
  342 + ctx.drawImage(img,x-r,y-r,2*r,2*r);
  343 + ctx.restore();
  344 +}
  345 +
  346 +
325 347 function null_promise(){
326 348 var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
327 349 }
... ... @@ -425,4 +447,5 @@ module.exports = {
425 447 draw_randon_rect:draw_randon_rect ,//画图画圆角矩形
426 448 null_promise:null_promise,//返回空的promise
427 449 get_box_arr:get_box_arr,//返回圆的数组
  450 + draw_circle:draw_circle,//绘制圆
428 451 };
... ...