From 0577300e90d7c2d87bca88a8e90e86ec2fcdaf18 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 10 Jul 2020 09:54:07 +0800
Subject: [PATCH] 礼包，通过链接进入的，活动还没有开始，就提示活动还没开始，不能购买

---
 pages/giftpack/giftpacklist/giftpacklist.js   | 26 ++++++++++++++++++++++++--
 pages/giftpack/giftpacklist/giftpacklist.wxml | 13 +++++++------
 pages/giftpack/giftpacklist/giftpacklist.wxss |  4 ++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index bedc1bb..05050b3 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -61,6 +61,13 @@ Page({
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
+    //如果还没有开始的话
+    if(th.data.isStart!=1){
+       getApp().my_warnning("活动还没有开始", 0, th);
+       return false;
+    }
+
+
     var money = e.currentTarget.dataset.money;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
@@ -101,7 +108,7 @@ Page({
                   getApp().goto(url);
                 },
                 fail: function(n) {
-                  getApp().my_confirm("取消支付", 0, th);
+                  getApp().my_warnning("取消支付", 0, th);
                 }
               });
             } else {
@@ -125,6 +132,12 @@ Page({
   GetBuyIntegral: function(e) {
     var that = this.data;
     var th = this;
+
+    //如果还没有开始的话
+    if(th.data.isStart!=1){
+      getApp().my_warnning("活动还没有开始", 0, th);
+      return false;
+    }
     // var id = e.currentTarget.dataset.id;//活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
@@ -260,6 +273,14 @@ Page({
             })
           }
 
+          var isStart=0;
+          var now=ut.gettimestamp();
+
+          var str = res.data.data.starTime.replace(/-/g,'/');
+          var start = Date.parse(new Date(str));
+          start = start / 1000;
+          if(start<now) isStart=1;
+
           _this2.setData({
             giftDate: res.data.data.endTime,
             giftPosPrice: res.data.data.giftPosPrice,
@@ -268,7 +289,8 @@ Page({
             giftPrice: res.data.data.payMoney,
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
-            wareCard: res.data.data.wareCard
+            wareCard: res.data.data.wareCard,
+            isStart:isStart,
           })
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 285f8d5..de8a720 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -7,7 +7,8 @@
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
     <view class="top_time data-v-3a5b7e36">
-      <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
+      <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换截至时间："+giftDate}}</text>
+      <text class="data-v-3a5b7e36" wx:else>{{"活动结束至时间："+giftDate}}</text>
     </view>
     <view class="top_price data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0}}">
@@ -102,22 +103,22 @@
   <block wx:if="{{isBuy==1}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
-          <text class="data-v-3a5b7e36">立即购买</text>
+        <view class="foot_button_left data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
+           <text class="data-v-3a5b7e36  ">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+        <view class="foot_button_right data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
+        <view class="foot_button_buy data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+        <view class="foot_button_intalge data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
index be61320..26e7cbb 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxss
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -197,6 +197,7 @@
   font-size: 28rpx;
   line-height: 70rpx;
   border-radius: 40rpx;
+  margin-right: 20rpx;
 }
 
 .foot_button_right.data-v-3a5b7e36 {
@@ -243,3 +244,6 @@ page.data-v-3a5b7e36 {
 .overdue.data-v-3a5b7e36{
   background-color: rgb(153,153,153);
 }
+
+.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; }
+.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;}
--
libgit2 0.21.4