wxd / MShopWeApp

Commit 6dea3e71fb0b49a46de1234429c6535151a24a01

Authored by 后端开发-许程
1 parent 855339c2

助力修改

Inline Side-by-side
Showing 4 changed files with 27 additions and 14 deletions
pages/user/assistance/friend_assistance.js
  View file @6dea3e7
... ... @@ -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 @6dea3e7
... ... @@ -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/task_assistance.wxml
  View file @6dea3e7
... ... @@ -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}}" 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}}
... ... @@ -87,8 +92,8 @@
87 92 <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
88 93 <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包 </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 @6dea3e7
... ... @@ -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 }
... ...