From ac8b9f49d4ea62f4b6deefb882c89c7140381362 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 8 Nov 2019 11:26:31 +0800
Subject: [PATCH] 会员中心页面的调整，会员资料页面的等级卡过期会员显示控制

---
 pages/index/index/index.wxml      |  2 +-
 pages/user/index/index.wxml       |  5 ++---
 pages/user/userinfo/userinfo.js   | 50 ++++++++++++++++++++++++++++++--------------------
 pages/user/userinfo/userinfo.wxml |  2 +-
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index fe1c6a8..5045efe 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -40,7 +40,7 @@
     </view>
 	<view class="pd-view" wx:else></view>
 	
-    <!---导航--->
+    <!---导航-->
     <view class="venues_box" hidden='true'>
         <view class="venues_list">
             <view class="venues_item">
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 4d314c7..4fa3732 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -69,8 +69,7 @@
         <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
         <view class="member fs28 "> 加入plus会员预计可省3031元</view>
      </view>
-        <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
-        
+        <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">     
           <view class="xc-opening fs28">立即开通</view>
         </view>
       </view>
@@ -81,7 +80,7 @@
 	    <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
 	    <view class="member"> 加入plus会员</view>
 	    <view class="t-c xc-save-money"> 预计可省3031元</view>
-	    <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
+	    <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto" style="margin-left: 186rpx;">
 	      <view class="xc-opening fs20">立即续费</view>
 	    </view>
 	  </view>
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index b0e96f3..e92182d 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -11,7 +11,7 @@ var a = getApp(),
   r = a.globalData.setting,
   t = a.request,
   s = require("../../../utils/common.js"),
-  util = require("../../../utils/util.js");
+  util = require("../../../utils/util.js"),ut=util;
 
 var timestamp = Date.parse(new Date());
 var date = new Date(timestamp);
@@ -504,8 +504,18 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
-    this.puls_user();
-    this.equity_user();
+	  
+   var user=getApp().globalData.userInfo;
+   if(user.card_field!=''&& user.card_field!=null && user.card_field!=undefined){
+	     var now=ut.gettimestamp();
+	     var str= user.card_expiredate;
+	     var end = new Date(str);
+	     end = Date.parse(end) / 1000;
+		 if(now<end ){
+			  this.puls_user();	
+		 }	       
+   }
+  
     this.initial_user();
   },
  //-----------会员是否初始化---------------------
@@ -520,24 +530,24 @@ Page({
         var isBool = su.data.data.isBool;
         console.log("会员是否初始化", isBool);
         th.setData({isBool:isBool});
-      }
+		
+	      if(!isBool) return false;	
+		  //-----会员权益获取--------------		
+		  getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
+		    data: {
+		      storeId: r.stoid,
+		      userId: getApp().globalData.user_id,
+		    },
+		    success: function (su) {
+		    var gradename=su.data.data.GradeName;
+		      th.setData({gradename: gradename});		   
+		    }
+		  });
+		 
+	  }
     }); 
   },
-  //-----会员等级卡获取---------------
-  equity_user:function(){
-    var th = this;
-    getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
-      data: {
-        storeId: r.stoid,
-        userId: getApp().globalData.user_id,
-      },
-      success: function (su) {
-      var gradename=su.data.data.GradeName;
-        th.setData({gradename: gradename});
-     
-      }
-    });
-  },
+ 
 
   //-----Plus会员获取-----------
   puls_user:function(){
@@ -549,7 +559,7 @@ Page({
       success: function (su) {
 
         if (su.data.code == 0) {
-        var cardname=su.data.data[0].MemCardName;
+         var cardname=su.data.data[0].MemCardName;
           console.log("卡的名字", cardname);
          th.setData({pulscardname:cardname});
         }
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 363764c..c98ea70 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -24,7 +24,7 @@
               </view>
             </navigator>
              </block>
-             <block wx:if="{{user.card_field!=''&& user.card_field!=null && user.card_expiredate!=null&&user.card_expiredate!=null}}">
+             <block wx:if="{{pulscardname}}">
             <navigator url="/pages/user/plus/plus">
               <view class="flex-center plusMax">
                 <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
--
libgit2 0.21.4