wxd / MShopWeApp

Commit 3ec394ff1b7bba758b1d49e2c35471fc647aa535

Authored by yvan.ni
2 parents 6c6b6f19 2388345c

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

Inline Side-by-side
Showing 6 changed files with 75 additions and 63 deletions
pages/giftpack/birthdaygift/birthdaygift.wxml
  View file @3ec394f
... ... @@ -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 @3ec394f
... ... @@ -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 @3ec394f
... ... @@ -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 @3ec394f
... ... @@ -168,14 +168,15 @@ Page({
168 168  
169 169 // 领取礼包
170 170 get_libao: function(e) {
171   - var libao_id = e.currentTarget.dataset.libaoid;
  171 + var help_id = e.currentTarget.dataset.help_id;//活动id
172 172 var taskId = e.currentTarget.dataset.taskid;//任务id
173   - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId);
  173 + var id = e.currentTarget.dataset.id;//用于跳到礼包详情一键全部领取用的任务id
  174 + getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId+"&id="+id);
174 175 },
175 176  
176 177 //查看礼包id
177   - select_libao: function() {
178   - var orderSn = e.currentTarget.dataset.orderSn; //订单号
  178 + select_libao: function(e) {
  179 + var orderSn = e.currentTarget.dataset.ordersn; //订单号
179 180 getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
180 181 }
181 182  
... ...
pages/user/assistance/assistance.wxml
  View file @3ec394f
... ... @@ -16,7 +16,7 @@
16 16 </view>
17 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}}" data-taskId="{{item.id}}">领取礼包</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}}" data-id="{{item.id}}">领取礼包</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}}">
... ...
pages/user/assistance/giftpacklist.js
  View file @3ec394f
... ... @@ -22,7 +22,6 @@ Page({
22 22 actTitle: '',
23 23 getUrl: '',
24 24 wareCard: [],
25   - orderSn: "", //订单编号
26 25 lbId: "",
27 26 code: "", //核销码
28 27 c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期
... ... @@ -31,31 +30,33 @@ Page({
31 30 is_sub: 0, //判断是否重复提交
32 31 is_libao: 0, //0轮播查看活动 1领取礼包 2.查看礼包详情
33 32 held_id: "", //活动id
34   - taskId: "", //任务id
  33 + taskId: "", //任务id用于查找礼包详情
35 34 orderSn: "", //订单号
36   - is_type:"",//类型 0.轮播过来的 1.领取礼包过来的 2.查看礼包过来的
37   - is_head:0,//数据是否加载完成
38   - giftBagId:"",//礼包id
  35 + is_type: "", //类型 0.轮播过来的 1.领取礼包过来的 2.查看礼包过来的
  36 + is_head: 0, //数据是否加载完成
  37 + giftBagId: "", //礼包id
  38 + id: "", //一键领取的时候使用
39 39 },
40 40 onLoad: function(options) {
41 41 var th = this;
42 42 if (options.is_libao == 0) {
43 43 th.setData({
44   - held_id: options.help_id,
45   - taskId: options.taskId,
46   - is_type:0
  44 + held_id: options.help_id,
  45 + taskId: options.taskId,
  46 + is_type: 0
47 47 })
48 48 th.help();
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   - taskId: options.taskId
  55 + id: options.id
55 56 })
56   - th.GetBuyGiftList();
  57 + th.help();
57 58 }
58   - if (options.order_sn) {
  59 + if (options.orderSn) {
59 60 th.setData({
60 61 orderSn: options.orderSn,
61 62 is_type: 2
... ... @@ -84,16 +85,19 @@ Page({
84 85 th.setData({
85 86 giftImage: th.data.iurl + res.data.data.lbUrl,
86 87 giftTitle: res.data.data.giftTitle,
87   - is_head:1
  88 + is_head: 1
88 89 })
89 90 if (res.data.data.giftRemark == '') {
90 91 th.setData({
91 92 giftRemark: '暂无详情......'
92 93 })
93 94 } else {
94   - th.setData({
95   - giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
96   - })
  95 + if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
  96 + th.setData({
  97 + giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
  98 + })
  99 + }
  100 +
97 101 }
98 102  
99 103 th.setData({
... ... @@ -137,16 +141,18 @@ Page({
137 141 th.setData({
138 142 giftImage: th.data.iurl + res.data.data.lbUrl,
139 143 giftTitle: res.data.data.giftTitle,
140   - is_head:1
  144 + is_head: 1
141 145 })
142 146 if (res.data.data.giftRemark == '') {
143 147 th.setData({
144 148 giftRemark: '暂无详情......'
145 149 })
146 150 } else {
147   - th.setData({
148   - giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
149   - })
  151 + if (res.data.data.giftRemark != null && res.data.data.giftRemark != undefined && res.data.data.giftRemark != '') {
  152 + th.setData({
  153 + giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
  154 + })
  155 + }
150 156 }
151 157  
152 158 //---获取日期的时间戳---
... ... @@ -202,9 +208,9 @@ Page({
202 208 is_sub: 1
203 209 })
204 210 var json = {
205   - "actId": th.data.taskId, //活动Id
  211 + "actId": th.data.id, //活动Id
206 212 "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
207   - "giftBagId": th.data.giftBagId, //礼包Id
  213 + "giftBagId": 1, //礼包Id
208 214 "storeId": a.stoid, //商家Id
209 215 "userId": d.user_id //用户ID
210 216 };
... ... @@ -247,7 +253,7 @@ Page({
247 253 _this2.setData({
248 254 giftImage: th.iurl + res.data.data.lbUrl,
249 255 giftTitle: res.data.data.giftTitle,
250   - is_head:1
  256 + is_head: 1
251 257 })
252 258 if (res.data.data.giftRemark == '') {
253 259  
... ...