From beecd6a616460e513f10af6b9c370f819ea18177 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 12 Nov 2019 11:02:07 +0800
Subject: [PATCH] 卡的续费 接口验证是否等级会员的调整

---
 pages/user/cardinfo/cardinfo.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 8b3d3e9..be1f175 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -15,7 +15,6 @@ Page({
    */
   data: {
     images: [o.imghost + "/miniapp/images/plus/card_one.jpg", o.imghost + "/miniapp/images/plus/card_two.jpg", o.imghost + "/miniapp/images/plus/card_three.jpg"],
- 
     url: o.imghost,
     screenWidth: 0,
     screenheight: 0,
@@ -70,9 +69,7 @@ Page({
 
     }).then(res => {
       var plusCard = res.data.data;
-      if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
-      var big_card = null;
-      var big_cards = null;
+      var big_cards = null,big_card=null;
       console.log(plusCard, "数据什么的", res);
       for (var i = 0; i < plusCard.length; i++) {
         if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1";
@@ -709,14 +706,29 @@ Page({
    
   //-----立即续费的功能------
   xufei:async function(){  
-	    var th = this;
-      var is_card = 0;
+	  var th = this,is_card = 0,end_time=0;	  
+	  await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=1&type=3",
+	     {1:1}).then(res => {
+	     if (res.data.code == 0) {
+			 end_time=res.data.data.pageData[0].end_time;
+		 }
+	  })
+	  var now=ut.gettimestamp();  
+	  if(end_time<now){
+		 getApp().my_warnning("请联系商家升级plus功能", 0, th);
+		 return false;
+	  }
+	  
+	  end_time=ut.format(end_time,'yyyy-MM-dd');  
+	  var errmsg="";
       //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期--
       await getApp().request.promiseGet("/api/weshop/plus/plus/card/register",
-        { data: { storeId: os.stoid } }).then(res => {
+        { data: { storeId: os.stoid,isRenewal:1,endData: end_time,userId:getApp().globalData.user_id} }).then(res => {
          if (res.data.code == 0) is_card = 1;
+		 else errmsg=res.data.msg;
       })
-      if (is_card == 0) getApp().my_warnning("请联系商家升级plus功能", 0, th);
+	  
+       if (is_card == 0){ getApp().my_warnning(errmsg?errmsg:"请联系商家升级plus功能", 0, th);}
 
 	    var item = th.data.user_card;
 	    var req = {};
--
libgit2 0.21.4