Commit 97e120eaee25c58c6d675262f94222f693903bc5

Authored by yvan.ni
1 parent 318b7355

专享礼包列表的OA单的优化

pages/giftpack/mygiftpack/mygiftpack.js
1 1 var i = require("../../../utils/util.js")
  2 +const ut = require("../../../utils/util.js");
2 3 var e = getApp(),
3 4 a = e.globalData.setting,
4 5 os = a,
... ... @@ -108,6 +109,34 @@ Page({
108 109 th.data.curpage++;
109 110 var arr1 = th.data.wareCard;
110 111 var arr2 = res.data.data.pageData;
  112 +
  113 + for (let j = 0; j <arr2.length ; j++) {
  114 +
  115 + var t_now = ut.gettimestamp();
  116 +
  117 + //---获取日期的时间戳---
  118 + var t_endtime = arr2[j].endTime;
  119 + t_endtime = t_endtime.replace(/-/g, '/');
  120 + var t_date = new Date(t_endtime) / 1000;
  121 +
  122 +
  123 + var t_starttime = arr2[j].starTime;
  124 + t_starttime = t_starttime.replace(/-/g, '/');
  125 + var t_sdate = new Date(t_starttime) / 1000;
  126 +
  127 + if (!arr2[j].iswarelbtype)
  128 + arr2[j].c_state=-2 //无核销商品
  129 + else if (arr2[j].goodsUseState)
  130 + arr2[j].c_state=1 //已核销
  131 + else if (t_date <= t_now)
  132 + arr2[j].c_state=2 //已过期
  133 + else if (t_sdate > t_now)
  134 + arr2[j].c_state=-1 //未开始
  135 + else
  136 + arr2[j].c_state=0 //正常
  137 + }
  138 +
  139 +
111 140 var arr3 = [...arr1, ...arr2];
112 141 var ismore = 0;
113 142 if (arr3.length == res.data.data.total) ismore = 1
... ...
pages/giftpack/mygiftpack/mygiftpack.wxml
... ... @@ -94,7 +94,11 @@
94 94 </view>
95 95 </view>
96 96 <view wx:if="{{item.is_back !=1}}" class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.orderSn}}">
97   - <button>立即使用</button>
  97 + <button class="overdue" wx:if="{{item.c_state==-2}}">无核销商品</button>
  98 + <button class="overdue" wx:if="{{item.c_state==-1}}">兑换未开始</button>
  99 + <button wx:if="{{item.c_state==0}}">立即使用</button>
  100 + <button class="overdue" wx:if="{{item.c_state==1}}" >商品已核销</button>
  101 + <button class="overdue" wx:if="{{item.c_state==2}}">商品兑换时间已过</button>
98 102 </view>
99 103 <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view>
100 104 </view>
... ...
pages/giftpack/mygiftpack/mygiftpack.wxss
... ... @@ -251,3 +251,7 @@ page {
251 251 .After_all .end {
252 252 margin: 0rpx 15rpx;
253 253 }
  254 +
  255 +.overdue{
  256 + background-color: rgb(153,153,153) !important;
  257 +}
... ...