From 288fade0b6a866f214c212d357b376aa8129f154 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Fri, 6 Dec 2019 15:30:33 +0800
Subject: [PATCH] 自定义模板

---
 components/diy_goodsGroup/diy_goodsGroup.js   | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 components/diy_goodsGroup/diy_goodsGroup.wxml | 24 +++++++-----------------
 2 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index a4467ba..4298060 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -303,6 +303,81 @@ Component({
       var _errObj = {};
       _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-    }
+    },
+	
+	//---卡的初始化----
+	card_init: function() {
+	  var th = this;
+	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+	    success: function(e) {
+	      getApp().globalData.userInfo = e.data.data;
+	      getApp().getConfig2(function(e) {
+	        var swithc_list = e.switch_list;
+	        var sw_arr = JSON.parse(swithc_list);
+	        //---如果后台又开等级卡的开关---
+	        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+	          th.setData({
+	            rank_switch: true
+	          });
+	          //---回调卡的列表---
+	          th.getPlusCardType(function(ob) {
+	            th.setData({
+	              card_list: ob.card_list
+	            });
+	            var ti = setInterval(function() {
+	              var user = getApp().globalData.userInfo;
+	              if (!user) return false;
+	              clearInterval(ti);
+	
+	              if (user.card_field) {
+	                var str = user['card_expiredate'].replace(/-/g, '/');
+	                var end = new Date(str);
+	                end = Date.parse(end) / 1000;
+	                var now = ut.gettimestamp();
+	
+	                //--- 判断是等级会员，且在有效期范围内 ---
+	                if (user.card_field && now < end) {
+	                  var card_name = ob.name_map.get(user.card_field);
+	                  if (card_name.length > 4) card_name = card_name.substring(0, 4);
+	                  th.setData({
+	                    card_field: user.card_field,
+	                    card_name: card_name,
+	                    card_list: ob.card_list
+	                  });
+	                }
+	              }
+	            }, 500)
+	          })
+	
+	        }
+	      })
+	    }
+	  })
+	
+	},
+	
+	//---  获取卡类列表 ---
+	getPlusCardType: function(func) {
+	  var storid = o.stoid;
+	  var th = this;
+	  getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+	    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 ob = {
+	      "card_list": plusCard,
+	      "name_map": card_name_map
+	    };
+	    func(ob);
+	  })
+	},
+	
+	
   }
 })
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 1b21d89..ce84f14 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -2,7 +2,6 @@
 <!--1个-->
 <view class="zs_goods_wai">
     <!--右下角-->
-
     <block wx:if='{{object.column==1 && object.position==4}}'>
         <block wx:for="{{goods_array}}" >
             <view class='zs_goods'>
@@ -835,7 +834,7 @@
 
 <view class="clear"></view>
 </block>
-<!--左下角-->
+<!-- ----左下角---- -->
 <block wx:if='{{object.column==3  && object.position==3}}'>
 <block wx:for="{{goods_array}}" >
     <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
@@ -898,14 +897,6 @@
 </block>
 
 
-<!-- <block wx:if="{{object.classstyle=='2' }}">
-<view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
-    <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
-       {{loadText}}
-    </button>
-</view>
-</block> -->
-
 <block wx:if="{{object.classstyle=='1' }}">
 <view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
@@ -915,10 +906,9 @@
 </block>
 
 <block wx:if="{{object.classstyle!='1' }}">
- <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
-    <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
-      {{loadText}}
-    </button>
-</view> 
-
- </block>
\ No newline at end of file
+  <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
+     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
+       {{loadText}}
+     </button>
+ </view> 
+</block>
\ No newline at end of file
--
libgit2 0.21.4