PLUS停用显示优化

season
1 parent b6b8568f
Showing 6 changed files with 67 additions and 24 deletions
components/goods_list/goods_list.js
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
pages/user/cardinfo/cardinfo.js
pages/user/plus/plus.js
pages/user/plus/plus.wxml
@@ -144,12 +144,21 @@ Component({
           var arr = [1219, 2089, 3031];
           var new_arr = new Array();
           var card_name_map = new Map();
+
+          var user = getApp().globalData.userInfo;
+    
           for (var i = 0; i < plusCard.length; i++) {
-            var name = "card" + plusCard[i].CorrPrice.toLowerCase();
-            card_name_map.set(name, plusCard[i].CardName);
+            if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+              continue;
+            }
+             var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+               card_name_map.set(name, plusCard[i].CardName);
+               new_arr.push(plusCard[i]);
+            
+            
           }
           var ob = {
-            "card_list": plusCard,
+            "card_list": new_arr,
             "name_map": card_name_map
           };
           func(ob);
@@ -171,13 +171,18 @@ Page({
        var plusCard = res.data.data;
        var arr = [1219, 2089, 3031];
        var new_arr = new Array();
-  		  var card_name_map=new Map();
-       for (var i = 0; i < plusCard.length; i++) {	       
+        var card_name_map=new Map();
+        var user = getApp().globalData.userInfo;
+       for (var i = 0; i < plusCard.length; i++) {	   
+        if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+          continue;
+        }   
   			var name="card"+plusCard[i].CorrPrice.toLowerCase();
-  			card_name_map.set(name,plusCard[i].CardName);				       
+        card_name_map.set(name,plusCard[i].CardName);		
+        new_arr.push(plusCard[i]);			       
        }
  
-  		  var ob={"card_list":plusCard,"name_map":card_name_map};
+  		  var ob={"card_list":new_arr,"name_map":card_name_map};
   		  func(ob);	
      })
    },
@@ -197,13 +197,20 @@ Page({
 	     var plusCard = res.data.data;
 	     var arr = [1219, 2089, 3031];
 	     var new_arr = new Array();
-			  var card_name_map=new Map();
-	     for (var i = 0; i < plusCard.length; i++) {	       
-				var name="card"+plusCard[i].CorrPrice.toLowerCase();
-				card_name_map.set(name,plusCard[i].CardName);				       
+        var card_name_map=new Map();
+        var user = getApp().globalData.userInfo;
+    
+        for (var i = 0; i < plusCard.length; i++) {
+          if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+            continue;
+          }    
+          var name="card"+plusCard[i].CorrPrice.toLowerCase();
+          card_name_map.set(name,plusCard[i].CardName);		
+          new_arr.push(plusCard[i]);	
+        	       
 	     }
  
-			  var ob={"card_list":plusCard,"name_map":card_name_map};
+			  var ob={"card_list":new_arr,"name_map":card_name_map};
 			  func(ob);	
 	   })
 	 },
@@ -41,7 +41,7 @@ Page({
     free:null,//分佣的数据
     expiryDate:"",//卡到期时间
 	  is_guoqi:0,  //卡是不是过期
-	
+    IsStopBuy:0,  //卡是否停用
 	  yu_e_show:0,//装入余额的弹窗    
   },
  
@@ -166,6 +166,10 @@ Page({
          user_card.CardImg = th.data.url + "/miniapp/images/plus/bg" + index + ".jpg?v=1";
  
       }
+      if (user_card.IsStopBuy==true){
+        this.setData({IsStopBuy:1})
+      }
+      
  
       console.log(user_card,"会员的卡类");
       ee.setData({user_card: user_card});
@@ -718,12 +722,20 @@ Page({
 	     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;
-	  }
+    }
+    
+    if (th.data.IsStopBuy==1)
+    {
+      getApp().my_warnning("该卡已停用，无法续费！", 0, th);
+      return false;
+    }
+
  
 	  end_time=ut.format(end_time,'yyyy-MM-dd');  
 	  var errmsg="";
@@ -173,9 +173,12 @@ Page({
       var new_arr = new Array();
       for (var i = 0; i < plusCard.length; i++) {
         //plusCard[i].free=arr[i];
-        if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
-        var item = {"fee": plusCard[i].CardFee, 'index': i}
-        new_arr.push(item);
+       
+        
+            if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
+            var item = {"fee": plusCard[i].CardFee, 'index': i}
+            new_arr.push(item);
+       
       }
       //根據距離遠近排序，越近在前面，升序
       new_arr.sort(function (a, b) {
@@ -189,11 +192,15 @@ Page({
       });
       //---给数组添加立省多少钱---
       for (i = 0; i < plusCard.length; i++) {
-        for (var j = 0; j < new_arr.length; j++) {
-          if (i == new_arr[j].index) {
-            plusCard[i].free = arr[j];
-            break;
-          }
+         //判断是否停用
+       
+          for (var j = 0; j < new_arr.length; j++) {
+            if (i == new_arr[j].index) {
+              plusCard[i].free = arr[j];
+              break;
+            }
+        
+
         }
       }
       th.setData({
@@ -14,7 +14,8 @@
         <!-- 未开通会员swiper-item -->
         <swiper current="{{currentId}}" current-item-id="{{currentId}}" next-margin="60rpx" previous-margin="60rpx" bindchange="swiperChange">
           <swiper-item class="flex" item-id="{{index}}" data-item-id="{{index}}" wx:for="{{is_plusCard}}">
-            <view class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
+
+            <view wx:if="{{item.IsStopBuy!=true}}" class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
               <view class="flex-space-between Membership_go">
                 <view>
                   <view class="fs36">{{item.CardName}}</view>
@@ -35,6 +36,8 @@
                 </view>
               </view>
             </view>
+
+
           </swiper-item>
         </swiper>
     </view>