wxd / MShopWeApp

Commit e927fc36252f8a474b9285ddaffcf19277f88375

Authored by season
1 parent ce73a88c

代金券详细优化

Inline Side-by-side
Showing 4 changed files with 18 additions and 7 deletions
packageA/pages/quan_list/quan_list.js
  View file @e927fc3
... ... @@ -19,6 +19,7 @@ Page({
19 19 loading:0,
20 20 get_item:null,
21 21 show_success:0,
  22 + getcurday:null,
22 23 },
23 24 //------初始化加载----------
24 25 onLoad: function(t) {
... ... @@ -36,6 +37,8 @@ Page({
36 37 //券的模拟数据
37 38 //var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
38 39 //th.setData({dataList: data});
  40 +
  41 + this.setData({getcurday:ut.gettimestamp()});
39 42 },
40 43  
41 44 onHide: function() {
... ...
packageA/pages/quan_list/quan_list.wxml
  View file @e927fc3
... ... @@ -18,11 +18,12 @@
18 18 <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative">
19 19 <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
20 20 <view style="margin-top: 5rpx">所有门店通用</view>
21   - <view wx:if="{{item.endtype==0}}">有效期
22   - <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
  21 + <view wx:if="{{item.endtype==0}}">有效期
  22 + <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
  23 + <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
23 24 <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
24 25 </view>
25   - <view wx:else>有效期<text wx:if="{{item.days>0}}">{{item.days}}天</text><text wx:else>不限</text></view>
  26 + <view wx:else>有效期 <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text></view>
26 27 <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
27 28 <!-- 领取按钮 -->
28 29 <view data-ind="{{index}}" data-cid="{{item.id}}" catchtap="get_quan">
... ...
packageA/pages/quan_pro/quan_pro.js
  View file @e927fc3
... ... @@ -14,6 +14,7 @@ Page({
14 14 q_data: null,
15 15 id:null,
16 16 config2:null,
  17 + getcurday:null
17 18  
18 19 },
19 20 //------初始化加载----------
... ... @@ -38,6 +39,8 @@ Page({
38 39 th.setData({q_data:res.data.data.pageData[0]});
39 40 }
40 41 });
  42 +
  43 + th.setData({getcurday:ut.gettimestamp()});
41 44 },
42 45  
43 46 onHide: function() {
... ...
packageA/pages/quan_pro/quan_pro.wxml
  View file @e927fc3
... ... @@ -23,11 +23,15 @@
23 23 <view class="fs28">满{{filters.toFix(q_data.condition,2)}}可用</view>
24 24 </view>
25 25 </view>
26   - <view wx:if="{{item.endtype==0}}" class="lower fs30">有效期
27   - <text wx:if="{{q_data.use_start_time>0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
28   - <text wx:if="{{q_data.use_start_time>0}}"> {{filters.format_time(q_data.use_end_time)}}</text><text wx:else>不限</text>
  26 + <view wx:if="{{q_data.endtype==0}}" class="lower fs30">有效期
  27 + <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
  28 + <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
  29 + <text wx:if="{{q_data.use_end_time>0}}"> {{filters.format_time(q_data.use_end_time)}}</text><text wx:else>不限</text>
29 30 </view>
30   - <view wx:else class="lower fs30">有效期<text wx:if="{{q_data.days>0}}">{{q_data.days}}天</text><text wx:else>不限</text></view>
  31 + <view wx:else class="lower fs30">有效期
  32 +
  33 + <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
  34 + <text wx:if="{{q_data.days>0}}"> {{filters.format_time(getcurday+3600*24*q_data.days)}}</text><text wx:else>不限</text></view>
31 35  
32 36 </view>
33 37 </view>
... ...