Commit 1d9f590a1b01242f5dca5efcdbbc3af8da363fd9

Authored by yvan.ni
2 parents 2b2c83fe 164f1c27

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

components/nav_b/nav_b.wxss
... ... @@ -22,6 +22,7 @@
22 22 text-align: center;
23 23 width: 80rpx;
24 24 height: 80rpx;
  25 + line-height: 66rpx;
25 26 color: #ffff;
26 27 font-size: 50rpx;
27 28 background: none;
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
... ... @@ -134,7 +134,7 @@
134 134 <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
135 135 <text class="data-v-3a5b7e36">立即使用</text>
136 136 </view>
137   - <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
  137 + <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
138 138 <text class="data-v-3a5b7e36">商品已核销</text>
139 139 </view>
140 140 <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
... ...
pages/user/assistance/assistance.js
... ... @@ -34,7 +34,7 @@ Page({
34 34 onLoad: function(options) {
35 35 var th = this;
36 36 var nav_b = th.selectComponent("#nav_b"); //组件的id
37   - nav_b.set_name("助力", "");
  37 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
38 38 // 助力活动
39 39 this.assistance();
40 40 },
... ... @@ -83,11 +83,9 @@ Page({
83 83  
84 84 //--点击获取用户任务列表--会员的任务列表
85 85 get_list:function() {
86   -
87   -
  86 +
88 87 var th = this;
89 88 var page=th.data.page;
90   - console.log("page是什么", page);
91 89 var help_id=this.data.help_id;
92 90 t.request.get("/api/weshop/marketing/help/help/user/page", {
93 91 data: {
... ... @@ -107,33 +105,32 @@ Page({
107 105  
108 106  
109 107 if (res.data.code == 0) {
110   - var page=th.data.page+1;
  108 +
111 109 var list = th.data.zl_user_list;
112 110 //连接数组
113 111 list = list.concat(res.data.data.pageData);
114 112 th.setData({
115 113 zl_user_list: list,
116 114 is_load: 1,
117   - page: page
118 115 });
119 116 if (res.data.data.total <= 5) {
120 117 th.setData({
121 118 is_show_more: 1
122 119 })
  120 + }else{
  121 + var page = th.data.page + 1;
  122 + th.setData({
  123 + is_show_more: 0,
  124 + page: page
  125 + })
123 126 }
124   - // var n_all_num = th.data.cur_page * th.data.page_num;
125   - // if (res.data.data.total > n_all_num) th.setData({
126   - // is_show_more: 1
127   - // })
128   - // else th.setData({
129   - // is_show_more: 0
130   - // })
131   - //页吗要更新一下
132   - // th.data.cur_page++;
  127 +
133 128 } else {
134   - getApp().showWarning("暂无更多内容");
  129 +
  130 + getApp().showWarning("暂无更多内容",0);
135 131 th.setData({
136   - is_show_more: 1
  132 + is_show_more: 1,
  133 + page: page
137 134 })
138 135 }
139 136  
... ...
pages/user/assistance/assistance_success.json
1 1 {
  2 + "navigationBarTitleText": "好友助力,得好礼",
  3 + "navigationStyle": "custom",
2 4 "usingComponents": {
3 5 "warn": "/components/long_warn/long_warn",
4 6 "my_confirm": "/components/my_confirm/my_confirm",
... ...
pages/user/assistance/friend_assistance.js
... ... @@ -131,7 +131,7 @@ Page({
131 131 var th = this;
132 132 var nav_b = th.selectComponent("#nav_b"); //组件的id
133 133 nav_b.close_box();
134   - nav_b.set_name("助力", "");
  134 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
135 135 },
136 136  
137 137 /**
... ...
pages/user/assistance/friend_assistance.json
1 1 {
  2 + "navigationBarTitleText": "好友助力,得好礼",
  3 + "navigationStyle": "custom",
2 4 "usingComponents": {
3 5 "warn": "/components/long_warn/long_warn",
4 6 "my_confirm": "/components/my_confirm/my_confirm",
... ...
pages/user/assistance/giftpacklist.js
... ... @@ -31,38 +31,117 @@ Page({
31 31 receiveState: 0, //0未领取 1已领取
32 32 completeid: "",
33 33 is_sub: 0, //判断是否重复提交
  34 + is_libao: 0, //0轮播查看活动 1领取礼包 2.查看礼包详情
  35 + held_id: "", //活动id
  36 + taskId: "", //任务id
  37 + orderSn: "", //订单号
34 38 },
35 39 onLoad: function(options) {
36 40 var th = this;
37   - th.setData({
38   - getGiftID: 100, // options.libao_id,
39   - completeid: options.completeid,
40   - orderSn: options.orderSn
41   - })
42 41 if (options.is_libao == 0) {
43   - th.GetMyGiftList();
44   - } else {
  42 + th.setData({
  43 + held_id: options.help_id, //options.help_id
  44 + taskId: options.taskId, //options.libao_id
  45 + })
  46 + th.help();
  47 + }
  48 + if (options.is_libao == 1) {
  49 + th.setData({
  50 + taskId: options.libao_id,
  51 + held_id: options.held_id
  52 + })
45 53 th.GetBuyGiftList();
46 54 }
47   - // th.setData({
48   - // giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
49   - // })
  55 + if (options.order_sn) {
  56 + th.setData({
  57 + orderSn: options.orderSn
  58 + })
  59 + th.GetMyGiftList();
  60 + }
50 61 th.close();
51 62 },
52 63 onShow: function() {
53 64  
54 65 },
  66 + //助力活动查看礼包详情调用
  67 + help: function(e) {
  68 + var th = this;
  69 + var url = "/api/weshop/marketing/giftbag/help/get";
  70 + getApp().request.promiseGet(url, {
  71 + isShowLoading: true,
  72 + data: {
  73 + helpId: th.data.held_id,
  74 + storeId: a.stoid,
  75 + taskId: th.data.taskId
  76 + }
  77 + }).then(res => {
  78 + if (res.data.code == 0) {
  79 + th.setData({
  80 + giftImage: th.data.iurl + res.data.data.lbUrl,
  81 + giftTitle: res.data.data.giftTitle
  82 + })
  83 + if (res.data.data.giftRemark == '') {
  84 + th.setData({
  85 + giftRemark: '暂无详情......'
  86 + })
  87 + } else {
  88 + th.setData({
  89 + giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block"')
  90 + })
  91 + }
  92 +
  93 + // //---获取日期的时间戳---
  94 + // var t_endtime = res.data.data.endTime;
  95 + // t_endtime = t_endtime.replace(/-/g, '/');
  96 + // var t_date = new Date(t_endtime) / 1000;
  97 + // var t_now = ut.gettimestamp();
55 98  
  99 + // if (res.data.data.goodsUseState) th.setData({
  100 + // c_state: 1
  101 + // })
  102 + // else if (t_date <= t_now)
  103 + // th.setData({
  104 + // c_state: 2
  105 + // })
  106 +
  107 + th.setData({
  108 + giftDate: res.data.data.endTime,
  109 + giftPosPrice: res.data.data.giftPosPrice,
  110 + giftQty: res.data.data.giftQty,
  111 + giftIntegral: res.data.data.payIntegral,
  112 + giftPrice: res.data.data.payMoney,
  113 + giftType: res.data.data.actType,
  114 + actTitle: res.data.data.actTitle,
  115 + wareCard: res.data.data.wareCard,
  116 + lbId: res.data.data.lbId
  117 + })
  118 + //判断是否有礼包
  119 + for (var i = 0; i < res.data.data.wareCard.length; i++) {
  120 + if (res.data.data.wareCard[i].lbType == 1) {
  121 + th.setData({
  122 + is_lb: 1
  123 + })
  124 + break;
  125 + }
  126 + }
  127 + } else {
  128 + getApp().my_warnning(res.data.msg, 0, th);
  129 + return false;
  130 + }
  131 +
  132 + })
  133 + },
56 134 GetMyGiftList: function() {
57 135 var _this = this;
58 136 var th = this;
59 137 getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
  138 + isShowLoading: true,
60 139 data: {
61 140 "storeId": a.stoid, //商家ID
62 141 "userId": d.user_id, //用户ID
63 142 "orderSn": th.data.orderSn
64 143 },
65   - success: function success(res) {
  144 + success: function(res) {
66 145 if (res.data.code == 0) {
67 146 th.setData({
68 147 giftImage: th.data.iurl + res.data.data.lbUrl,
... ... @@ -74,7 +153,7 @@ Page({
74 153 })
75 154 } else {
76 155 th.setData({
77   - giftRemark: res.data.data.giftRemark
  156 + giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block"')
78 157 })
79 158 }
80 159  
... ... @@ -132,7 +211,7 @@ Page({
132 211 })
133 212 var json = {
134 213 "actId": th.data.completeid, //活动Id
135   - "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
  214 + "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
136 215 "giftBagId": th.data.giftID, //礼包Id
137 216 "storeId": a.stoid, //商家Id
138 217 "userId": d.user_id //用户ID
... ... @@ -164,17 +243,14 @@ Page({
164 243 GetBuyGiftList: function() {
165 244 var _this2 = this;
166 245 var th = this.data;
167   - wx.showLoading({
168   - title: '加载中'
169   - })
170 246 getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
  247 + isShowLoading: true,
171 248 data: {
172 249 "storeId": a.stoid, //商家ID
173 250 "userId": d.user_id, //用户ID
174   - "giftBagId": th.getGiftID
  251 + "giftBagId": th.taskId
175 252 },
176 253 success: function(res) {
177   - wx.hideLoading();
178 254 if (res.data.code == 0) {
179 255 _this2.setData({
180 256 giftImage: th.iurl + res.data.data.lbUrl,
... ... @@ -187,10 +263,9 @@ Page({
187 263 })
188 264 } else {
189 265 _this2.setData({
190   - giftRemark: res.data.data.giftRemark
  266 + giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block"')
191 267 })
192 268 }
193   -
194 269 _this2.setData({
195 270 giftDate: res.data.data.endTime,
196 271 giftPosPrice: res.data.data.giftPosPrice,
... ... @@ -231,14 +306,8 @@ Page({
231 306 };
232 307 var data = JSON.stringify(json);
233 308 var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
234   - wx.request({
235   - url: url,
236   - data: data,
237   - method: 'put',
238   - header: {
239   - 'content-type': 'application/json'
240   - }, // 设置请求的 header
241   - success: function(res) {
  309 + getApp().request.json_post(url, json,
  310 + function(res) {
242 311 if (res.data.code == 0) {
243 312 th.setData({
244 313 code: res.data.data
... ... @@ -247,8 +316,15 @@ Page({
247 316 } else {
248 317 getApp().my_warnning(res.data.msg, 0, th);
249 318 }
250   - }
251   - })
  319 + },
  320 + function(res) {
  321 +
  322 + }, "put"
  323 +
  324 + )
  325 +
  326 +
  327 +
252 328 },
253 329 //界面跳转
254 330 goto: function(e) {
... ...
pages/user/assistance/giftpacklist.wxml
... ... @@ -6,7 +6,7 @@
6 6 <view class="top_title data-v-3a5b7e36">
7 7 <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
8 8 </view>
9   - <view class="top_time data-v-3a5b7e36">
  9 + <view wx:if="{{giftDate}}" class="top_time data-v-3a5b7e36">
10 10 <text class="data-v-3a5b7e36">{{"兑换截至时间:"+giftDate}}</text>
11 11 </view>
12 12 <view class="top_price data-v-3a5b7e36">
... ... @@ -67,7 +67,7 @@
67 67 </view>
68 68 <view class="box_ware_code data-v-3a5b7e36">
69 69 <block wx:if="{{c_state==0}}">
70   - <block wx:if="{{isBuy==0&item.lbType==1}}">
  70 + <block wx:if="{{item.lbType==1}}">
71 71 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
72 72 </block>
73 73 </block>
... ... @@ -76,13 +76,13 @@
76 76 <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
77 77 </block>
78 78 </block>
79   - <block wx:if="{{isBuy==0&item.lbType==2}}">
  79 + <block wx:if="{{item.lbType==2}}">
80 80 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
81 81 </block>
82   - <block wx:if="{{isBuy==0&item.lbType==3}}">
  82 + <block wx:if="{{item.lbType==3}}">
83 83 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
84 84 </block>
85   - <block wx:if="{{isBuy==0&item.lbType>3}}">
  85 + <block wx:if="{{item.lbType>3}}">
86 86 <text class="data-v-3a5b7e36">奖励已发放</text>
87 87 </block>
88 88 </view>
... ... @@ -95,7 +95,7 @@
95 95 <text class="data-v-3a5b7e36">活动说明</text>
96 96 </view>
97 97 <view class="foot_box_remark data-v-3a5b7e36">
98   - <rich-text nodes="{{giftRemark}}"></rich-text>
  98 + <rich-text nodes="{{giftRemark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
99 99 </view>
100 100 </view>
101 101 <view class="foot_empty data-v-3a5b7e36"></view>
... ...
pages/user/assistance/task_assistance.js
... ... @@ -32,6 +32,10 @@ Page({
32 32 dismantle: null, //帮拆记录数据集
33 33 is_user_task: null, //判断是不是领取的任务
34 34 zzjx_id: "", //真正进行的任务id
  35 + is_show:0,//任务的加载更多
  36 + is_bc_show:0,//帮拆的加载更多
  37 + bc_page:1,//帮拆的页码
  38 + rw_page:1,//任务的页码
35 39 //*********************************************start钱
36 40 canvasHidden: 0, //分享图片是否已经生成
37 41 is_share: 0, //是否显示画布
... ... @@ -77,7 +81,6 @@ Page({
77 81 add_onlicke: function(e) {
78 82 var th = this;
79 83 var taskid = e.target.dataset.taskid;
80   - console.log("任务id5555555", taskid);
81 84 var help_id = th.data.help_id;
82 85 var user_id = getApp().globalData.user_id;
83 86 var stoid = os.stoid
... ... @@ -88,10 +91,12 @@ Page({
88 91 taskId: taskid
89 92 },
90 93 function(res) {
91   -
92 94 if (res.data.code == 0) {
93   - console.log(res.data.data);
94 95 getApp().my_warnning(res.data.data, 1, th);
  96 + //判断是不是领取的任务
  97 + th.get_user_task();
  98 + //会员任务列表
  99 + th.user_task_list();
95 100 } else {
96 101 getApp().my_warnning(res.data.msg, 0, th);
97 102 }
... ... @@ -127,17 +132,18 @@ Page({
127 132 },
128 133 success: function(res) {
129 134 if (res.data.code == 0) {
130   -
131 135 var help_data = res.data.data;
132   - console.log('助力活动(判断)', res.data.data);
133 136 th.setData({
134 137 endDate: help_data.endDate,
135 138 });
136 139  
137 140 //任务时间 设置全局定时器
138   - th.data.timer = setInterval(function() {
139   - th.countDown();
140   - }, 1000);
  141 + th.setData({
  142 + timer:setInterval(function () {
  143 + th.countDown();
  144 + }, 1000)
  145 + })
  146 +
141 147  
142 148 }
143 149 }
... ... @@ -194,7 +200,7 @@ Page({
194 200  
195 201 //会员任务列表
196 202 this.user_task_list();
197   - // 获取会员的参与的任务列表 我的任务
  203 + //获取助力活动参与的人数
198 204 this.get_user_task_num();
199 205  
200 206 },
... ... @@ -210,7 +216,6 @@ Page({
210 216 var sw_index = this.data.sw_index; //轮播的下标
211 217 //任务id
212 218 var taskid = aitem[sw_index].id;
213   - console.log("任务id", taskid);
214 219 var th = this;
215 220 var index = 1; //获取当前选择的是任务还是活动说明
216 221 var is_task = this.data.is_task; //0任务,1帮拆
... ... @@ -221,24 +226,31 @@ Page({
221 226 if (switch_head == undefined || switch_head == null) {
222 227 switch_head = 1;
223 228 }
224   -
225   - console.log("0任务,1帮拆", is_task, );
226 229 this.setData({
227 230 is_task: 1,
228 231 switch_head: 1
229 232 });
  233 + var bc_page = th.data.bc_page;
230 234 rq.get("/api/weshop/marketing/help/help/task/involve/page", {
231 235 data: {
  236 + page: bc_page,
  237 + pageSize: 5,
232 238 taskId: taskid,
233 239 userId: getApp().globalData.user_id,
234 240 storeId: os.stoid
235 241 },
236 242 success: function(res) {
237   -
238 243 if (res.data.code == 0) {
239 244 var dismantle = res.data.data.pageData[0].zlHelpUser;
240   - console.log(dismantle.toString, "帮拆记录", dismantle[0].nickName);
241   -
  245 + if(res.data.data.total>5){
  246 + var bc_page = th.data.bc_page + 1;
  247 + th.data({ bc_page: bc_page,
  248 + is_bc_show:1
  249 + })
  250 + }else{
  251 + getApp().showWarning("暂无更多内容", 0);
  252 + }
  253 +
242 254 th.setData({
243 255 dismantle: dismantle
244 256 });
... ... @@ -292,13 +304,11 @@ Page({
292 304 var th = this;
293 305 var nav_b = th.selectComponent("#nav_b"); //组件的id
294 306 nav_b.close_box();
295   - nav_b.set_name("助力", "");
  307 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
296 308 },
297 309 // 获取会员的参与的任务列表 我的任务
298 310 user_task_list: function(e) {
299   -
300 311 var th = this;
301   -
302 312 var index = 0;
303 313 var is_task = this.data.is_task; //0任务,1帮拆
304 314 if (is_task == undefined || is_task == null) {
... ... @@ -314,24 +324,34 @@ Page({
314 324 });
315 325 var help_id = th.data.help_id;
316 326 var user_id = getApp().globalData.user_id;
  327 + var rw_page=th.data.rw_page;
317 328 rq.get("/api/weshop/marketing/help/help/user/page", {
318 329 data: {
  330 + page:rw_page,
  331 + pageSize:5,
319 332 helpId: help_id,
320 333 storeId: os.stoid,
321 334 userId: user_id
322 335 },
323 336 success: function(su) {
324   -
325 337 if (su.data.code == 0) {
  338 + if (su.data.data.total > 5){
  339 + th.setData({
  340 + rw_page: rw_page,
  341 + is_show: 1
  342 + })
  343 + getApp().showWarning("暂无更多内容", 0);
  344 + }else{
  345 + var rw_page = th.data.rw_page + 1;
  346 + th.setData({
  347 + rw_page: rw_page,
  348 +
  349 + })
  350 + }
326 351 var user_list = su.data.data.pageData;
327   - console.log("会员列表", user_list);
328 352 th.setData({
329 353 user_task_list: user_list
330 354 });
331   - } else {
332   - th.setData({
333   - user_task_list: null
334   - });
335 355 }
336 356 }
337 357 })
... ... @@ -342,9 +362,7 @@ Page({
342 362 var th = this;
343 363 var aitem = th.data.aitem;
344 364 var sw_index = th.data.sw_index;
345   - console.log(sw_index, "判断是否有领取任务", aitem);
346 365 var taskid = aitem[sw_index].id
347   - console.log("判断是否有领取任务 任务的id", taskid);
348 366 rq.get("/api/weshop/marketing/help/help/task/get", {
349 367 data: {
350 368 storeId: os.stoid,
... ... @@ -354,7 +372,6 @@ Page({
354 372 success: function(res) {
355 373 if (res.data.code == 0) {
356 374 var is_usertask = res.data.data;
357   - console.log('判断是不是领取的任务', is_usertask);
358 375 th.setData({
359 376 is_user_task: is_usertask
360 377 });
... ... @@ -424,7 +441,6 @@ Page({
424 441 var aitem = this.data.aitem;
425 442 var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
426 443 var task_id = aitem[index].id;
427   - console.log("轮播图点击左边");
428 444 this.setData({
429 445 sw_index: index,
430 446 task_number: task_number,
... ... @@ -446,7 +462,6 @@ Page({
446 462 var aitem = this.data.aitem;
447 463 var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
448 464 var task_id = aitem[index].id;
449   - console.log("轮播图点击右边");
450 465 this.setData({
451 466 sw_index: index,
452 467 task_number: task_number,
... ... @@ -462,8 +477,7 @@ Page({
462 477 */
463 478 onHide: function() {
464 479 //--清理定时器--
465   - console.log("清理定时器");
466   - clearInterval(this.timer);
  480 + clearInterval(this.data.timer);
467 481 },
468 482  
469 483 /**
... ... @@ -489,14 +503,13 @@ Page({
489 503 // 对结束时间进行处理渲染到页面
490 504  
491 505 // var o = endTimeList[i];
492   - var endTime = th.data.endDate
493   -
  506 + var endTime = th.data.endDate;
  507 + console.log("结束时间5555555", endTime);
494 508 // if (o.status == 0) endTime = o.start_time
495 509  
496 510 var obj = null;
497 511 // 如果活动未结束,对时间进行处理
498 512 if (endTime - newTime > 0) {
499   -
500 513 var time = (endTime - newTime);
501 514 // 获取天、时、分、秒
502 515 var day = parseInt(time / (60 * 60 * 24));
... ... @@ -518,15 +531,10 @@ Page({
518 531 sec: '00'
519 532 }
520 533 }
521   -
  534 + var txt = "aitem[" +0+ "].djs";
522 535 th.setData({
523   - djs: obj
  536 + [txt]: obj
524 537 });
525   -
526   -
527   -
528   -
529   -
530 538 },
531 539 //---小于10的格式化函数----
532 540 timeFormat(param) {
... ... @@ -1031,8 +1039,10 @@ Page({
1031 1039 },
1032 1040 //礼包的详情 轮播图
1033 1041 libao_details: function(e) {
1034   - var giftbagid = e.currentTarget.dataset.giftbagid;
1035   - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0);
  1042 + var th = this;
  1043 + var help_id = th.data.help_id;//活动id
  1044 + var taskId = th.data.taskid;//任务id
  1045 + getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
1036 1046 },
1037 1047 //正在进行任务
1038 1048 test: function(e) {
... ...
pages/user/assistance/task_assistance.json
1 1 {
2   - "navigationBarTitleText": "好友助力",
  2 + "navigationBarTitleText": "好友助力,得好礼",
3 3 "navigationStyle": "custom",
4 4 "usingComponents": {
5 5 "warn": "/components/long_warn/long_warn",
... ...
pages/user/assistance/task_assistance.wxml
1   -<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
  1 + <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
2 2 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
3 3 <!-- 助力活动头部 -->
4 4 <view class="top-frame">
5 5 <view class="top-title white fs36 t-c">
6   -
7 6 {{aitem[sw_index].helpTaskName}}
8 7 </view>
9 8 <view class="activity-data t-c fs28 white">
... ... @@ -16,8 +15,11 @@
16 15 <view class="bg_left xc-left bcolor"></view>
17 16 </view>
18 17 <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
19   - <swiper-item wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
20   - <image class="xc-center-img"bindtap="libao_details" data-giftbagid="{{aitem.id}}" src="{{iurl+aitem.giftBagUrl}}"></image>
  18 + <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
  19 +
  20 + <image class="xc-center-img" bindtap="libao_details" src="{{iurl+aitem.giftBagUrl}}"></image>
  21 + <view class="abs select_details fs26 white">礼包详情</view>
  22 +
21 23 </swiper-item>
22 24 </swiper>
23 25  
... ... @@ -44,9 +46,9 @@
44 46 <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
45 47 好友拆一拆
46 48 </view>
47   - <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test">
  49 + <!-- <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test">
48 50 测试专用
49   - </view>
  51 + </view> -->
50 52  
51 53 </view>
52 54 <!-- 底部列表 -->
... ... @@ -76,7 +78,7 @@
76 78 <view class="flex-center width state">
77 79 <view class="ellipsis-1">
78 80 <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
79   - <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</text>
  81 + <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.order_sn}}">查看礼包</text>
80 82 <text wx:if="{{item.status==1}}"bindtap="get_libao"data-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}"
81 83 data-completeid="{{item.id}}">领取礼包 </text>
82 84 </view>
... ... @@ -108,8 +110,13 @@
108 110 <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
109 111 </view>
110 112 </view>
111   -
112 113 </view>
  114 +
  115 + <view class="flex-center fs32" wx:if="{{is_bc_show==1}}">
  116 + <view class="line"></view>
  117 + <view class="load white" bindtap="dismantle_record">点击加载更多</view>
  118 + <view class="line"></view>
  119 + </view>
113 120 </block>
114 121  
115 122 <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
... ... @@ -124,9 +131,9 @@
124 131 </view>
125 132 <!-- 加载更多 -->
126 133 <view class="fs32">
127   - <view class="flex-center" wx:if="{{user_task_list}}">
  134 + <view class="flex-center" wx:if="{{is_show==1}}">
128 135 <view class="line"></view>
129   - <view class="load white" bindtap="">点击加载更多</view>
  136 + <view class="load white" bindtap="user_task_list">点击加载更多</view>
130 137 <view class="line"></view>
131 138 </view>
132 139 <view class="flex-center white" style="margin-top: 20rpx;">
... ...
pages/user/assistance/task_assistance.wxss
... ... @@ -196,4 +196,13 @@ border-color: #fff;
196 196 .close {
197 197 width: 70rpx;
198 198 height: 70rpx;
  199 +}
  200 +.select_details{
  201 + width: 100%;
  202 + height: 50rpx;
  203 + line-height: 50rpx;
  204 + text-align: center;
  205 + background: #000;
  206 + opacity:0.6; filter: alpha(opacity=60);
  207 + bottom: 0rpx;
199 208 }
200 209 \ No newline at end of file
... ...