From ab1086fc39710ab51f40accbc4ea66eaab4904a2 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 9 Jan 2020 16:24:12 +0800
Subject: [PATCH] 礼包使用按钮要判断是否已使用，是否已过期

---
 pages/giftpack/giftpacklist/giftpacklist.js   | 15 ++++++++++++++-
 pages/giftpack/giftpacklist/giftpacklist.wxml | 11 ++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index ac50a85..113c1dd 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -3,6 +3,8 @@ var e = getApp(),
   os = a,
   t = e.request,
   d = e.globalData;
+var ut = require("../../../utils/util.js");
+    
 Page({
   data: {
     url: a.url, //接口网址
@@ -23,7 +25,8 @@ Page({
     wareCard: [],
     orderSn: "", //订单编号
     lbId: "",
-    code: "", //核销码
+    code: "",    //核销码
+	c_state:"0",  //判断是否已经使用, 0正常  1已使用  2已过期
   },
   onLoad: function(options) {
     var th = this;
@@ -176,6 +179,16 @@ Page({
               giftRemark: res.data.data.giftRemark
             })
           }
+		  
+		  //---获取日期的时间戳---
+		  var t_endtime=res.data.data.endTime;
+		  t_endtime = t_endtime.replace(/-/g,'/');
+		  var t_date = new Date(t_endtime)/1000;
+		  var t_now=ut.gettimestamp();
+		  
+		  if(res.data.data.goodsUseState) th.setData({c_state:1})
+		  else if(t_date<=t_now)
+		     th.setData({c_state:2})
 
           th.setData({
             giftDate: res.data.data.endTime,
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 9e6d57e..679e63a 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -118,12 +118,17 @@
   </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
-      <view wx:if="{{false}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+      <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
         <text class="data-v-3a5b7e36">立即使用</text>
       </view>
-      <view class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
-        <text class="data-v-3a5b7e36">商品已过期</text>
+      <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" >
+        <text class="data-v-3a5b7e36">商品已使用</text>
       </view>
+	  <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue" >
+	    <text class="data-v-3a5b7e36">商品已过期</text>
+	  </view>
+	  
+	  
     </view>
   </block>
 </view>
--
libgit2 0.21.4