From 97e120eaee25c58c6d675262f94222f693903bc5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 7 Nov 2023 16:19:20 +0800
Subject: [PATCH] 专享礼包列表的OA单的优化

---
 pages/giftpack/mygiftpack/mygiftpack.js   | 29 +++++++++++++++++++++++++++++
 pages/giftpack/mygiftpack/mygiftpack.wxml |  6 +++++-
 pages/giftpack/mygiftpack/mygiftpack.wxss |  4 ++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index d61eab4..01b0e44 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -1,4 +1,5 @@
 var i = require("../../../utils/util.js")
+const ut = require("../../../utils/util.js");
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
@@ -108,6 +109,34 @@ Page({
           th.data.curpage++;
           var arr1 = th.data.wareCard;
           var arr2 = res.data.data.pageData;
+
+          for (let j = 0; j <arr2.length ; j++) {
+
+            var t_now = ut.gettimestamp();
+
+            //---获取日期的时间戳---
+            var t_endtime = arr2[j].endTime;
+            t_endtime = t_endtime.replace(/-/g, '/');
+            var t_date = new Date(t_endtime) / 1000;
+
+
+            var t_starttime = arr2[j].starTime;
+            t_starttime = t_starttime.replace(/-/g, '/');
+            var t_sdate = new Date(t_starttime) / 1000;
+
+            if (!arr2[j].iswarelbtype)
+              arr2[j].c_state=-2  //无核销商品
+            else if (arr2[j].goodsUseState)
+              arr2[j].c_state=1   //已核销
+            else if (t_date <= t_now)
+              arr2[j].c_state=2   //已过期
+            else if (t_sdate > t_now)
+              arr2[j].c_state=-1  //未开始
+            else
+              arr2[j].c_state=0   //正常
+          }
+
+
           var arr3 = [...arr1, ...arr2];
           var ismore = 0;
           if (arr3.length == res.data.data.total) ismore = 1
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index cf605e9..55914d9 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -94,7 +94,11 @@
         </view>
       </view>
       <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}}">
-        <button>立即使用</button>
+          <button class="overdue" wx:if="{{item.c_state==-2}}">无核销商品</button>
+          <button class="overdue" wx:if="{{item.c_state==-1}}">兑换未开始</button>
+          <button wx:if="{{item.c_state==0}}">立即使用</button>
+          <button class="overdue" wx:if="{{item.c_state==1}}" >商品已核销</button>
+          <button class="overdue" wx:if="{{item.c_state==2}}">商品兑换时间已过</button>
       </view>
       <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view>
     </view>
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxss b/pages/giftpack/mygiftpack/mygiftpack.wxss
index 245606f..d0e06f4 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxss
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxss
@@ -251,3 +251,7 @@ page {
 .After_all .end {
   margin: 0rpx 15rpx;
 }
+
+.overdue{
+  background-color: rgb(153,153,153) !important;
+}
--
libgit2 0.21.4