From 2acecd7c5c000d2784e1104d8fb641739a7ab349 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 5 Nov 2019 10:19:36 +0800
Subject: [PATCH] 等级卡过期的显示

---
 pages/user/cardinfo/cardinfo.js   | 13 +++++++++++--
 pages/user/cardinfo/cardinfo.wxml | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 7eccfd0..89e5628 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -41,6 +41,7 @@ Page({
     user_card: null,//会员买的卡
     free:null,//分佣的数据
     expiryDate:"",//卡到期时间
+	is_guoqi:0,  //卡是不是过期
       
   },
  
@@ -124,12 +125,20 @@ Page({
           userId: getApp().globalData.user_id,
         },
     }).then(res => {
-    
+
       var GradeCardID = res.data.data[0].GradeCardID;
       var expiryDate = res.data.data[0].ExpiryDate
       console.log(GradeCardID, "卡的id", res.data.data[0]);
+	  var now=ut.gettimestamp();
+	  var str = expiryDate.replace(/-/g, '/');
+	  var end = new Date(str);
+	  end = Date.parse(end) / 1000;
+	  var is_guoqi=0;
+	  if(end<now) is_guoqi=1;
+	  
+	  
       ee.setData({cardid: GradeCardID,
-        expiryDate: expiryDate
+        expiryDate: expiryDate,is_guoqi:is_guoqi,
       });
 
 
diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml
index 559fe51..17f7159 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/pages/user/cardinfo/cardinfo.wxml
@@ -12,7 +12,8 @@
           <view class="flex-space-between">
             <view style="color:{{user_card.CardColor}}">
               <view class="fs36 h36" style="font-weight:bold">{{user_card.CardName}}</view>
-              <view class="fs22 h22" style="margin-top:15rpx">会员将在{{filters.replace_time2(expiryDate)}}到期</view>
+              <view wx:if="{{!is_guoqi}}" class="fs22 h22" style="margin-top:15rpx">会员将在{{filters.replace_time2(expiryDate)}}到期</view>
+              <view wx:else class="fs22 h22" style="margin-top:15rpx">会员已在{{filters.replace_time2(expiryDate)}}过期</view>
             </view>
             <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费
             </view>
@@ -23,12 +24,17 @@
                <view class="Member"
                  style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png'); filter: drop-shadow(40px 0 0 {{user_card.CardColor}});">
                </view>
-               <view style="color:{{user_card.CardColor}}">正在享受{{user_card.CardName}}会员特权
-               </view>
+               <view wx:if="{{!is_guoqi}}" style="color:{{user_card.CardColor}}">正在享受{{user_card.CardName}}会员特权</view>
+               <view wx:else style="color:{{user_card.CardColor}}">享受更低价格，请续费哦</view>
             </view>
-            <view class="flex-vertical" bindtap="Share_pictures">
+            <view wx:if="{{!is_guoqi}}" class="flex-vertical" bindtap="Share_pictures">
               <view style="color:{{user_card.CardColor}}">邀请新朋友</view>
-              <image class="share" src="{{url}}/miniapp/images/plus/Forward.png"></image>
+              <!-- <image class="share" src="{{url}}/miniapp/images/plus/Forward.png"></image> -->
+			  <view style="overflow: hidden; margin-left: 10rpx;">
+				  <view class="Member"
+					style="background-image:url('{{url}}/miniapp/images/plus/Forward.png'); filter: drop-shadow(40px 0 0 {{user_card.CardColor}});">
+				  </view>
+			  </view>
             </view>
           </view>
 
--
libgit2 0.21.4